@azure/msal-browser 4.8.0 → 4.9.1

package/src/interaction_client/RedirectClient.ts

@@ -4,15 +4,12 @@
  */
 
 import {
-    CommonAuthorizationCodeRequest,
     AuthorizationCodeClient,
     UrlString,
     AuthError,
     ServerTelemetryManager,
     Constants,
-    ProtocolUtils,
     AuthorizeResponse,
-    ThrottlingUtils,
     ICrypto,
     Logger,
     IPerformanceClient,
@@ -22,6 +19,7 @@ import {
     ServerResponseType,
     UrlUtils,
     InProgressPerformanceEvent,
+    CommonAuthorizationUrlRequest,
 } from "@azure/msal-common/browser";
 import { StandardInteractionClient } from "./StandardInteractionClient.js";
 import {
@@ -29,7 +27,6 @@ import {
     InteractionType,
     TemporaryCacheKeys,
 } from "../utils/BrowserConstants.js";
-import { RedirectHandler } from "../interaction_handler/RedirectHandler.js";
 import * as BrowserUtils from "../utils/BrowserUtils.js";
 import { EndSessionRequest } from "../request/EndSessionRequest.js";
 import { EventType } from "../event/EventType.js";
@@ -39,7 +36,6 @@ import {
     BrowserAuthErrorCodes,
 } from "../error/BrowserAuthError.js";
 import { RedirectRequest } from "../request/RedirectRequest.js";
-import { NativeInteractionClient } from "./NativeInteractionClient.js";
 import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandler.js";
 import { BrowserConfiguration } from "../config/Configuration.js";
 import { BrowserCacheManager } from "../cache/BrowserCacheManager.js";
@@ -48,8 +44,9 @@ import { INavigationClient } from "../navigation/INavigationClient.js";
 import { EventError } from "../event/EventMessage.js";
 import { AuthenticationResult } from "../response/AuthenticationResult.js";
 import * as ResponseHandler from "../response/ResponseHandler.js";
-import { getAuthCodeRequestUrl } from "../protocol/Authorize.js";
+import * as Authorize from "../protocol/Authorize.js";
 import { generatePkceCodes } from "../crypto/PkceGenerator.js";
+import { generateEarKey } from "../crypto/BrowserCrypto.js";
 
 function getNavigationType(): NavigationTimingType | undefined {
     if (
@@ -109,25 +106,13 @@ export class RedirectClient extends StandardInteractionClient {
             this.correlationId
         )(request, InteractionType.Redirect);
 
-        const pkceCodes = await invokeAsync(
-            generatePkceCodes,
-            PerformanceEvents.GeneratePkceCodes,
-            this.logger,
-            this.performanceClient,
-            this.correlationId
-        )(this.performanceClient, this.logger, this.correlationId);
-        validRequest.codeChallenge = pkceCodes.challenge;
-
-        this.browserStorage.updateCacheEntries(
-            validRequest.state,
-            validRequest.nonce,
-            validRequest.authority,
-            validRequest.loginHint || "",
-            validRequest.account || null
-        );
-        const serverTelemetryManager = this.initializeServerTelemetryManager(
-            ApiId.acquireTokenRedirect
-        );
+        validRequest.platformBroker =
+            NativeMessageHandler.isPlatformBrokerAvailable(
+                this.config,
+                this.logger,
+                this.nativeMessageHandler,
+                request.authenticationScheme
+            );
 
         const handleBackButton = (event: PageTransitionEvent) => {
             // Clear temporary cache if the back button is clicked during the redirect flow.
@@ -135,7 +120,7 @@ export class RedirectClient extends StandardInteractionClient {
                 this.logger.verbose(
                     "Page was restored from back/forward cache. Clearing temporary cache."
                 );
-                this.browserStorage.cleanRequestByState(validRequest.state);
+                this.browserStorage.resetRequestCache();
                 this.eventHandler.emitEvent(
                     EventType.RESTORE_FROM_BFCACHE,
                     InteractionType.Redirect
@@ -143,6 +128,70 @@ export class RedirectClient extends StandardInteractionClient {
             }
         };
 
+        const redirectStartPage = this.getRedirectStartPage(
+            request.redirectStartPage
+        );
+        this.logger.verbosePii(`Redirect start page: ${redirectStartPage}`);
+        // Cache start page, returns to this page after redirectUri if navigateToLoginRequestUrl is true
+        this.browserStorage.setTemporaryCache(
+            TemporaryCacheKeys.ORIGIN_URI,
+            redirectStartPage,
+            true
+        );
+
+        // Clear temporary cache if the back button is clicked during the redirect flow.
+        window.addEventListener("pageshow", handleBackButton);
+
+        try {
+            if (this.config.auth.protocolMode === ProtocolMode.EAR) {
+                await this.executeEarFlow(validRequest);
+            } else {
+                await this.executeCodeFlow(
+                    validRequest,
+                    request.onRedirectNavigate
+                );
+            }
+        } catch (e) {
+            if (e instanceof AuthError) {
+                e.setCorrelationId(this.correlationId);
+            }
+            window.removeEventListener("pageshow", handleBackButton);
+            throw e;
+        }
+    }
+
+    /**
+     * Executes auth code + PKCE flow
+     * @param request
+     * @returns
+     */
+    async executeCodeFlow(
+        request: CommonAuthorizationUrlRequest,
+        onRedirectNavigate?: (url: string) => boolean | void
+    ): Promise<void> {
+        const correlationId = request.correlationId;
+        const serverTelemetryManager = this.initializeServerTelemetryManager(
+            ApiId.acquireTokenRedirect
+        );
+
+        const pkceCodes = await invokeAsync(
+            generatePkceCodes,
+            PerformanceEvents.GeneratePkceCodes,
+            this.logger,
+            this.performanceClient,
+            correlationId
+        )(this.performanceClient, this.logger, correlationId);
+
+        const redirectRequest = {
+            ...request,
+            codeChallenge: pkceCodes.challenge,
+        };
+
+        this.browserStorage.cacheAuthorizeRequest(
+            redirectRequest,
+            pkceCodes.verifier
+        );
+
         try {
             // Initialize the client
             const authClient: AuthorizationCodeClient = await invokeAsync(
@@ -153,78 +202,87 @@ export class RedirectClient extends StandardInteractionClient {
                 this.correlationId
             )({
                 serverTelemetryManager,
-                requestAuthority: validRequest.authority,
-                requestAzureCloudOptions: validRequest.azureCloudOptions,
-                requestExtraQueryParameters: validRequest.extraQueryParameters,
-                account: validRequest.account,
+                requestAuthority: redirectRequest.authority,
+                requestAzureCloudOptions: redirectRequest.azureCloudOptions,
+                requestExtraQueryParameters:
+                    redirectRequest.extraQueryParameters,
+                account: redirectRequest.account,
             });
 
-            const authCodeRequest: CommonAuthorizationCodeRequest = {
-                ...validRequest,
-                code: "", // Will get filled in after the redirect
-                codeVerifier: pkceCodes.verifier,
-            };
-            // Create redirect interaction handler.
-            const interactionHandler = new RedirectHandler(
-                authClient,
-                this.browserStorage,
-                authCodeRequest,
-                this.logger,
-                this.performanceClient
-            );
-
             // Create acquire token url.
             const navigateUrl = await invokeAsync(
-                getAuthCodeRequestUrl,
+                Authorize.getAuthCodeRequestUrl,
                 PerformanceEvents.GetAuthCodeUrl,
                 this.logger,
                 this.performanceClient,
-                validRequest.correlationId
+                request.correlationId
             )(
                 this.config,
                 authClient.authority,
-                {
-                    ...validRequest,
-                    platformBroker:
-                        NativeMessageHandler.isPlatformBrokerAvailable(
-                            this.config,
-                            this.logger,
-                            this.nativeMessageHandler,
-                            request.authenticationScheme
-                        ),
-                },
+                redirectRequest,
                 this.logger,
                 this.performanceClient
             );
-
-            const redirectStartPage = this.getRedirectStartPage(
-                request.redirectStartPage
-            );
-            this.logger.verbosePii(`Redirect start page: ${redirectStartPage}`);
-
-            // Clear temporary cache if the back button is clicked during the redirect flow.
-            window.addEventListener("pageshow", handleBackButton);
-
             // Show the UI once the url has been created. Response will come back in the hash, which will be handled in the handleRedirectCallback function.
-            return await interactionHandler.initiateAuthRequest(navigateUrl, {
-                navigationClient: this.navigationClient,
-                redirectTimeout: this.config.system.redirectNavigationTimeout,
-                redirectStartPage: redirectStartPage,
-                onRedirectNavigate:
-                    request.onRedirectNavigate ||
-                    this.config.auth.onRedirectNavigate,
-            });
+            return await this.initiateAuthRequest(
+                navigateUrl,
+                onRedirectNavigate
+            );
         } catch (e) {
             if (e instanceof AuthError) {
                 e.setCorrelationId(this.correlationId);
                 serverTelemetryManager.cacheFailedRequest(e);
             }
-            window.removeEventListener("pageshow", handleBackButton);
-            this.browserStorage.cleanRequestByState(validRequest.state);
             throw e;
         }
     }
 
+    /**
+     * Executes EAR flow
+     * @param request
+     */
+    async executeEarFlow(
+        request: CommonAuthorizationUrlRequest
+    ): Promise<void> {
+        const correlationId = request.correlationId;
+        // Get the frame handle for the silent request
+        const discoveredAuthority = await invokeAsync(
+            this.getDiscoveredAuthority.bind(this),
+            PerformanceEvents.StandardInteractionClientGetDiscoveredAuthority,
+            this.logger,
+            this.performanceClient,
+            correlationId
+        )({
+            requestAuthority: request.authority,
+            requestAzureCloudOptions: request.azureCloudOptions,
+            requestExtraQueryParameters: request.extraQueryParameters,
+            account: request.account,
+        });
+
+        const earJwk = await invokeAsync(
+            generateEarKey,
+            PerformanceEvents.GenerateEarKey,
+            this.logger,
+            this.performanceClient,
+            correlationId
+        )();
+        const redirectRequest = {
+            ...request,
+            earJwk: earJwk,
+        };
+        this.browserStorage.cacheAuthorizeRequest(redirectRequest);
+
+        const form = await Authorize.getEARForm(
+            document,
+            this.config,
+            discoveredAuthority,
+            redirectRequest,
+            this.logger,
+            this.performanceClient
+        );
+        form.submit();
+    }
+
     /**
      * Checks if navigateToLoginRequestUrl is set, and:
      * - if true, performs logic to cache and navigate
@@ -234,6 +292,8 @@ export class RedirectClient extends StandardInteractionClient {
      */
     async handleRedirectPromise(
         hash: string = "",
+        request: CommonAuthorizationUrlRequest,
+        pkceVerifier: string,
         parentMeasurement: InProgressPerformanceEvent
     ): Promise<AuthenticationResult | null> {
         const serverTelemetryManager = this.initializeServerTelemetryManager(
@@ -241,12 +301,6 @@ export class RedirectClient extends StandardInteractionClient {
         );
 
         try {
-            if (!this.browserStorage.isInteractionInProgress(true)) {
-                this.logger.info(
-                    "handleRedirectPromise called but there is no interaction in progress, returning null."
-                );
-                return null;
-            }
             const [serverParams, responseString] = this.getRedirectResponse(
                 hash || ""
             );
@@ -255,9 +309,7 @@ export class RedirectClient extends StandardInteractionClient {
                 this.logger.info(
                     "handleRedirectPromise did not detect a response as a result of a redirect. Cleaning temporary cache."
                 );
-                this.browserStorage.cleanRequestByInteractionType(
-                    InteractionType.Redirect
-                );
+                this.browserStorage.resetRequestCache();
 
                 // Do not instrument "no_server_response" if user clicked back button
                 if (getNavigationType() !== "back_forward") {
@@ -298,6 +350,8 @@ export class RedirectClient extends StandardInteractionClient {
 
                 const handleHashResult = await this.handleResponse(
                     serverParams,
+                    request,
+                    pkceVerifier,
                     serverTelemetryManager
                 );
 
@@ -308,6 +362,8 @@ export class RedirectClient extends StandardInteractionClient {
                 );
                 return await this.handleResponse(
                     serverParams,
+                    request,
+                    pkceVerifier,
                     serverTelemetryManager
                 );
             } else if (
@@ -367,6 +423,8 @@ export class RedirectClient extends StandardInteractionClient {
                 if (!processHashOnRedirect) {
                     return await this.handleResponse(
                         serverParams,
+                        request,
+                        pkceVerifier,
                         serverTelemetryManager
                     );
                 }
@@ -378,9 +436,6 @@ export class RedirectClient extends StandardInteractionClient {
                 (e as AuthError).setCorrelationId(this.correlationId);
                 serverTelemetryManager.cacheFailedRequest(e);
             }
-            this.browserStorage.cleanRequestByInteractionType(
-                InteractionType.Redirect
-            );
             throw e;
         }
     }
@@ -459,6 +514,8 @@ export class RedirectClient extends StandardInteractionClient {
      */
     protected async handleResponse(
         serverParams: AuthorizeResponse,
+        request: CommonAuthorizationUrlRequest,
+        codeVerifier: string,
         serverTelemetryManager: ServerTelemetryManager
     ): Promise<AuthenticationResult> {
         const state = serverParams.state;
@@ -466,52 +523,37 @@ export class RedirectClient extends StandardInteractionClient {
             throw createBrowserAuthError(BrowserAuthErrorCodes.noStateInHash);
         }
 
-        const cachedRequest = this.browserStorage.getCachedRequest(state);
-        this.logger.verbose("handleResponse called, retrieved cached request");
-
-        if (serverParams.accountId) {
-            this.logger.verbose(
-                "Account id found in hash, calling WAM for token"
-            );
-            if (!this.nativeMessageHandler) {
-                throw createBrowserAuthError(
-                    BrowserAuthErrorCodes.nativeConnectionNotEstablished
-                );
-            }
-            const nativeInteractionClient = new NativeInteractionClient(
+        if (serverParams.ear_jwe) {
+            const discoveredAuthority = await invokeAsync(
+                this.getDiscoveredAuthority.bind(this),
+                PerformanceEvents.StandardInteractionClientGetDiscoveredAuthority,
+                this.logger,
+                this.performanceClient,
+                request.correlationId
+            )({
+                requestAuthority: request.authority,
+                requestAzureCloudOptions: request.azureCloudOptions,
+                requestExtraQueryParameters: request.extraQueryParameters,
+                account: request.account,
+            });
+            return invokeAsync(
+                Authorize.handleResponseEAR,
+                PerformanceEvents.HandleResponseEar,
+                this.logger,
+                this.performanceClient,
+                request.correlationId
+            )(
+                request,
+                serverParams,
+                ApiId.acquireTokenRedirect,
                 this.config,
+                discoveredAuthority,
                 this.browserStorage,
-                this.browserCrypto,
-                this.logger,
+                this.nativeStorage,
                 this.eventHandler,
-                this.navigationClient,
-                ApiId.acquireTokenPopup,
+                this.logger,
                 this.performanceClient,
-                this.nativeMessageHandler,
-                serverParams.accountId,
-                this.nativeStorage,
-                cachedRequest.correlationId
-            );
-            const { userRequestState } = ProtocolUtils.parseRequestState(
-                this.browserCrypto,
-                state
-            );
-            return nativeInteractionClient
-                .acquireToken({
-                    ...cachedRequest,
-                    state: userRequestState,
-                    prompt: undefined, // Server should handle the prompt, ideally native broker can do this part silently
-                })
-                .finally(() => {
-                    this.browserStorage.cleanRequestByState(state);
-                });
-        }
-
-        // Hash contains known properties - handle and return in callback
-        const currentAuthority = this.browserStorage.getCachedAuthority(state);
-        if (!currentAuthority) {
-            throw createBrowserAuthError(
-                BrowserAuthErrorCodes.noCachedAuthorityError
+                this.nativeMessageHandler
             );
         }
 
@@ -521,21 +563,97 @@ export class RedirectClient extends StandardInteractionClient {
             this.logger,
             this.performanceClient,
             this.correlationId
-        )({ serverTelemetryManager, requestAuthority: currentAuthority });
-
-        ThrottlingUtils.removeThrottle(
-            this.browserStorage,
-            this.config.auth.clientId,
-            cachedRequest
-        );
-        const interactionHandler = new RedirectHandler(
+        )({ serverTelemetryManager, requestAuthority: request.authority });
+        return invokeAsync(
+            Authorize.handleResponseCode,
+            PerformanceEvents.HandleResponseCode,
+            this.logger,
+            this.performanceClient,
+            request.correlationId
+        )(
+            request,
+            serverParams,
+            codeVerifier,
+            ApiId.acquireTokenRedirect,
+            this.config,
             authClient,
             this.browserStorage,
-            cachedRequest,
+            this.nativeStorage,
+            this.eventHandler,
             this.logger,
-            this.performanceClient
+            this.performanceClient,
+            this.nativeMessageHandler
         );
-        return interactionHandler.handleCodeResponse(serverParams, state);
+    }
+
+    /**
+     * Redirects window to given URL.
+     * @param urlNavigate
+     * @param onRedirectNavigateRequest - onRedirectNavigate callback provided on the request
+     */
+    async initiateAuthRequest(
+        requestUrl: string,
+        onRedirectNavigateRequest?: (url: string) => boolean | void
+    ): Promise<void> {
+        this.logger.verbose("RedirectHandler.initiateAuthRequest called");
+        // Navigate if valid URL
+        if (requestUrl) {
+            this.logger.infoPii(
+                `RedirectHandler.initiateAuthRequest: Navigate to: ${requestUrl}`
+            );
+            const navigationOptions: NavigationOptions = {
+                apiId: ApiId.acquireTokenRedirect,
+                timeout: this.config.system.redirectNavigationTimeout,
+                noHistory: false,
+            };
+
+            const onRedirectNavigate =
+                onRedirectNavigateRequest ||
+                this.config.auth.onRedirectNavigate;
+
+            // If onRedirectNavigate is implemented, invoke it and provide requestUrl
+            if (typeof onRedirectNavigate === "function") {
+                this.logger.verbose(
+                    "RedirectHandler.initiateAuthRequest: Invoking onRedirectNavigate callback"
+                );
+                const navigate = onRedirectNavigate(requestUrl);
+
+                // Returning false from onRedirectNavigate will stop navigation
+                if (navigate !== false) {
+                    this.logger.verbose(
+                        "RedirectHandler.initiateAuthRequest: onRedirectNavigate did not return false, navigating"
+                    );
+                    await this.navigationClient.navigateExternal(
+                        requestUrl,
+                        navigationOptions
+                    );
+                    return;
+                } else {
+                    this.logger.verbose(
+                        "RedirectHandler.initiateAuthRequest: onRedirectNavigate returned false, stopping navigation"
+                    );
+                    return;
+                }
+            } else {
+                // Navigate window to request URL
+                this.logger.verbose(
+                    "RedirectHandler.initiateAuthRequest: Navigating window to navigate url"
+                );
+                await this.navigationClient.navigateExternal(
+                    requestUrl,
+                    navigationOptions
+                );
+                return;
+            }
+        } else {
+            // Throw error if request URL is empty.
+            this.logger.info(
+                "RedirectHandler.initiateAuthRequest: Navigate url is empty"
+            );
+            throw createBrowserAuthError(
+                BrowserAuthErrorCodes.emptyNavigateUri
+            );
+        }
     }
 
     /**

package/src/interaction_client/SilentAuthCodeClient.ts

@@ -11,9 +11,9 @@ import {
     IPerformanceClient,
     PerformanceEvents,
     invokeAsync,
+    CommonAuthorizationUrlRequest,
 } from "@azure/msal-common/browser";
 import { StandardInteractionClient } from "./StandardInteractionClient.js";
-import { AuthorizationUrlRequest } from "../request/AuthorizationUrlRequest.js";
 import { BrowserConfiguration } from "../config/Configuration.js";
 import { BrowserCacheManager } from "../cache/BrowserCacheManager.js";
 import { EventHandler } from "../event/EventHandler.js";
@@ -73,7 +73,7 @@ export class SilentAuthCodeClient extends StandardInteractionClient {
         }
 
         // Create silent request
-        const silentRequest: AuthorizationUrlRequest = await invokeAsync(
+        const silentRequest: CommonAuthorizationUrlRequest = await invokeAsync(
             this.initializeAuthorizationRequest.bind(this),
             PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest,
             this.logger,