From a52cd5f06dc44536e481a936ab1d8eab5b4d9b98 Mon Sep 17 00:00:00 2001 From: Sindhu Balasubramanian Date: Tue, 7 Apr 2026 09:40:28 -0700 Subject: [PATCH] Fix URI for logout and other minor fix --- src/Utils/AuthorizationUtils.ts | 6 ++---- src/hooks/useAADAuth.ts | 7 ++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Utils/AuthorizationUtils.ts b/src/Utils/AuthorizationUtils.ts index bc04fe437..95dfc48b5 100644 --- a/src/Utils/AuthorizationUtils.ts +++ b/src/Utils/AuthorizationUtils.ts @@ -67,13 +67,11 @@ export async function getMsalInstance() { }, }; - if (process.env.NODE_ENV === "development") { - msalConfig.auth.redirectUri = "https://dataexplorer-dev.azurewebsites.net/redirectBridge.html"; - } - const msalInstance = new msal.PublicClientApplication(msalConfig); // v3+ requires explicit initialization before using MSAL APIs await msalInstance.initialize(); + // Handle any redirect response (e.g., after logoutRedirect) to clear interaction state + await msalInstance.handleRedirectPromise(); return msalInstance; } diff --git a/src/hooks/useAADAuth.ts b/src/hooks/useAADAuth.ts index b2efd63db..e12d4cc7b 100644 --- a/src/hooks/useAADAuth.ts +++ b/src/hooks/useAADAuth.ts @@ -86,7 +86,12 @@ export function useAADAuth(config?: ConfigContext): ReturnType { } setLoggedOut(); localStorage.removeItem("cachedTenantId"); - msalInstance.logoutRedirect(); + // Redirect back to the hosted explorer after logout + const postLogoutRedirectUri = + process.env.NODE_ENV === "development" + ? "https://dataexplorer-dev.azurewebsites.net/hostedExplorer.html" + : `${window.location.origin}`; + msalInstance.logoutRedirect({ postLogoutRedirectUri }); }, [msalInstance]); const switchTenant = React.useCallback(