never log in to logout page

loculus-project · Feb 28, 2024 · 7ecb315 · 7ecb315
1 parent e7f2d9b
commit 7ecb315
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/website/src/middleware/authMiddleware.ts b/website/src/middleware/authMiddleware.ts
@@ -4,6 +4,7 @@ import jsonwebtoken from 'jsonwebtoken';
 import JwksRsa from 'jwks-rsa';
 import { err, ok, ResultAsync } from 'neverthrow';
 import { type BaseClient, Issuer, type TokenSet } from 'openid-client';
+import {routes} from "../routes"
 
 import { getConfiguredOrganisms, getRuntimeConfig } from '../config.ts';
 import { getInstanceLogger } from '../logger.ts';
@@ -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',