Fix no id_token_hint in OIDC logout

Author: Astagor

src/store/actions/managementActions.tsx

@@ -517,11 +517,15 @@ export const startMGMTListeners = (): AppThunk<Promise<void>> => async (
 				const { host, protocol } = new URL(url);
 
 				if (origin && origin === `${protocol}//${host}`) {
-					const { data: token } = data;
+					const { data: token, idToken } = data;
 
 					await (await managementService).authentication.setAccessToken(token);
 					await (await managementService).reAuthenticate();
 
+					if (idToken) {
+						localStorage.setItem('oidcIdToken', idToken);
+					}
+
 					dispatch(updateLoginState(token));
 
 					// Populate management.username from OIDC user data

src/store/actions/permissionsActions.tsx

@@ -179,6 +179,10 @@ export const logout = (): AppThunk<Promise<void>> => async (
 
 	const tenantId = await dispatch(getTenantFromFqdn(window.location.hostname));
 
+	const idToken = localStorage.getItem('oidcIdToken');
+
+	localStorage.removeItem('oidcIdToken');
+
 	await (await managementService).authentication.removeAccessToken();
 
 	dispatch(updateLoginState());
@@ -192,7 +196,13 @@ export const logout = (): AppThunk<Promise<void>> => async (
 		return logger.error('logout() | no tenant found');
 
 	} else {
-		window.open(`${config.managementUrl}/auth/logout?tenantId=${tenantId}`, 'logoutWindow');
+		const params = new URLSearchParams({ tenantId: String(tenantId) });
+
+		if (idToken) {
+			params.set('id_token_hint', idToken);
+		}
+
+		window.open(`${config.managementUrl}/auth/logout?${params.toString()}`, 'logoutWindow');
 	}
 };
 

src/store/actions/startActions.tsx

@@ -306,11 +306,15 @@ export const startListeners = (): AppThunk<Promise<void>> => async (
 				const { host, protocol } = new URL(url);
 
 				if (origin && origin === `${protocol}//${host}`) {
-					const { data: token } = data;
+					const { data: token, idToken } = data;
 
 					await (await managementService).authentication.setAccessToken(token);
 					await (await managementService).reAuthenticate();
 
+					if (idToken) {
+						localStorage.setItem('oidcIdToken', idToken);
+					}
+
 					dispatch(updateLoginState(token));
 
 					// Populate management.username from OIDC user data