Skip to content

Commit 325f1e4

Browse files
ddraykoddrayko
committed
fix: add missing AuthenticateToken middleware to all admin routes — RequireAdmin reads user from context, but nothing was populating it
1 parent d9d80c9 commit 325f1e4

1 file changed

Lines changed: 26 additions & 26 deletions

File tree

‎internal/routes/admin.go‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,32 @@ func RegisterAdminRoutes(r chi.Router) {
2020
h := &AdminHandler{}
2121

2222
r.Post("/admin/login", http.HandlerFunc(h.AdminLogin))
23-
r.Get("/admin/check", middleware.RequireAdmin(http.HandlerFunc(h.AdminCheck)))
24-
r.Get("/admin/servers", middleware.RequireAdmin(http.HandlerFunc(h.ListAdminServers)))
25-
r.Get("/admin/servers/{id}", middleware.RequireAdmin(http.HandlerFunc(h.GetAdminServer)))
26-
r.Delete("/admin/servers/{id}", middleware.RequireAdmin(http.HandlerFunc(h.DeleteAdminServer)))
27-
r.Post("/admin/servers/{id}/suspend", middleware.RequireAdmin(http.HandlerFunc(h.SuspendServer)))
28-
r.Post("/admin/servers/{id}/unsuspend", middleware.RequireAdmin(http.HandlerFunc(h.UnsuspendServer)))
29-
r.Get("/admin/users", middleware.RequireAdmin(http.HandlerFunc(h.ListUsers)))
30-
r.Get("/admin/users/{id}", middleware.RequireAdmin(http.HandlerFunc(h.GetUser)))
31-
r.Patch("/admin/users/{id}", middleware.RequireAdmin(http.HandlerFunc(h.UpdateUser)))
32-
r.Delete("/admin/users/{id}", middleware.RequireAdmin(http.HandlerFunc(h.DeleteUser)))
33-
r.Post("/admin/users/{id}/restrict", middleware.RequireAdmin(http.HandlerFunc(h.RestrictUser)))
34-
r.Post("/admin/users/{id}/unrestrict", middleware.RequireAdmin(http.HandlerFunc(h.UnrestrictUser)))
35-
r.Post("/admin/users/{id}/unsuspend-all", middleware.RequireAdmin(http.HandlerFunc(h.UnsuspendAllUserServers)))
36-
r.Get("/admin/activity", middleware.RequireAdmin(http.HandlerFunc(h.AdminActivity)))
37-
r.Get("/admin/nests", middleware.RequireAdmin(http.HandlerFunc(h.ListAdminNests)))
38-
r.Post("/admin/nests", middleware.RequireAdmin(http.HandlerFunc(h.SaveNest)))
39-
r.Put("/admin/nests/{id}", middleware.RequireAdmin(http.HandlerFunc(h.UpdateNest)))
40-
r.Post("/admin/eggs", middleware.RequireAdmin(http.HandlerFunc(h.SaveEgg)))
41-
r.Put("/admin/eggs/{nestId}/{eggId}", middleware.RequireAdmin(http.HandlerFunc(h.UpdateEgg)))
42-
r.Get("/admin/health", middleware.RequireAdmin(http.HandlerFunc(h.HealthCheck)))
43-
r.Get("/admin/stats", middleware.RequireAdmin(http.HandlerFunc(h.AdminStats)))
44-
r.Post("/admin/users/{id}/reset-password", middleware.RequireAdmin(http.HandlerFunc(h.AdminResetPassword)))
45-
r.Post("/admin/servers/{id}/reinstall", middleware.RequireAdmin(http.HandlerFunc(h.AdminReinstallServer)))
46-
r.Get("/admin/logs", middleware.RequireAdmin(http.HandlerFunc(h.GetLogs)))
47-
r.Get("/admin/settings", middleware.RequireAdmin(http.HandlerFunc(h.GetSettings)))
48-
r.Put("/admin/settings", middleware.RequireAdmin(http.HandlerFunc(h.UpdateSettings)))
23+
r.Get("/admin/check", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.AdminCheck))))
24+
r.Get("/admin/servers", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.ListAdminServers))))
25+
r.Get("/admin/servers/{id}", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.GetAdminServer))))
26+
r.Delete("/admin/servers/{id}", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.DeleteAdminServer))))
27+
r.Post("/admin/servers/{id}/suspend", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.SuspendServer))))
28+
r.Post("/admin/servers/{id}/unsuspend", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.UnsuspendServer))))
29+
r.Get("/admin/users", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.ListUsers))))
30+
r.Get("/admin/users/{id}", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.GetUser))))
31+
r.Patch("/admin/users/{id}", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.UpdateUser))))
32+
r.Delete("/admin/users/{id}", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.DeleteUser))))
33+
r.Post("/admin/users/{id}/restrict", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.RestrictUser))))
34+
r.Post("/admin/users/{id}/unrestrict", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.UnrestrictUser))))
35+
r.Post("/admin/users/{id}/unsuspend-all", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.UnsuspendAllUserServers))))
36+
r.Get("/admin/activity", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.AdminActivity))))
37+
r.Get("/admin/nests", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.ListAdminNests))))
38+
r.Post("/admin/nests", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.SaveNest))))
39+
r.Put("/admin/nests/{id}", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.UpdateNest))))
40+
r.Post("/admin/eggs", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.SaveEgg))))
41+
r.Put("/admin/eggs/{nestId}/{eggId}", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.UpdateEgg))))
42+
r.Get("/admin/health", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.HealthCheck))))
43+
r.Get("/admin/stats", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.AdminStats))))
44+
r.Post("/admin/users/{id}/reset-password", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.AdminResetPassword))))
45+
r.Post("/admin/servers/{id}/reinstall", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.AdminReinstallServer))))
46+
r.Get("/admin/logs", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.GetLogs))))
47+
r.Get("/admin/settings", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.GetSettings))))
48+
r.Put("/admin/settings", middleware.AuthenticateToken(middleware.RequireAdmin(http.HandlerFunc(h.UpdateSettings))))
4949
}
5050

5151
func (h *AdminHandler) AdminLogin(w http.ResponseWriter, r *http.Request) {

0 commit comments

Comments
 (0)