diff --git a/internal/admin/routes.go b/internal/admin/routes.go index b23fc5c..99b3a7c 100644 --- a/internal/admin/routes.go +++ b/internal/admin/routes.go @@ -21,7 +21,7 @@ func New(repo *repository.Queries, cfg *config.AppConfig) *AdminHandler { func (h *AdminHandler) RegisterRoutes(router chi.Router) { router.Route("/admin", func(r chi.Router) { - authMiddleware := imiddleware.NewAuthMiddleware(h.cfg) + authMiddleware := imiddleware.NewAuthMiddleware(h.cfg, h.repo) adminMiddleware := imiddleware.NewAdminMiddleware(h.repo) r.Use(authMiddleware.Runner, adminMiddleware.Runner) @@ -37,6 +37,8 @@ func (h *AdminHandler) RegisterRoutes(router chi.Router) { r.Get("/users/{id}", h.GetUser) r.Get("/user-sessions", h.GetUserSessions) + r.Patch("/user-sessions/revoke/{id}", h.RevokeUserSession) + r.Get("/service-sessions", h.GetServiceSessions) }) diff --git a/internal/auth/routes.go b/internal/auth/routes.go index ec0bbd9..5f24282 100644 --- a/internal/auth/routes.go +++ b/internal/auth/routes.go @@ -89,7 +89,7 @@ func NewAuthHandler(repo *repository.Queries, cache *cache.Client, cfg *config.A func (h *AuthHandler) RegisterRoutes(api chi.Router) { api.Route("/auth", func(r chi.Router) { r.Group(func(protected chi.Router) { - authMiddleware := imiddleware.NewAuthMiddleware(h.cfg) + authMiddleware := imiddleware.NewAuthMiddleware(h.cfg, h.repo) protected.Use(authMiddleware.Runner) protected.Get("/profile", h.getProfile) diff --git a/internal/oauth/routes.go b/internal/oauth/routes.go index 10a6876..66331cd 100644 --- a/internal/oauth/routes.go +++ b/internal/oauth/routes.go @@ -25,7 +25,7 @@ func NewOAuthHandler(repo *repository.Queries, cache *cache.Client, cfg *config. func (h *OAuthHandler) RegisterRoutes(router chi.Router) { router.Route("/oauth", func(r chi.Router) { r.Group(func(protected chi.Router) { - authMiddleware := imiddleware.NewAuthMiddleware(h.cfg) + authMiddleware := imiddleware.NewAuthMiddleware(h.cfg, h.repo) protected.Use(authMiddleware.Runner) protected.Post("/code", h.getAuthCode) diff --git a/internal/user/routes.go b/internal/user/routes.go index 26d7061..332fd3d 100644 --- a/internal/user/routes.go +++ b/internal/user/routes.go @@ -38,7 +38,7 @@ func NewUserHandler(repo *repository.Queries, minio *storage.FileStorage, cfg *c func (h *UserHandler) RegisterRoutes(api chi.Router) { api.Group(func(protected chi.Router) { - authMiddleware := imiddleware.NewAuthMiddleware(h.cfg) + authMiddleware := imiddleware.NewAuthMiddleware(h.cfg, h.repo) protected.Use(authMiddleware.Runner) protected.Put("/avatar", h.uploadAvatar)