adyxax/tfstated
1
0
Fork 0
Code Issues 47 Pull requests Releases Packages Wiki Activity Actions

fix(webui): display user accounts menu entry to admin even on error pages

Browse source
This commit is contained in:
Julien Dessaux 2025-03-18 23:36:41 +01:00
parent 7a3bf725b0
commit 7abe963bfd
Signed by: adyxax
GPG key ID: F92E51B86E07177E
10 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/webui/sessions.go
View file

@ -17,7 +17,7 @@ func sessionsMiddleware(db *database.DB) func(http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
cookie, err := r.Cookie(cookieName)
if err != nil && !errors.Is(err, http.ErrNoCookie) {
errorResponse(w, http.StatusInternalServerError, fmt.Errorf("failed to get request cookie \"%s\": %w", cookieName, err))
errorResponse(w, r, http.StatusInternalServerError, fmt.Errorf("failed to get request cookie \"%s\": %w", cookieName, err))
return
}
if err == nil {
@ -26,14 +26,14 @@ func sessionsMiddleware(db *database.DB) func(http.Handler) http.Handler {
} else {
session, err := db.LoadSessionById(cookie.Value)
if err != nil {
errorResponse(w, http.StatusInternalServerError, err)
errorResponse(w, r, http.StatusInternalServerError, err)
return
}
if session == nil {
unsetSesssionCookie(w)
} else if !session.IsExpired() {
if err := db.TouchSession(cookie.Value); err != nil {
errorResponse(w, http.StatusInternalServerError, err)
errorResponse(w, r, http.StatusInternalServerError, err)
return
}
ctx := context.WithValue(r.Context(), model.SessionContextKey{}, session)