chore(webui): refactor login and session middleware handling

2 files changed, 9 insertions, 9 deletions

diff --git a/pkg/webui/login.go b/pkg/webui/login.go
index d004d82..fda227a 100644
--- a/pkg/webui/login.go
+++ b/pkg/webui/login.go
@@ -88,9 +88,9 @@ func handleLoginPOST(db *database.DB) http.Handler {
 	})
 }
 
-func loginMiddleware(db *database.DB) func(http.Handler) http.Handler {
+func loginMiddleware(db *database.DB, requireSession func(http.Handler) http.Handler) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		return requireSession(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.Header().Set("Cache-Control", "no-store, no-cache")
 			session := r.Context().Value(model.SessionContextKey{})
 			if session == nil {
@@ -110,6 +110,6 @@ func loginMiddleware(db *database.DB) func(http.Handler) http.Handler {
 			}
 			ctx := context.WithValue(r.Context(), model.AccountContextKey{}, account)
 			next.ServeHTTP(w, r.WithContext(ctx))
-		})
+		}))
 	}
 }
diff --git a/pkg/webui/routes.go b/pkg/webui/routes.go
index 6ebe90b..e9a0346 100644
--- a/pkg/webui/routes.go
+++ b/pkg/webui/routes.go
@@ -10,12 +10,12 @@ func addRoutes(
 	mux *http.ServeMux,
 	db *database.DB,
 ) {
-	session := sessionsMiddleware(db)
-	requireLogin := loginMiddleware(db)
+	requireSession := sessionsMiddleware(db)
+	requireLogin := loginMiddleware(db, requireSession)
 	mux.Handle("GET /healthz", handleHealthz())
-	mux.Handle("GET /login", session(handleLoginGET()))
-	mux.Handle("POST /login", session(handleLoginPOST(db)))
-	mux.Handle("GET /logout", session(requireLogin(handleLogoutGET(db))))
+	mux.Handle("GET /login", requireSession(handleLoginGET()))
+	mux.Handle("POST /login", requireSession(handleLoginPOST(db)))
+	mux.Handle("GET /logout", requireLogin(handleLogoutGET(db)))
 	mux.Handle("GET /static/", cache(http.FileServer(http.FS(staticFS))))
-	mux.Handle("GET /", session(requireLogin(handleIndexGET())))
+	mux.Handle("GET /", requireLogin(handleIndexGET()))
 }