Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions client/src/app/axios-config/apiInit.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import axios from "axios";
import { User, UserManager } from "oidc-client-ts";

import { OIDC_CLIENT_ID, OIDC_SERVER_URL, oidcClientSettings } from "@app/oidc";
import {
OIDC_CLIENT_ID,
OIDC_SERVER_URL,
oidcClientSettings,
oidcSignoutArgs,
} from "@app/oidc";

import { createClient } from "@app/client/client";
import { isAuthRequired } from "@app/Constants";
Expand Down Expand Up @@ -71,7 +76,7 @@ export const initInterceptors = () => {
});
}
} catch (_refreshError) {
await userManager.signoutRedirect();
await userManager.signoutRedirect(oidcSignoutArgs);
}
}

Expand Down
3 changes: 2 additions & 1 deletion client/src/app/layout/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import ExternalLinkAltIcon from "@patternfly/react-icons/dist/js/icons/external-

import { isAuthRequired } from "@app/Constants";
import useBranding from "@app/hooks/useBranding";
import { oidcSignoutArgs } from "@app/oidc";

import imgAvatar from "../images/avatar.svg";
import { AboutApp } from "./about";
Expand Down Expand Up @@ -68,7 +69,7 @@ export const HeaderApp: React.FC = () => {

const logout = () => {
auth
?.signoutRedirect()
?.signoutRedirect(oidcSignoutArgs)
.then(() => {})
.catch((err) => {
console.error("Logout failed:", err);
Expand Down
9 changes: 9 additions & 0 deletions client/src/app/oidc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ export const OIDC_SERVER_URL = isAuthServerEmbedded
: ENV.OIDC_SERVER_URL || "http://localhost:8090/realms/trustify";
export const OIDC_CLIENT_ID = ENV.OIDC_CLIENT_ID || "frontend";

// Cognito requires client_id + logout_uri.
// Keycloak ignores both (uses id_token_hint + post_logout_redirect_uri added by oidc-client-ts instead) and follows the OIDC RP-Initiated Logout spec.
export const oidcSignoutArgs = {
extraQueryParams: {
client_id: OIDC_CLIENT_ID,
logout_uri: window.location.origin,
},
};

export const oidcClientSettings: OidcClientSettings = {
authority: OIDC_SERVER_URL,
client_id: OIDC_CLIENT_ID,
Expand Down