diff --git a/backend/handlers/api_admin.go b/backend/handlers/api_admin.go index 7b592f5..0d493ac 100644 --- a/backend/handlers/api_admin.go +++ b/backend/handlers/api_admin.go @@ -114,14 +114,14 @@ func (app *App) HandleAdminDeleteOrder(w http.ResponseWriter, r *http.Request) { } func (app *App) HandleGetUsers(w http.ResponseWriter, r *http.Request) { - rows, err := app.DB.Query("SELECT id, username, role FROM users ORDER BY id") + rows, err := app.DB.Query("SELECT id, username, role FROM users WHERE username != 'superadmin' ORDER BY id") if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } defer rows.Close() - var users []map[string]any + users := make([]map[string]any, 0) for rows.Next() { var id, role int var username string diff --git a/feedmee/src/app/admin/page.tsx b/feedmee/src/app/admin/page.tsx index e593e36..1149c21 100644 --- a/feedmee/src/app/admin/page.tsx +++ b/feedmee/src/app/admin/page.tsx @@ -71,9 +71,14 @@ export default function AdminPage() { fetch(`${API_URL}/api/me`, { headers: { Authorization: `Bearer ${token}` }, }) - .then((res) => res.json()) - .then((data) => { - if (!data.role || data.role > 1) { + .then((res) => { + console.log(res); + return res.json(); + }) + .then((data: { role?: number; username?: string }) => { + if (data.role == undefined || data.role > 1) { + console.log(data); + console.log("Not admin, redirecting"); router.push("/landing"); } })