Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🎟️ fix: Preserve OpenID Logout Token Hints (#15653)

aeyeopsdev87097e21139d
diff --git a/api/server/controllers/auth/LogoutController.js b/api/server/controllers/auth/LogoutController.js
index cdf5404569..a9023c84f7 100644
--- a/api/server/controllers/auth/LogoutController.js
+++ b/api/server/controllers/auth/LogoutController.js
@@ -36,7 +36,10 @@ const logoutController = async (req, res) => {
}
/** Both can name distinct durable sessions when an older browser request races rotation. */
refreshToken = parsedCookies.refreshToken || sessionRefreshToken;
- idToken = idToken || parsedCookies.openid_id_token;
+ idToken =
+ idToken ||
+ (isOpenIdUser ? req.session?.openidLogoutIdToken : undefined) ||
+ parsedCookies.openid_id_token;
const logoutTokens = isOpenIdUser
? [...new Set([parsedCookies.refreshToken, sessionRefreshToken].filter(Boolean))]
: [refreshToken];
@@ -63,8 +66,9 @@ const logoutController = async (req, res) => {
userId,
tenantId: req.user?.tenantId,
});
- if (req.session?.openidTokens) {
+ if (req.session) {
delete req.session.openidTokens;
+ delete req.session.openidLogoutIdToken;
}
}
if (logoutTokens.length === 0) {
@@ -158,7 +162,7 @@ const logoutController = async (req, res) => {
} else {
logger.warn(
'[logoutController] Neither id_token_hint nor OPENID_CLIENT_ID is available. ' +
- 'To enable id_token_hint, set OPENID_REUSE_TOKENS=true. ' +
+ 'Sign in again to establish an OpenID session with an ID token. ' +
'The OIDC end-session request may be rejected by the identity provider.',
);
}
diff --git a/api/server/controllers/auth/oauth.js b/api/server/controllers/auth/oauth.js
index e5f6deb3d1..588e6bfa03 100644
--- a/api/server/controllers/auth/oauth.js
+++ b/api/server/controllers/auth/oauth.js
@@ -89,6 +89,12 @@ function createOAuthHandler(redirectUri = domains.client) {
});
} else {
await setAuthTokens(req.user._id, res, null, req);
+ if (
+ req.user.provider === 'openid' &&
+ isEnabled(process.env.OPENID_USE_END_SESSION_ENDPOINT)
+ ) {
+ req.session.openidLogoutIdToken = req.user.tokenset?.id_token;
+ }
}
res.redirect(redirectUri);
} catch (err) {