diff --git a/pkg/webui/login.go b/pkg/webui/login.go index 467b305..7563aad 100644 --- a/pkg/webui/login.go +++ b/pkg/webui/login.go @@ -97,9 +97,9 @@ func handleLoginPOST(db *database.DB) http.Handler { }) } -func loginMiddleware(db *database.DB, requireSession func(http.Handler) http.Handler) func(http.Handler) http.Handler { +func loginMiddleware(db *database.DB, processSession func(http.Handler) http.Handler) func(http.Handler) http.Handler { return func(next http.Handler) http.Handler { - return requireSession(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + return processSession(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 { diff --git a/pkg/webui/routes.go b/pkg/webui/routes.go index d6e6a8d..fb00aca 100644 --- a/pkg/webui/routes.go +++ b/pkg/webui/routes.go @@ -10,8 +10,8 @@ func addRoutes( mux *http.ServeMux, db *database.DB, ) { - requireSession := sessionsMiddleware(db) - requireLogin := loginMiddleware(db, requireSession) + processSession := sessionsMiddleware(db) + requireLogin := loginMiddleware(db, processSession) requireAdmin := adminMiddleware(db, requireLogin) mux.Handle("GET /accounts", requireLogin(handleAccountsGET(db))) mux.Handle("GET /accounts/{id}", requireLogin(handleAccountsIdGET(db))) @@ -19,8 +19,8 @@ func addRoutes( mux.Handle("POST /accounts/{id}/reset/{token}", handleAccountsIdResetPasswordPOST(db)) mux.Handle("POST /accounts", requireAdmin(handleAccountsPOST(db))) mux.Handle("GET /healthz", handleHealthz()) - mux.Handle("GET /login", requireSession(handleLoginGET())) - mux.Handle("POST /login", requireSession(handleLoginPOST(db))) + mux.Handle("GET /login", processSession(handleLoginGET())) + mux.Handle("POST /login", processSession(handleLoginPOST(db))) mux.Handle("GET /logout", requireLogin(handleLogoutGET(db))) mux.Handle("GET /settings", requireLogin(handleSettingsGET(db))) mux.Handle("POST /settings", requireLogin(handleSettingsPOST(db)))