Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Never log in to logout page #1173

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Never log in to logout page #1173

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ecb315
never log in to logout page
theosanderson Feb 28, 2024
fd2f73d
format
theosanderson Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions website/src/middleware/authMiddleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { type BaseClient, Issuer, type TokenSet } from 'openid-client';

import { getConfiguredOrganisms, getRuntimeConfig } from '../config.ts';
import { getInstanceLogger } from '../logger.ts';
import { routes } from '../routes';
import { shouldMiddlewareEnforceLogin } from '../utils/shouldMiddlewareEnforceLogin.ts';

export const ACCESS_TOKEN_COOKIE = 'access_token';
Expand Down Expand Up @@ -47,6 +48,10 @@ export async function getKeycloakClient() {
}

export const getAuthUrl = async (redirectUrl: string) => {
const logout = routes.logout();
if (redirectUrl.endsWith(logout)) {
redirectUrl = redirectUrl.replace(logout, routes.userOverviewPage());
}
const authUrl = (await getKeycloakClient()).authorizationUrl({
redirect_uri: redirectUrl,
scope: 'openid',
Expand Down
Loading