[PLT-2291] Fix: Handle missing JWT cookie on oauth2-proxy logout

unai-ttxu · vjacynycz · commit 862fc9dd4607 · 2025-09-17T10:07:20.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ### 7.12.0-0.4.0 (upcoming)
 
-* [PLT-795] Bump oauth2 proxy upstream version to 7.12.0
+* [PLT-2291] Fix: Handle missing JWT cookie on oauth2-proxy logout
+* [PLT-795] Bump oauth2 proxy upstream version to 7.11.0
 
 ### 7.5.1-0.3.0 (2023-11-24)
 
diff --git a/pkg/sessions/jwt/jwt_session_store.go b/pkg/sessions/jwt/jwt_session_store.go
@@ -175,7 +175,7 @@ func (s *SessionStore) sessionFromToken(tokenString string) (*sessions.SessionSt
 func (s *SessionStore) Clear(rw http.ResponseWriter, req *http.Request) error {
 	c, err := req.Cookie(s.Cookie.Name)
 	if err != nil {
-		return err
+		return nil
 	}
 	clearCookie := s.makeCookie(req, c.Name, "", time.Hour*-1)
 	http.SetCookie(rw, clearCookie)

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ func (s SessionStore) sessionFromToken(tokenString string) (sessions.SessionSt`
`175`	`175`	`func (s SessionStore) Clear(rw http.ResponseWriter, req http.Request) error {`
`176`	`176`	`c, err := req.Cookie(s.Cookie.Name)`
`177`	`177`	`if err != nil {`
`178`		`- return err`
	`178`	`+ return nil`
`179`	`179`	`}`
`180`	`180`	`clearCookie := s.makeCookie(req, c.Name, "", time.Hour*-1)`
`181`	`181`	`http.SetCookie(rw, clearCookie)`