diff --git a/src/Utils/AuthorizationUtils.ts b/src/Utils/AuthorizationUtils.ts index d4c42a216..bc04fe437 100644 --- a/src/Utils/AuthorizationUtils.ts +++ b/src/Utils/AuthorizationUtils.ts @@ -50,7 +50,10 @@ export function decryptJWTToken(token: string) { export async function getMsalInstance() { // Compute the redirect bridge URL for MSAL v5 COOP handling - const redirectBridgeUrl = `${window.location.origin}/redirectBridge.html`; + const redirectBridgeUrl = + process.env.NODE_ENV === "development" + ? "https://dataexplorer-dev.azurewebsites.net/redirectBridge.html" + : `${window.location.origin}/redirectBridge.html`; const msalConfig: msal.Configuration = { cache: { @@ -64,7 +67,7 @@ export async function getMsalInstance() { }, }; - if (process.env.NODE_ENV === "development" && !window.location.hostname.includes("localhost")) { + if (process.env.NODE_ENV === "development") { msalConfig.auth.redirectUri = "https://dataexplorer-dev.azurewebsites.net/redirectBridge.html"; } diff --git a/src/hooks/useAADAuth.ts b/src/hooks/useAADAuth.ts index 146aff8a6..b2efd63db 100644 --- a/src/hooks/useAADAuth.ts +++ b/src/hooks/useAADAuth.ts @@ -58,9 +58,11 @@ export function useAADAuth(config?: ConfigContext): ReturnType { if (!msalInstance || !config) { return; } - // Use redirect bridge for MSAL v5 COOP handling (CG alert MVS-2026-vmmw-f85q) - const redirectBridgeUrl = `${window.location.origin}/redirectBridge.html`; + const redirectBridgeUrl = + process.env.NODE_ENV === "development" + ? "https://dataexplorer-dev.azurewebsites.net/redirectBridge.html" + : `${window.location.origin}/redirectBridge.html`; try { const response = await msalInstance.loginPopup({ @@ -93,7 +95,10 @@ export function useAADAuth(config?: ConfigContext): ReturnType { return; } // Use redirect bridge for MSAL v5 COOP handling (CG alert MVS-2026-vmmw-f85q) - const redirectBridgeUrl = `${window.location.origin}/redirectBridge.html`; + const redirectBridgeUrl = + process.env.NODE_ENV === "development" + ? "https://dataexplorer-dev.azurewebsites.net/redirectBridge.html" + : `${window.location.origin}/redirectBridge.html`; try { const response = await msalInstance.loginPopup({ redirectUri: redirectBridgeUrl,