Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

Stable logout URI when skipEndSessionEndpoint

Browse Source
This commit is contained in:
vviers 2024-10-22 17:31:35 +02:00
parent 6d9f39b5a4
commit 033947ba04
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/server/lib/OIDCConfig.ts
View File

@ -281,9 +281,11 @@ export class OIDCConfig {
public async getLogoutRedirectUrl(req: express.Request, redirectUrl: URL): Promise<string> { public async getLogoutRedirectUrl(req: express.Request, redirectUrl: URL): Promise<string> {
const session: SessionObj|undefined = (req as RequestWithLogin).session; const session: SessionObj|undefined = (req as RequestWithLogin).session;
const stableRedirectUri = new URL('/signed-out', getOriginUrl(req)).href;
// For IdPs that don't have end_session_endpoint, we just redirect to the logout page. // For IdPs that don't have end_session_endpoint, we just redirect to the logout page.
if (this._skipEndSessionEndpoint) { if (this._skipEndSessionEndpoint) {
return redirectUrl.href; // Ignore redirectUrl because OIDC providers don't allow variable redirect URIs
return stableRedirectUri;
} }
// Alternatively, we could use a logout URL specified by configuration. // Alternatively, we could use a logout URL specified by configuration.
if (this._endSessionEndpoint) { if (this._endSessionEndpoint) {
@ -291,7 +293,7 @@ export class OIDCConfig {
} }
return this._client.endSessionUrl({ return this._client.endSessionUrl({
// Ignore redirectUrl because OIDC providers don't allow variable redirect URIs // Ignore redirectUrl because OIDC providers don't allow variable redirect URIs
post_logout_redirect_uri: new URL('/signed-out', getOriginUrl(req)).href, post_logout_redirect_uri: stableRedirectUri,
id_token_hint: session?.oidc?.idToken, id_token_hint: session?.oidc?.idToken,
}); });
} }

2
test/server/lib/OIDCConfig.ts
View File

@ -768,7 +768,7 @@ describe('OIDCConfig', () => {
env: { env: {
GRIST_OIDC_IDP_SKIP_END_SESSION_ENDPOINT: 'true', GRIST_OIDC_IDP_SKIP_END_SESSION_ENDPOINT: 'true',
}, },
expectedUrl: REDIRECT_URL.href, expectedUrl: STABLE_LOGOUT_URL.href,
}, { }, {
itMsg: 'should use the GRIST_OIDC_IDP_END_SESSION_ENDPOINT when it is set', itMsg: 'should use the GRIST_OIDC_IDP_END_SESSION_ENDPOINT when it is set',
env: { env: {