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: Discard Stale Session Tokens at OpenID Login (#15668)

Danny Avilaf1a21764f3ea
diff --git a/api/server/controllers/auth/oauth.js b/api/server/controllers/auth/oauth.js
index bdfcd102bc..e5f6deb3d1 100644
--- a/api/server/controllers/auth/oauth.js
+++ b/api/server/controllers/auth/oauth.js
@@ -83,6 +83,7 @@ function createOAuthHandler(redirectUri = domains.client) {
existingRefreshToken: req.user.tokenset.refresh_token,
openidSubject: req.user.openidId,
openidIssuer: req.user.openidIssuer,
+ discardSessionTokens: true,
req,
res,
});
diff --git a/api/server/controllers/auth/oauth.spec.js b/api/server/controllers/auth/oauth.spec.js
index c0b6f09e76..e28658da4c 100644
--- a/api/server/controllers/auth/oauth.spec.js
+++ b/api/server/controllers/auth/oauth.spec.js
@@ -169,6 +169,7 @@ describe('createOAuthHandler', () => {
existingRefreshToken: 'openid-refresh-token',
openidSubject: undefined,
openidIssuer: undefined,
+ discardSessionTokens: true,
req,
res,
});
diff --git a/packages/api/src/auth/openid/recovery.spec.ts b/packages/api/src/auth/openid/recovery.spec.ts
index ac49347ed2..ba512edb0b 100644
--- a/packages/api/src/auth/openid/recovery.spec.ts
+++ b/packages/api/src/auth/openid/recovery.spec.ts
@@ -104,4 +104,49 @@ describe('OpenID authentication publication settlement', () => {
expect(deps.completeOpenIDRefreshFlight).toHaveBeenCalledTimes(1);
expect(deps.failOpenIDRefreshFlight).not.toHaveBeenCalled();
});
+
+ describe('with a stale token set left in the Express session', () => {
+ function buildStaleSession() {
+ return {
+ accessToken: 'stale-access',
+ idToken: 'stale-id',
+ refreshToken: 'stale-refresh',
+ accessTokenExpiresAt: Math.floor(Date.now() / 1000) - 120,
+ };
+ }
+
+ it('publishes the IdP token set at login instead of the stale session set', async () => {
+ const { deps, service, input } = setup();
+ const req = { session: { openidTokens: buildStaleSession() } };
+ await expect(
+ service.sendOpenIDAuthResponse({ ...input, req, discardSessionTokens: true }),
+ ).resolves.toBe('app-token');
+ expect(req.session.openidTokens).toBeUndefined();
+ expect(deps.completeOpenIDRefreshFlight).toHaveBeenCalledWith(
+ expect.objectContaining({
+ tokens: expect.objectContaining({
+ tokenset: expect.objectContaining({ access_token: 'access', refresh_token: 'refresh' }),
+ }),
+ }),
+ );
+ expect(deps.setOpenIDAuthTokens).toHaveBeenCalledWith(
+ expect.objectContaining({ access_token: 'access', refresh_token: 'refresh' }),
+ req,
+ input.res,
+ expect.objectContaining({ userId: 'user', existingRefreshToken: 'refresh' }),
+ );
+ });
+
+ it('keeps adopting an advanced session on the refresh path', async () => {
+ const { deps, service, input } = setup();
+ const req = { session: { openidTokens: buildStaleSession() } };
+ await expect(service.sendOpenIDAuthResponse({ ...input, req })).resolves.toBe('app-token');
+ expect(deps.setOpenIDAuthTokens).toHaveBeenCalledWith(
+ expect.objectContaining({ access_token: 'stale-access', refresh_token: 'stale-refresh' }),
+ req,
+ input.res,
+ expect.objectContaining({ existingRefreshToken: 'stale-refresh' }),
+ );
+ });
+ });
});
diff --git a/packages/api/src/auth/openid/recovery.ts b/packages/api/src/auth/openid/recovery.ts
index d9f8b0a37b..baa61a5738 100644
--- a/packages/api/src/auth/openid/recovery.ts
+++ b/packages/api/src/auth/openid/recovery.ts
@@ -100,6 +100,12 @@ interface SendOpenIDAuthResponseInput {
},
) => Promise<void>;
preparePublication?: boolean;
+ /**
+ * A fresh authorization-code login supersedes whatever token set the Express session still
+ * holds from an earlier authentication. The advanced-session comparison exists for refresh
+ * races and must not republish that stale set in place of the tokens the IdP just issued.
+ */
+ discardSessionTokens?: boolean;
}
export interface OpenIDRefreshRecoveryService {
@@ -679,6 +685,7 @@ export function createOpenIDRefreshRecoveryService(
publicationGeneration,
commitPublication,
preparePublication = true,
+ discardSessionTokens = false,
}: SendOpenIDAuthResponseInput): Promise<string | undefined> {
const userId = user._id.toString();
const publicationIdentity = predecessorIdentity ?? {
@@ -720,6 +727,7 @@ export function createOpenIDRefreshRecoveryService(
publicationGeneration: sharedGeneration,
commitPublication: async () => {},
preparePublication: false,
+ discardSessionTokens,
});
}
let completionStarted = false;
@@ -745,6 +753,7 @@ export function createOpenIDRefreshRecoveryService(
? new Date(flight.flight.createdAt).getTime()
: Date.now(),
},
+ discardSessionTokens,
commitPublication: async (appAuthToken, publishedTokenset, metadata) => {
const completed = await completeOpenIDRefreshFlight({
key,
@@ -797,6 +806,9 @@ export function createOpenIDRefreshRecoveryService(
reload((error?: Error | null) => (error ? reject(error) : resolve()));
});
}
+ if (discardSessionTokens && req?.session?.openidTokens) {
+ delete req.session.openidTokens;
+ }
let effectiveTokenset = tokenset;
let effectiveExistingRefreshToken = existingRefreshToken;
let usesAdvancedSession = false;