diff --git a/internal/server/server.go b/internal/server/server.go index b4c7a49..01962be 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -48,7 +48,7 @@ func NewRouter( // TODO: shouldn't this ACTUALLY be a middleware? // - only try to make this an actual middleware AFTER all the routers are broken out, so that way how the middleware is supposed to work can be known - authMiddleware := middleware.NewAuth( + authM := middleware.NewAuth( logger.WithGroup("auth-middleware"), auth, //auth_api.NewLoginURL, @@ -81,14 +81,14 @@ func NewRouter( logger.WithGroup("templates"), r.Group( "/ui", - authMiddleware.AddIdentity, + authM.AddIdentity, ), "/ui", contentDir, rawEvents, accts, etsy, - authMiddleware, + authM, ) // sse setup @@ -113,8 +113,8 @@ func NewRouter( sse_api.Routes( api.Group( "/events", - authMiddleware.AddIdentity, - response.Handler(authMiddleware.Authenticate()), + authM.AddIdentity, + response.Handler(authM.Authenticate()), ), apiLogger.WithGroup("/events"), sq, @@ -122,8 +122,8 @@ func NewRouter( accounts_api.Routes( api.Group( "/accounts", - authMiddleware.AddIdentity, - response.Handler(authMiddleware.Authenticate()), + authM.AddIdentity, + response.Handler(authM.Authenticate()), ), apiLogger.WithGroup("/accounts"), accts,