@azure/msal-browser 3.21.0 → 3.22.0

package/package.json

@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/AzureAD/microsoft-authentication-library-for-js.git"
   },
-  "version": "3.21.0",
+  "version": "3.22.0",
   "description": "Microsoft Authentication Library for js",
   "keywords": [
     "implicit",
@@ -104,6 +104,6 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@azure/msal-common": "14.14.1"
+    "@azure/msal-common": "14.14.2"
   }
 }

package/src/cache/BrowserCacheManager.ts

@@ -1552,9 +1552,6 @@ export class BrowserCacheManager extends CacheManager {
         this.removeTemporaryItem(
             this.generateCacheKey(TemporaryCacheKeys.NATIVE_REQUEST)
         );
-        this.removeTemporaryItem(
-            this.generateCacheKey(TemporaryCacheKeys.REDIRECT_REQUEST)
-        );
         this.setInteractionInProgress(false);
     }
 
@@ -1616,98 +1613,6 @@ export class BrowserCacheManager extends CacheManager {
         this.setInteractionInProgress(false);
     }
 
-    /**
-     * Create request retry key to cache retry status
-     */
-    generateRequestRetriedKey(): string {
-        return `${Constants.CACHE_PREFIX}.${TemporaryCacheKeys.REQUEST_RETRY}.${this.clientId}`;
-    }
-
-    /**
-     * Gets the request retry value from the cache
-     */
-    getRequestRetried(): number | null {
-        const requestRetriedKey = this.generateRequestRetriedKey();
-        const cachedRetryNumber = this.getTemporaryCache(requestRetriedKey);
-        if (!cachedRetryNumber) {
-            return null;
-        }
-        return parseInt(cachedRetryNumber);
-    }
-
-    /**
-     * Sets the request retry value to "retried" in the cache
-     */
-    setRequestRetried(): void {
-        this.logger.trace("BrowserCacheManager.setRequestRetried called");
-        const requestRetriedKey = this.generateRequestRetriedKey();
-        this.setTemporaryCache(requestRetriedKey, "1", false);
-    }
-
-    /**
-     * Removes all request retry values in the cache
-     */
-    removeRequestRetried(): void {
-        const requestRetriedKey = this.generateRequestRetriedKey();
-        this.removeTemporaryItem(requestRetriedKey);
-    }
-
-    /**
-     * Caches the redirectRequest in the cache
-     * @param redirectRequest
-     */
-    cacheRedirectRequest(redirectRequest: RedirectRequest): void {
-        this.logger.trace("BrowserCacheManager.cacheRedirectRequest called");
-        const { ...restParams } = redirectRequest;
-        delete restParams.onRedirectNavigate;
-        const encodedValue = JSON.stringify(restParams);
-
-        this.setTemporaryCache(
-            TemporaryCacheKeys.REDIRECT_REQUEST,
-            encodedValue,
-            true
-        );
-    }
-
-    /**
-     * Gets redirect request from the cache. Logs an error and returns undefined if nothing is found.
-     */
-    getCachedRedirectRequest(): RedirectRequest | undefined {
-        this.logger.trace(
-            "BrowserCacheManager.getCachedRedirectRequest called"
-        );
-        const cachedRedirectRequest = this.getTemporaryCache(
-            TemporaryCacheKeys.REDIRECT_REQUEST,
-            true
-        );
-        if (!cachedRedirectRequest) {
-            this.logger.error(`No cached redirect request found.`);
-        } else {
-            this.removeTemporaryItem(
-                this.generateCacheKey(TemporaryCacheKeys.REDIRECT_REQUEST)
-            );
-            let parsedRequest: RedirectRequest;
-            try {
-                parsedRequest = JSON.parse(
-                    cachedRedirectRequest
-                ) as RedirectRequest;
-            } catch (e) {
-                this.logger.errorPii(
-                    `Attempted to parse: ${cachedRedirectRequest}`
-                );
-                this.logger.error(
-                    `Parsing cached redirect request threw with error: ${e}`
-                );
-                return;
-            }
-
-            if (parsedRequest) {
-                return parsedRequest;
-            }
-        }
-        return;
-    }
-
     cacheCodeRequest(authCodeRequest: CommonAuthorizationCodeRequest): void {
         this.logger.trace("BrowserCacheManager.cacheCodeRequest called");
 

package/src/error/BrowserAuthError.ts

@@ -92,8 +92,6 @@ export const BrowserAuthErrorMessages = {
         "Invalid base64 encoded string.",
     [BrowserAuthErrorCodes.invalidPopTokenRequest]:
         "Invalid PoP token request. The request should not have both a popKid value and signPopToken set to true.",
-    [BrowserAuthErrorCodes.failedToRetry]:
-        "Unable to retry failed auth code redemption due to usage of the onRedirectNavigate request parameter. Please set onRedirectNavigate on the PublicClientApplication configuration instead or call loginRedirect again.",
 };
 
 /**

package/src/error/BrowserAuthErrorCodes.ts

@@ -56,4 +56,3 @@ export const uninitializedPublicClientApplication =
 export const nativePromptNotSupported = "native_prompt_not_supported";
 export const invalidBase64String = "invalid_base64_string";
 export const invalidPopTokenRequest = "invalid_pop_token_request";
-export const failedToRetry = "failed_to_retry";

package/src/interaction_client/PopupClient.ts

@@ -20,7 +20,6 @@ import {
     ServerResponseType,
     invokeAsync,
     invoke,
-    ServerError,
 } from "@azure/msal-common";
 import { StandardInteractionClient } from "./StandardInteractionClient";
 import { EventType } from "../event/EventType";
@@ -48,7 +47,6 @@ import { PopupWindowAttributes } from "../request/PopupWindowAttributes";
 import { EventError } from "../event/EventMessage";
 import { AuthenticationResult } from "../response/AuthenticationResult";
 import * as ResponseHandler from "../response/ResponseHandler";
-import { AuthorizationUrlRequest } from "../request/AuthorizationUrlRequest";
 
 export type PopupParams = {
     popup?: Window | null;
@@ -184,7 +182,7 @@ export class PopupClient extends StandardInteractionClient {
     }
 
     /**
-     * Helper which initializes authorization clients and requests
+     * Helper which obtains an access_token for your API via opening a popup window in the user's browser
      * @param validRequest
      * @param popupName
      * @param popup
@@ -213,20 +211,19 @@ export class PopupClient extends StandardInteractionClient {
 
         BrowserUtils.preconnect(validRequest.authority);
 
-        let authClient: AuthorizationCodeClient | undefined;
-
         try {
             // Create auth code request and generate PKCE params
-            const authCodeRequest = await invokeAsync(
-                this.initializeAuthorizationCodeRequest.bind(this),
-                PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest,
-                this.logger,
-                this.performanceClient,
-                this.correlationId
-            )(validRequest);
+            const authCodeRequest: CommonAuthorizationCodeRequest =
+                await invokeAsync(
+                    this.initializeAuthorizationCodeRequest.bind(this),
+                    PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest,
+                    this.logger,
+                    this.performanceClient,
+                    this.correlationId
+                )(validRequest);
 
             // Initialize the client
-            authClient = await invokeAsync(
+            const authClient: AuthorizationCodeClient = await invokeAsync(
                 this.createAuthCodeClient.bind(this),
                 PerformanceEvents.StandardInteractionClientCreateAuthCodeClient,
                 this.logger,
@@ -239,218 +236,137 @@ export class PopupClient extends StandardInteractionClient {
                 validRequest.account
             );
 
-            return await invokeAsync(
-                this.acquireTokenPopupAsyncHelper.bind(this),
-                PerformanceEvents.PopupClientTokenHelper,
+            const isNativeBroker = NativeMessageHandler.isNativeAvailable(
+                this.config,
                 this.logger,
-                this.performanceClient,
-                this.correlationId
-            )(
-                authClient,
-                authCodeRequest,
-                validRequest,
-                request,
-                popupName,
-                popupWindowAttributes,
-                popup
+                this.nativeMessageHandler,
+                request.authenticationScheme
             );
-        } catch (e) {
-            if (popup) {
-                // Close the synchronous popup if an error is thrown before the window unload event is registered
-                popup.close();
+            // Start measurement for server calls with native brokering enabled
+            let fetchNativeAccountIdMeasurement;
+            if (isNativeBroker) {
+                fetchNativeAccountIdMeasurement =
+                    this.performanceClient.startMeasurement(
+                        PerformanceEvents.FetchAccountIdWithNativeBroker,
+                        request.correlationId
+                    );
             }
 
-            if (e instanceof AuthError) {
-                (e as AuthError).setCorrelationId(this.correlationId);
-                serverTelemetryManager.cacheFailedRequest(e);
-            }
+            // Create acquire token url.
+            const navigateUrl = await authClient.getAuthCodeUrl({
+                ...validRequest,
+                nativeBroker: isNativeBroker,
+            });
 
-            if (
-                !authClient ||
-                !(e instanceof ServerError) ||
-                e.errorCode !== BrowserConstants.INVALID_GRANT_ERROR
-            ) {
-                throw e;
-            }
+            // Create popup interaction handler.
+            const interactionHandler = new InteractionHandler(
+                authClient,
+                this.browserStorage,
+                authCodeRequest,
+                this.logger,
+                this.performanceClient
+            );
 
-            this.performanceClient.addFields(
-                {
-                    retryError: e.errorCode,
-                },
-                this.correlationId
+            // Show the UI once the url has been created. Get the window handle for the popup.
+            const popupParameters: PopupParams = {
+                popup,
+                popupName,
+                popupWindowAttributes,
+            };
+            const popupWindow: Window = this.initiateAuthRequest(
+                navigateUrl,
+                popupParameters
+            );
+            this.eventHandler.emitEvent(
+                EventType.POPUP_OPENED,
+                InteractionType.Popup,
+                { popupWindow },
+                null
             );
 
-            const retryAuthCodeRequest = await invokeAsync(
-                this.initializeAuthorizationCodeRequest.bind(this),
-                PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest,
-                this.logger,
-                this.performanceClient,
-                this.correlationId
-            )(validRequest);
+            // Monitor the window for the hash. Return the string value and close the popup when the hash is received. Default timeout is 60 seconds.
+            const responseString = await this.monitorPopupForHash(popupWindow);
 
-            return await invokeAsync(
-                this.acquireTokenPopupAsyncHelper.bind(this),
-                PerformanceEvents.PopupClientTokenHelper,
+            const serverParams = invoke(
+                ResponseHandler.deserializeResponse,
+                PerformanceEvents.DeserializeResponse,
                 this.logger,
                 this.performanceClient,
                 this.correlationId
             )(
-                authClient,
-                retryAuthCodeRequest,
-                validRequest,
-                request,
-                popupName,
-                popupWindowAttributes,
-                popup
+                responseString,
+                this.config.auth.OIDCOptions.serverResponseType,
+                this.logger
+            );
+            // Remove throttle if it exists
+            ThrottlingUtils.removeThrottle(
+                this.browserStorage,
+                this.config.auth.clientId,
+                authCodeRequest
             );
-        }
-    }
-
-    /**
-     * Helper which obtains an access_token for your API via opening a popup window in the user's browser
-     * @param authClient
-     * @param authCodeRequest
-     * @param validRequest
-     * @param request
-     * @param popupName
-     * @param popupWindowAttributes
-     * @param popup
-     * @returns A promise that is fulfilled when this function has completed, or rejected if an error was raised.
-     */
-    protected async acquireTokenPopupAsyncHelper(
-        authClient: AuthorizationCodeClient,
-        authCodeRequest: CommonAuthorizationCodeRequest,
-        validRequest: AuthorizationUrlRequest,
-        request: PopupRequest,
-        popupName: string,
-        popupWindowAttributes: PopupWindowAttributes,
-        popup?: Window | null
-    ): Promise<AuthenticationResult> {
-        const correlationId = validRequest.correlationId;
-        this.performanceClient.addQueueMeasurement(
-            PerformanceEvents.PopupClientTokenHelper,
-            correlationId
-        );
-
-        const isNativeBroker = NativeMessageHandler.isNativeAvailable(
-            this.config,
-            this.logger,
-            this.nativeMessageHandler,
-            request.authenticationScheme
-        );
 
-        // Start measurement for server calls with native brokering enabled
-        let fetchNativeAccountIdMeasurement;
-        if (isNativeBroker) {
-            fetchNativeAccountIdMeasurement =
-                this.performanceClient.startMeasurement(
-                    PerformanceEvents.FetchAccountIdWithNativeBroker,
-                    request.correlationId
+            if (serverParams.accountId) {
+                this.logger.verbose(
+                    "Account id found in hash, calling WAM for token"
                 );
-        }
-
-        // Create acquire token url.
-        const navigateUrl = await authClient.getAuthCodeUrl({
-            ...validRequest,
-            nativeBroker: isNativeBroker,
-        });
-
-        // Create popup interaction handler.
-        const interactionHandler = new InteractionHandler(
-            authClient,
-            this.browserStorage,
-            authCodeRequest,
-            this.logger,
-            this.performanceClient
-        );
-
-        // Show the UI once the url has been created. Get the window handle for the popup.
-        const popupParameters: PopupParams = {
-            popup,
-            popupName,
-            popupWindowAttributes,
-        };
-        const popupWindow: Window = this.initiateAuthRequest(
-            navigateUrl,
-            popupParameters
-        );
-        this.eventHandler.emitEvent(
-            EventType.POPUP_OPENED,
-            InteractionType.Popup,
-            { popupWindow },
-            null
-        );
-
-        // Monitor the window for the hash. Return the string value and close the popup when the hash is received. Default timeout is 60 seconds.
-        const responseString = await this.monitorPopupForHash(popupWindow);
-
-        const serverParams = invoke(
-            ResponseHandler.deserializeResponse,
-            PerformanceEvents.DeserializeResponse,
-            this.logger,
-            this.performanceClient,
-            this.correlationId
-        )(
-            responseString,
-            this.config.auth.OIDCOptions.serverResponseType,
-            this.logger
-        );
-        // Remove throttle if it exists
-        ThrottlingUtils.removeThrottle(
-            this.browserStorage,
-            this.config.auth.clientId,
-            authCodeRequest
-        );
+                // end measurement for server call with native brokering enabled
+                if (fetchNativeAccountIdMeasurement) {
+                    fetchNativeAccountIdMeasurement.end({
+                        success: true,
+                        isNativeBroker: true,
+                    });
+                }
 
-        if (serverParams.accountId) {
-            this.logger.verbose(
-                "Account id found in hash, calling WAM for token"
-            );
-            // end measurement for server call with native brokering enabled
-            if (fetchNativeAccountIdMeasurement) {
-                fetchNativeAccountIdMeasurement.end({
-                    success: true,
-                    isNativeBroker: true,
+                if (!this.nativeMessageHandler) {
+                    throw createBrowserAuthError(
+                        BrowserAuthErrorCodes.nativeConnectionNotEstablished
+                    );
+                }
+                const nativeInteractionClient = new NativeInteractionClient(
+                    this.config,
+                    this.browserStorage,
+                    this.browserCrypto,
+                    this.logger,
+                    this.eventHandler,
+                    this.navigationClient,
+                    ApiId.acquireTokenPopup,
+                    this.performanceClient,
+                    this.nativeMessageHandler,
+                    serverParams.accountId,
+                    this.nativeStorage,
+                    validRequest.correlationId
+                );
+                const { userRequestState } = ProtocolUtils.parseRequestState(
+                    this.browserCrypto,
+                    validRequest.state
+                );
+                return await nativeInteractionClient.acquireToken({
+                    ...validRequest,
+                    state: userRequestState,
+                    prompt: undefined, // Server should handle the prompt, ideally native broker can do this part silently
                 });
             }
 
-            if (!this.nativeMessageHandler) {
-                throw createBrowserAuthError(
-                    BrowserAuthErrorCodes.nativeConnectionNotEstablished
-                );
-            }
-            const nativeInteractionClient = new NativeInteractionClient(
-                this.config,
-                this.browserStorage,
-                this.browserCrypto,
-                this.logger,
-                this.eventHandler,
-                this.navigationClient,
-                ApiId.acquireTokenPopup,
-                this.performanceClient,
-                this.nativeMessageHandler,
-                serverParams.accountId,
-                this.nativeStorage,
-                validRequest.correlationId
-            );
-            const { userRequestState } = ProtocolUtils.parseRequestState(
-                this.browserCrypto,
-                validRequest.state
+            // Handle response from hash string.
+            const result = await interactionHandler.handleCodeResponse(
+                serverParams,
+                validRequest
             );
-            return nativeInteractionClient.acquireToken({
-                ...validRequest,
-                state: userRequestState,
-                prompt: undefined, // Server should handle the prompt, ideally native broker can do this part silently
-            });
-        }
 
-        // Handle response from hash string.
-        const result = await interactionHandler.handleCodeResponse(
-            serverParams,
-            validRequest
-        );
+            return result;
+        } catch (e) {
+            if (popup) {
+                // Close the synchronous popup if an error is thrown before the window unload event is registered
+                popup.close();
+            }
 
-        return result;
+            if (e instanceof AuthError) {
+                (e as AuthError).setCorrelationId(this.correlationId);
+                serverTelemetryManager.cacheFailedRequest(e);
+            }
+
+            throw e;
+        }
     }
 
     /**

package/src/interaction_client/RedirectClient.ts

@@ -22,12 +22,10 @@ import {
     ServerResponseType,
     UrlUtils,
     InProgressPerformanceEvent,
-    ServerError,
 } from "@azure/msal-common";
 import { StandardInteractionClient } from "./StandardInteractionClient";
 import {
     ApiId,
-    BrowserConstants,
     InteractionType,
     TemporaryCacheKeys,
 } from "../utils/BrowserConstants";
@@ -85,14 +83,6 @@ export class RedirectClient extends StandardInteractionClient {
      * @param request
      */
     async acquireToken(request: RedirectRequest): Promise<void> {
-        if (request.onRedirectNavigate) {
-            this.logger.warning(
-                "Unable to cache redirect request, onRedirectNavigate request option has been deprecated. Please set onRedirectNavigate on PublicClientApplication config instead."
-            );
-        } else {
-            this.browserStorage.cacheRedirectRequest(request);
-        }
-
         const validRequest = await invokeAsync(
             this.initializeAuthorizationRequest.bind(this),
             PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest,
@@ -344,57 +334,10 @@ export class RedirectClient extends StandardInteractionClient {
                 (e as AuthError).setCorrelationId(this.correlationId);
                 serverTelemetryManager.cacheFailedRequest(e);
             }
-
-            if (
-                e instanceof ServerError &&
-                e.errorCode === BrowserConstants.INVALID_GRANT_ERROR
-            ) {
-                this.performanceClient.addFields(
-                    {
-                        retryError: e.errorCode,
-                    },
-                    this.correlationId
-                );
-
-                const requestRetried = this.browserStorage.getRequestRetried();
-
-                if (requestRetried) {
-                    this.logger.error(
-                        "Retried request already detected. Throwing error."
-                    );
-                    this.browserStorage.removeRequestRetried();
-                    throw e;
-                }
-
-                const redirectRequest =
-                    this.browserStorage.getCachedRedirectRequest();
-                if (!redirectRequest) {
-                    this.logger.error(
-                        "Unable to retry. Please retry with redirect request"
-                    );
-                    this.browserStorage.setRequestRetried();
-                    throw createBrowserAuthError(
-                        BrowserAuthErrorCodes.failedToRetry
-                    );
-                }
-
-                this.browserStorage.setRequestRetried();
-
-                await this.acquireToken(redirectRequest);
-                return null;
-            }
-
-            this.browserStorage.removeTemporaryItem(
-                this.browserStorage.generateCacheKey(
-                    TemporaryCacheKeys.REDIRECT_REQUEST
-                )
-            );
-            this.browserStorage.removeRequestRetried();
-            throw e;
-        } finally {
             this.browserStorage.cleanRequestByInteractionType(
                 InteractionType.Redirect
             );
+            throw e;
         }
     }
 

package/src/interaction_client/SilentIframeClient.ts

@@ -15,7 +15,6 @@ import {
     PerformanceEvents,
     invokeAsync,
     invoke,
-    ServerError,
 } from "@azure/msal-common";
 import { StandardInteractionClient } from "./StandardInteractionClient";
 import { AuthorizationUrlRequest } from "../request/AuthorizationUrlRequest";
@@ -160,7 +159,7 @@ export class SilentIframeClient extends StandardInteractionClient {
 
             if (
                 !authClient ||
-                !(e instanceof ServerError) ||
+                !(e instanceof AuthError) ||
                 e.errorCode !== BrowserConstants.INVALID_GRANT_ERROR
             ) {
                 throw e;

package/src/interaction_handler/RedirectHandler.ts

@@ -222,7 +222,6 @@ export class RedirectHandler {
         )) as AuthenticationResult;
 
         this.browserStorage.cleanRequestByState(state);
-        this.browserStorage.removeRequestRetried();
         return tokenResponse;
     }
 

package/src/naa/BridgeProxy.ts

@@ -16,7 +16,6 @@ import { IBridgeProxy } from "./IBridgeProxy";
 import { InitContext } from "./InitContext";
 import { TokenRequest } from "./TokenRequest";
 import * as BrowserCrypto from "../crypto/BrowserCrypto";
-import { supportsBrowserPerformanceNow } from "../telemetry/BrowserPerformanceClient";
 
 declare global {
     interface Window {
@@ -82,9 +81,7 @@ export class BridgeProxy implements IBridgeProxy {
                         messageType: "NestedAppAuthRequest",
                         method: "GetInitContext",
                         requestId: BrowserCrypto.createNewGuid(),
-                        sendTime: supportsBrowserPerformanceNow()
-                            ? window.performance.now()
-                            : Date.now(),
+                        sendTime: Date.now(),
                     };
                     const request: BridgeRequest = {
                         requestId: message.requestId,
@@ -160,9 +157,7 @@ export class BridgeProxy implements IBridgeProxy {
             messageType: "NestedAppAuthRequest",
             method: method,
             requestId: BrowserCrypto.createNewGuid(),
-            sendTime: supportsBrowserPerformanceNow()
-                ? window.performance.now()
-                : Date.now(),
+            sendTime: Date.now(),
             ...requestParams,
         };
 

package/src/packageMetadata.ts

@@ -1,3 +1,3 @@
 /* eslint-disable header/header */
 export const name = "@azure/msal-browser";
-export const version = "3.21.0";
+export const version = "3.22.0";