Simplify sign out handler

theandrew168 · Sep 1, 2024 · e05e85f · e05e85f
1 parent a301b84
commit e05e85f
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/backend/web/page/signout.go b/backend/web/page/signout.go
@@ -17,14 +17,15 @@ func HandleSignoutForm(store *storage.Storage) http.Handler {
 			return
 		}
 
+		// Delete the existing session cookie.
+		cookie := util.NewExpiredCookie(util.SessionCookieName)
+		http.SetCookie(w, &cookie)
+
 		// Lookup the session by it's client-side session ID.
 		session, err := store.Session().ReadBySessionID(sessionID.Value)
 		if err != nil {
 			switch {
 			case errors.Is(err, postgres.ErrNotFound):
-				// Delete the existing session cookie.
-				cookie := util.NewExpiredCookie(util.SessionCookieName)
-				http.SetCookie(w, &cookie)
 				http.Redirect(w, r, "/", http.StatusSeeOther)
 			default:
 				http.Error(w, err.Error(), 500)
@@ -37,20 +38,13 @@ func HandleSignoutForm(store *storage.Storage) http.Handler {
 		if err != nil {
 			switch {
 			case errors.Is(err, postgres.ErrNotFound):
-				// Delete the existing session cookie.
-				cookie := util.NewExpiredCookie(util.SessionCookieName)
-				http.SetCookie(w, &cookie)
 				http.Redirect(w, r, "/", http.StatusSeeOther)
 			default:
 				http.Error(w, err.Error(), 500)
 			}
 			return
 		}
 
-		// Delete the existing session cookie.
-		cookie := util.NewExpiredCookie(util.SessionCookieName)
-		http.SetCookie(w, &cookie)
-
 		// Redirect back to the index page.
 		http.Redirect(w, r, "/", http.StatusSeeOther)
 	})