From b45219a01ec8d7239d1f3a4db48817877fbf67d5 Mon Sep 17 00:00:00 2001 From: LordMathis Date: Wed, 17 Dec 2025 19:06:04 +0100 Subject: [PATCH] Reuse handler auth middleware --- pkg/server/routes.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkg/server/routes.go b/pkg/server/routes.go index d8f8c35..60f4487 100644 --- a/pkg/server/routes.go +++ b/pkg/server/routes.go @@ -26,9 +26,6 @@ func SetupRouter(handler *Handler) *chi.Mux { MaxAge: 300, })) - // Add API authentication middleware - authMiddleware := NewAPIAuthMiddleware(handler.cfg.Auth, handler.authStore) - if handler.cfg.Server.EnableSwagger { r.Get("/swagger/*", httpSwagger.Handler( httpSwagger.URL("/swagger/doc.json"), @@ -38,8 +35,8 @@ func SetupRouter(handler *Handler) *chi.Mux { // Define routes r.Route("/api/v1", func(r chi.Router) { - if authMiddleware != nil && handler.cfg.Auth.RequireManagementAuth { - r.Use(authMiddleware.ManagementAuthMiddleware()) + if handler.authMiddleware != nil && handler.cfg.Auth.RequireManagementAuth { + r.Use(handler.authMiddleware.ManagementAuthMiddleware()) } r.Get("/version", handler.VersionHandler()) @@ -107,8 +104,8 @@ func SetupRouter(handler *Handler) *chi.Mux { r.Route("/v1", func(r chi.Router) { - if authMiddleware != nil && handler.cfg.Auth.RequireInferenceAuth { - r.Use(authMiddleware.InferenceAuthMiddleware()) + if handler.authMiddleware != nil && handler.cfg.Auth.RequireInferenceAuth { + r.Use(handler.authMiddleware.InferenceAuthMiddleware()) } r.Get("/models", handler.OpenAIListInstances()) // List instances in OpenAI-compatible format @@ -135,8 +132,8 @@ func SetupRouter(handler *Handler) *chi.Mux { // Private Routes r.Group(func(r chi.Router) { - if authMiddleware != nil && handler.cfg.Auth.RequireInferenceAuth { - r.Use(authMiddleware.InferenceAuthMiddleware()) + if handler.authMiddleware != nil && handler.cfg.Auth.RequireInferenceAuth { + r.Use(handler.authMiddleware.InferenceAuthMiddleware()) } // This handler auto starts the server if it's not running