@azure/msal-browser 4.0.0-alpha.0 → 4.0.2

package/lib/msal-browser.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v4.0.0-alpha.0 2024-12-18 */
+/*! @azure/msal-browser v4.0.2 2025-01-22 */
 'use strict';
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -6,7 +6,7 @@
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.msal = {}));
 })(this, (function (exports) { 'use strict';
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -310,7 +310,7 @@
     // Token renewal offset default in seconds
     const DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -327,7 +327,7 @@
         unexpectedError: unexpectedError
     });
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -376,7 +376,7 @@
             : AuthErrorMessages[code]);
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -474,7 +474,7 @@
         userTimeoutReached: userTimeoutReached
     });
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -726,7 +726,7 @@
         return new ClientAuthError(errorCode, additionalMessage);
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -765,7 +765,7 @@
         },
     };
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -956,12 +956,12 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /* eslint-disable header/header */
     const name$1 = "@azure/msal-common";
-    const version$1 = "15.0.0-alpha.0";
+    const version$1 = "15.0.2";
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -981,7 +981,7 @@
         AzureUsGovernment: "https://login.microsoftonline.us",
     };
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1042,7 +1042,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1079,7 +1079,7 @@
         return cachedAtSec > nowSeconds();
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1406,7 +1406,7 @@
         return metadata.expiresAt <= nowSeconds();
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1431,14 +1431,14 @@
     const missingNonceAuthenticationHeader = "missing_nonce_authentication_header";
     const invalidAuthenticationHeader = "invalid_authentication_header";
     const cannotSetOIDCOptions = "cannot_set_OIDCOptions";
-    const cannotAllowNativeBroker = "cannot_allow_native_broker";
+    const cannotAllowPlatformBroker = "cannot_allow_platform_broker";
     const authorityMismatch = "authority_mismatch";
 
     var ClientConfigurationErrorCodes = /*#__PURE__*/Object.freeze({
         __proto__: null,
         authorityMismatch: authorityMismatch,
         authorityUriInsecure: authorityUriInsecure,
-        cannotAllowNativeBroker: cannotAllowNativeBroker,
+        cannotAllowPlatformBroker: cannotAllowPlatformBroker,
         cannotSetOIDCOptions: cannotSetOIDCOptions,
         claimsRequestParsingError: claimsRequestParsingError,
         emptyInputScopesError: emptyInputScopesError,
@@ -1460,7 +1460,7 @@
         urlParseError: urlParseError
     });
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1487,7 +1487,7 @@
         [missingNonceAuthenticationHeader]: "Unable to find an authentication header containing server nonce. Either the Authentication-Info or WWW-Authenticate headers must be present in order to obtain a server nonce.",
         [invalidAuthenticationHeader]: "Invalid authentication header provided",
         [cannotSetOIDCOptions]: "Cannot set OIDCOptions parameter. Please change the protocol mode to OIDC or use a non-Microsoft authority.",
-        [cannotAllowNativeBroker]: "Cannot set allowNativeBroker parameter to true when not in AAD protocol mode.",
+        [cannotAllowPlatformBroker]: "Cannot set allowPlatformBroker parameter to true when not in AAD protocol mode.",
         [authorityMismatch]: "Authority mismatch error. Authority provided in login request or PublicClientApplication config does not match the environment of the provided account. Please use a matching account or make an interactive request to login to this authority.",
     };
     /**
@@ -1575,9 +1575,9 @@
             code: cannotSetOIDCOptions,
             desc: ClientConfigurationErrorMessages[cannotSetOIDCOptions],
         },
-        cannotAllowNativeBroker: {
-            code: cannotAllowNativeBroker,
-            desc: ClientConfigurationErrorMessages[cannotAllowNativeBroker],
+        cannotAllowPlatformBroker: {
+            code: cannotAllowPlatformBroker,
+            desc: ClientConfigurationErrorMessages[cannotAllowPlatformBroker],
         },
         authorityMismatch: {
             code: authorityMismatch,
@@ -1598,7 +1598,7 @@
         return new ClientConfigurationError(errorCode);
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1695,7 +1695,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1715,8 +1715,10 @@
             const filteredInput = scopeArr
                 ? StringUtils.removeEmptyStringsFromArray(scopeArr)
                 : [];
-            // Validate and filter scopes (validate function throws if validation fails)
-            this.validateInputScopes(filteredInput);
+            // Check if scopes array has at least one member
+            if (!filteredInput || !filteredInput.length) {
+                throw createClientConfigurationError(emptyInputScopesError);
+            }
             this.scopes = new Set(); // Iterator in constructor not supported by IE11
             filteredInput.forEach((scope) => this.scopes.add(scope));
         }
@@ -1746,17 +1748,6 @@
             }
             return scopeSet;
         }
-        /**
-         * Used to validate the scopes input parameter requested  by the developer.
-         * @param {Array<string>} inputScopes - Developer requested permissions. Not all scopes are guaranteed to be included in the access token returned.
-         * @param {boolean} scopesRequired - Boolean indicating whether the scopes array is required or not
-         */
-        validateInputScopes(inputScopes) {
-            // Check if scopes are required but not given or is an empty array
-            if (!inputScopes || inputScopes.length < 1) {
-                throw createClientConfigurationError(emptyInputScopesError);
-            }
-        }
         /**
          * Check if a given scope is present in this set of scopes.
          * @param scope
@@ -1895,7 +1886,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1935,7 +1926,7 @@
         };
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2014,7 +2005,7 @@
         return updatedAccountInfo;
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2029,7 +2020,7 @@
         Ciam: 3,
     };
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2051,7 +2042,7 @@
         return null;
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2064,7 +2055,7 @@
         OIDC: "OIDC",
     };
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2307,7 +2298,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2354,7 +2345,7 @@
         return null;
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2518,7 +2509,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2658,7 +2649,7 @@
         return null;
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2666,7 +2657,7 @@
     const cacheQuotaExceededErrorCode = "cache_quota_exceeded";
     const cacheUnknownErrorCode = "cache_error_unknown";
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2693,7 +2684,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2858,24 +2849,24 @@
          * @param storeInCache {?StoreInCache}
          * @param correlationId {?string} correlation id
          */
-        async saveCacheRecord(cacheRecord, storeInCache, correlationId) {
+        async saveCacheRecord(cacheRecord, correlationId, storeInCache) {
             if (!cacheRecord) {
                 throw createClientAuthError(invalidCacheRecord);
             }
             try {
                 if (!!cacheRecord.account) {
-                    await this.setAccount(cacheRecord.account);
+                    await this.setAccount(cacheRecord.account, correlationId);
                 }
                 if (!!cacheRecord.idToken && storeInCache?.idToken !== false) {
-                    await this.setIdTokenCredential(cacheRecord.idToken);
+                    await this.setIdTokenCredential(cacheRecord.idToken, correlationId);
                 }
                 if (!!cacheRecord.accessToken &&
                     storeInCache?.accessToken !== false) {
-                    await this.saveAccessToken(cacheRecord.accessToken);
+                    await this.saveAccessToken(cacheRecord.accessToken, correlationId);
                 }
                 if (!!cacheRecord.refreshToken &&
                     storeInCache?.refreshToken !== false) {
-                    await this.setRefreshTokenCredential(cacheRecord.refreshToken);
+                    await this.setRefreshTokenCredential(cacheRecord.refreshToken, correlationId);
                 }
                 if (!!cacheRecord.appMetadata) {
                     this.setAppMetadata(cacheRecord.appMetadata);
@@ -2905,7 +2896,7 @@
          * saves access token credential
          * @param credential
          */
-        async saveAccessToken(credential) {
+        async saveAccessToken(credential, correlationId) {
             const accessTokenFilter = {
                 clientId: credential.clientId,
                 credentialType: credential.credentialType,
@@ -2932,7 +2923,7 @@
                 }
             });
             await Promise.all(removedAccessTokens);
-            await this.setAccessTokenCredential(credential);
+            await this.setAccessTokenCredential(credential, correlationId);
         }
         /**
          * Retrieve account entities matching all provided tenant-agnostic filters; if no filter is set, get all account entities in the cache
@@ -3878,7 +3869,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3977,7 +3968,7 @@
         return (config.authOptions.authority.options.protocolMode === ProtocolMode.OIDC);
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3987,7 +3978,7 @@
         UPN: "UPN",
     };
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4037,7 +4028,7 @@
     const BROKER_CLIENT_ID = "brk_client_id";
     const BROKER_REDIRECT_URI = "brk_redirect_uri";
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4104,7 +4095,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4512,7 +4503,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4524,7 +4515,7 @@
             response.hasOwnProperty("jwks_uri"));
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4534,7 +4525,7 @@
             response.hasOwnProperty("metadata"));
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4544,7 +4535,7 @@
             response.hasOwnProperty("error_description"));
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4702,6 +4693,7 @@
          */
         InitializeSilentRequest: "initializeSilentRequest",
         InitializeClientApplication: "initializeClientApplication",
+        InitializeCache: "initializeCache",
         /**
          * Helper function in SilentIframeClient class (msal-browser).
          */
@@ -4779,6 +4771,8 @@
          */
         ClearTokensAndKeysWithClaims: "clearTokensAndKeysWithClaims",
         CacheManagerGetRefreshToken: "cacheManagerGetRefreshToken",
+        ImportExistingCache: "importExistingCache",
+        SetUserData: "setUserData",
         /**
          * Crypto Operations
          */
@@ -4787,6 +4781,12 @@
         GenerateCodeChallengeFromVerifier: "generateCodeChallengeFromVerifier",
         Sha256Digest: "sha256Digest",
         GetRandomValues: "getRandomValues",
+        GenerateHKDF: "generateHKDF",
+        GenerateBaseKey: "generateBaseKey",
+        Base64Decode: "base64Decode",
+        UrlEncodeArr: "urlEncodeArr",
+        Encrypt: "encrypt",
+        Decrypt: "decrypt",
     };
     const PerformanceEventAbbreviations = new Map([
         [PerformanceEvents.AcquireTokenByCode, "ATByCode"],
@@ -4871,6 +4871,9 @@
             PerformanceEvents.InitializeClientApplication,
             "InitClientApplication",
         ],
+        [PerformanceEvents.InitializeCache, "InitCache"],
+        [PerformanceEvents.ImportExistingCache, "importCache"],
+        [PerformanceEvents.SetUserData, "setUserData"],
         [PerformanceEvents.SilentIframeClientTokenHelper, "SIClientTHelper"],
         [
             PerformanceEvents.SilentHandlerInitiateAuthRequest,
@@ -5004,6 +5007,12 @@
         ],
         [PerformanceEvents.Sha256Digest, "Sha256Digest"],
         [PerformanceEvents.GetRandomValues, "GetRandomValues"],
+        [PerformanceEvents.GenerateHKDF, "genHKDF"],
+        [PerformanceEvents.GenerateBaseKey, "genBaseKey"],
+        [PerformanceEvents.Base64Decode, "b64Decode"],
+        [PerformanceEvents.UrlEncodeArr, "urlEncArr"],
+        [PerformanceEvents.Encrypt, "encrypt"],
+        [PerformanceEvents.Decrypt, "decrypt"],
     ]);
     /**
      * State of the performance event.
@@ -5029,9 +5038,11 @@
         "multiMatchedAT",
         "multiMatchedID",
         "multiMatchedRT",
+        "unencryptedCacheCount",
+        "encryptedCacheExpiredCount",
     ]);
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5127,7 +5138,7 @@
         };
     };
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5236,7 +5247,7 @@
         },
     };
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6075,7 +6086,7 @@
         };
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6106,7 +6117,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6125,7 +6136,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6223,7 +6234,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6253,7 +6264,7 @@
         return new NetworkError(error, httpStatus, responseHeaders);
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6403,7 +6414,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6429,7 +6440,7 @@
         refreshTokenExpired: refreshTokenExpired
     });
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6517,7 +6528,7 @@
         return new InteractionRequiredAuthError(errorCode, InteractionRequiredAuthErrorMessages[errorCode]);
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6589,7 +6600,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6673,7 +6684,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6700,7 +6711,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6866,7 +6877,7 @@
                         return await ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenClaims, requestStateObj, undefined, serverRequestId);
                     }
                 }
-                await this.cacheStorage.saveCacheRecord(cacheRecord, request.storeInCache, request.correlationId);
+                await this.cacheStorage.saveCacheRecord(cacheRecord, request.correlationId, request.storeInCache);
             }
             finally {
                 if (this.persistencePlugin &&
@@ -7077,7 +7088,7 @@
         return baseAccount;
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -7095,7 +7106,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7469,7 +7480,7 @@
                 });
             }
             this.addExtraQueryParams(request, parameterBuilder);
-            if (request.nativeBroker) {
+            if (request.platformBroker) {
                 // signal ests that this is a WAM call
                 parameterBuilder.addNativeBroker();
                 // pass the req_cnf for POP
@@ -7537,7 +7548,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7757,7 +7768,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7893,7 +7904,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7908,7 +7919,7 @@
         },
     };
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7966,7 +7977,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8229,7 +8240,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -8237,7 +8248,7 @@
     const missingKidError = "missing_kid_error";
     const missingAlgError = "missing_alg_error";
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8262,7 +8273,7 @@
         return new JoseHeaderError(code, JoseHeaderErrorMessages[code]);
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8302,7 +8313,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8381,7 +8392,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.0.0-alpha.0 2024-12-18 */
+    /*! @azure/msal-common v15.0.2 2025-01-22 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -9697,14 +9708,14 @@
     /**
      * Check whether browser crypto is available.
      */
-    function validateCryptoAvailable() {
+    function validateCryptoAvailable(skipValidateSubtleCrypto) {
         if (!window) {
             throw createBrowserAuthError(nonBrowserEnvironment);
         }
         if (!window.crypto) {
             throw createBrowserAuthError(cryptoNonExistent);
         }
-        if (!window.crypto.subtle) {
+        if (!skipValidateSubtleCrypto && !window.crypto.subtle) {
             throw createBrowserAuthError(cryptoNonExistent, SUBTLE_SUBERROR);
         }
     }
@@ -9989,7 +10000,9 @@
      * Returns current window URL as redirect uri
      */
     function getCurrentUri() {
-        return window.location.href.split("?")[0].split("#")[0];
+        return typeof window !== "undefined" && window.location
+            ? window.location.href.split("?")[0].split("#")[0]
+            : "";
     }
     /**
      * Gets the homepage url for the current window location.
@@ -10369,7 +10382,7 @@
             redirectNavigationTimeout: DEFAULT_REDIRECT_TIMEOUT_MS,
             asyncPopups: false,
             allowRedirectInIframe: false,
-            allowNativeBroker: false,
+            allowPlatformBroker: false,
             nativeBrokerHandshakeTimeout: userInputSystem?.nativeBrokerHandshakeTimeout ||
                 DEFAULT_NATIVE_BROKER_HANDSHAKE_TIMEOUT_MS,
             pollIntervalMilliseconds: BrowserConstants.DEFAULT_POLL_INTERVAL_MS,
@@ -10392,11 +10405,11 @@
             const logger = new Logger(providedSystemOptions.loggerOptions);
             logger.warning(JSON.stringify(createClientConfigurationError(cannotSetOIDCOptions)));
         }
-        // Throw an error if user has set allowNativeBroker to true without being in AAD protocol mode
+        // Throw an error if user has set allowPlatformBroker to true without being in AAD protocol mode
         if (userInputAuth?.protocolMode &&
             userInputAuth.protocolMode !== ProtocolMode.AAD &&
-            providedSystemOptions?.allowNativeBroker) {
-            throw createClientConfigurationError(cannotAllowNativeBroker);
+            providedSystemOptions?.allowPlatformBroker) {
+            throw createClientConfigurationError(cannotAllowPlatformBroker);
         }
         const overlayedConfig = {
             auth: {
@@ -10416,7 +10429,7 @@
 
     /* eslint-disable header/header */
     const name = "@azure/msal-browser";
-    const version = "4.0.0-alpha.0";
+    const version = "4.0.2";
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -11175,10 +11188,10 @@
      * implementing Proof Key for Code Exchange specs for the OAuth Authorization Code Flow using PKCE (rfc here: https://tools.ietf.org/html/rfc7636).
      */
     class CryptoOps {
-        constructor(logger, performanceClient) {
+        constructor(logger, performanceClient, skipValidateSubtleCrypto) {
             this.logger = logger;
             // Browser crypto needs to be validated first before any other classes can be set.
-            validateCryptoAvailable();
+            validateCryptoAvailable(skipValidateSubtleCrypto ?? false);
             this.cache = new AsyncMemoryStorage(this.logger);
             this.performanceClient = performanceClient;
         }
@@ -11456,15 +11469,17 @@
      */
     const ENCRYPTION_KEY = "msal.cache.encryption";
     class LocalStorage {
-        constructor(clientId) {
+        constructor(clientId, logger, performanceClient) {
             if (!window.localStorage) {
                 throw createBrowserConfigurationAuthError(storageNotSupported);
             }
             this.memoryStorage = new MemoryStorage();
             this.initialized = false;
             this.clientId = clientId;
+            this.logger = logger;
+            this.performanceClient = performanceClient;
         }
-        async initialize() {
+        async initialize(correlationId) {
             this.initialized = true;
             const cookies = new CookieStorage();
             const cookieString = cookies.getItem(ENCRYPTION_KEY);
@@ -11473,27 +11488,26 @@
                 try {
                     parsedCookie = JSON.parse(cookieString);
                 }
-                catch (e) {
-                    // TODO: Log telemetry but don't throw
-                }
+                catch (e) { }
             }
             if (parsedCookie.key && parsedCookie.id) {
                 // Encryption key already exists, import
+                const baseKey = invoke(base64DecToArr, PerformanceEvents.Base64Decode, this.logger, this.performanceClient, correlationId)(parsedCookie.key);
                 this.encryptionCookie = {
                     id: parsedCookie.id,
-                    key: await generateHKDF(base64DecToArr(parsedCookie.key)),
+                    key: await invokeAsync(generateHKDF, PerformanceEvents.GenerateHKDF, this.logger, this.performanceClient, correlationId)(baseKey),
                 };
-                await this.importExistingCache();
+                await invokeAsync(this.importExistingCache.bind(this), PerformanceEvents.ImportExistingCache, this.logger, this.performanceClient, correlationId)(correlationId);
             }
             else {
                 // Encryption key doesn't exist or is invalid, generate a new one and clear existing cache
                 this.clear();
                 const id = createNewGuid();
-                const baseKey = await generateBaseKey();
-                const keyStr = urlEncodeArr(new Uint8Array(baseKey));
+                const baseKey = await invokeAsync(generateBaseKey, PerformanceEvents.GenerateBaseKey, this.logger, this.performanceClient, correlationId)();
+                const keyStr = invoke(urlEncodeArr, PerformanceEvents.UrlEncodeArr, this.logger, this.performanceClient, correlationId)(new Uint8Array(baseKey));
                 this.encryptionCookie = {
                     id: id,
-                    key: await generateHKDF(baseKey),
+                    key: await invokeAsync(generateHKDF, PerformanceEvents.GenerateHKDF, this.logger, this.performanceClient, correlationId)(baseKey),
                 };
                 const cookieData = {
                     id: id,
@@ -11514,11 +11528,11 @@
         setItem(key, value) {
             window.localStorage.setItem(key, value);
         }
-        async setUserData(key, value) {
+        async setUserData(key, value, correlationId) {
             if (!this.initialized || !this.encryptionCookie) {
                 throw createBrowserAuthError(uninitializedPublicClientApplication);
             }
-            const { data, nonce } = await encrypt(this.encryptionCookie.key, value, this.getContext(key));
+            const { data, nonce } = await invokeAsync(encrypt, PerformanceEvents.Encrypt, this.logger, this.performanceClient, correlationId)(this.encryptionCookie.key, value, this.getContext(key));
             const encryptedData = {
                 id: this.encryptionCookie.id,
                 nonce: nonce,
@@ -11561,25 +11575,27 @@
          * Helper to decrypt all known MSAL keys in localStorage and save them to inMemory storage
          * @returns
          */
-        async importExistingCache() {
+        async importExistingCache(correlationId) {
             if (!this.encryptionCookie) {
                 return;
             }
-            const accountKeys = getAccountKeys(this);
-            await this.importArray(accountKeys);
+            let accountKeys = getAccountKeys(this);
+            accountKeys = await this.importArray(accountKeys, correlationId);
+            // Write valid account keys back to map
+            this.setItem(StaticCacheKeys.ACCOUNT_KEYS, JSON.stringify(accountKeys));
             const tokenKeys = getTokenKeys(this.clientId, this);
-            await Promise.all([
-                this.importArray(tokenKeys.idToken),
-                this.importArray(tokenKeys.accessToken),
-                this.importArray(tokenKeys.refreshToken),
-            ]);
+            tokenKeys.idToken = await this.importArray(tokenKeys.idToken, correlationId);
+            tokenKeys.accessToken = await this.importArray(tokenKeys.accessToken, correlationId);
+            tokenKeys.refreshToken = await this.importArray(tokenKeys.refreshToken, correlationId);
+            // Write valid token keys back to map
+            this.setItem(`${StaticCacheKeys.TOKEN_KEYS}.${this.clientId}`, JSON.stringify(tokenKeys));
         }
         /**
          * Helper to decrypt and save cache entries
          * @param key
          * @returns
          */
-        async getItemFromEncryptedCache(key) {
+        async getItemFromEncryptedCache(key, correlationId) {
             if (!this.encryptionCookie) {
                 return null;
             }
@@ -11590,36 +11606,46 @@
             let encObj;
             try {
                 encObj = JSON.parse(rawCache);
-                if (!encObj.id || !encObj.nonce || !encObj.data) {
-                    throw "Not encrypted!"; // TODO: Typed error
-                }
-                if (encObj.id !== this.encryptionCookie.id) {
-                    throw "Old item!"; // TODO: Typed error
-                }
             }
             catch (e) {
                 // Not a valid encrypted object, remove
-                this.removeItem(key);
-                // TODO: Log to telemetry
                 return null;
             }
-            return decrypt(this.encryptionCookie.key, encObj.nonce, this.getContext(key), encObj.data);
+            if (!encObj.id || !encObj.nonce || !encObj.data) {
+                // Data is not encrypted, likely from old version of MSAL. It must be removed because we don't know how old it is.
+                this.performanceClient.incrementFields({ unencryptedCacheCount: 1 }, correlationId);
+                return null;
+            }
+            if (encObj.id !== this.encryptionCookie.id) {
+                // Data was encrypted with a different key. It must be removed because it is from a previous session.
+                this.performanceClient.incrementFields({ encryptedCacheExpiredCount: 1 }, correlationId);
+                return null;
+            }
+            return invokeAsync(decrypt, PerformanceEvents.Decrypt, this.logger, this.performanceClient, correlationId)(this.encryptionCookie.key, encObj.nonce, this.getContext(key), encObj.data);
         }
         /**
          * Helper to decrypt and save an array of cache keys
          * @param arr
+         * @returns Array of keys successfully imported
          */
-        async importArray(arr) {
+        async importArray(arr, correlationId) {
+            const importedArr = [];
             const promiseArr = [];
             arr.forEach((key) => {
-                const promise = this.getItemFromEncryptedCache(key).then((value) => {
+                const promise = this.getItemFromEncryptedCache(key, correlationId).then((value) => {
                     if (value) {
                         this.memoryStorage.setItem(key, value);
+                        importedArr.push(key);
+                    }
+                    else {
+                        // If value is empty, unencrypted or expired remove
+                        this.removeItem(key);
                     }
                 });
                 promiseArr.push(promise);
             });
             await Promise.all(promiseArr);
+            return importedArr;
         }
         /**
          * Gets encryption context for a given cache entry. This is clientId for app specific entries, empty string for shared entries
@@ -11703,40 +11729,18 @@
      * parameters such as state and nonce, generally.
      */
     class BrowserCacheManager extends CacheManager {
-        constructor(clientId, cacheConfig, cryptoImpl, logger, staticAuthorityOptions, performanceClient) {
+        constructor(clientId, cacheConfig, cryptoImpl, logger, performanceClient, staticAuthorityOptions) {
             super(clientId, cryptoImpl, logger, staticAuthorityOptions);
             this.cacheConfig = cacheConfig;
             this.logger = logger;
             this.internalStorage = new MemoryStorage();
-            this.browserStorage = this.setupBrowserStorage(this.cacheConfig.cacheLocation);
-            this.temporaryCacheStorage = this.setupBrowserStorage(this.cacheConfig.temporaryCacheLocation);
+            this.browserStorage = getStorageImplementation(clientId, cacheConfig.cacheLocation, logger, performanceClient);
+            this.temporaryCacheStorage = getStorageImplementation(clientId, cacheConfig.temporaryCacheLocation, logger, performanceClient);
             this.cookieStorage = new CookieStorage();
             this.performanceClient = performanceClient;
         }
-        async initialize() {
-            await this.browserStorage.initialize();
-        }
-        /**
-         * Returns a window storage class implementing the IWindowStorage interface that corresponds to the configured cacheLocation.
-         * @param cacheLocation
-         */
-        setupBrowserStorage(cacheLocation) {
-            try {
-                switch (cacheLocation) {
-                    case BrowserCacheLocation.LocalStorage:
-                        return new LocalStorage(this.clientId);
-                    case BrowserCacheLocation.SessionStorage:
-                        return new SessionStorage();
-                    case BrowserCacheLocation.MemoryStorage:
-                    default:
-                        break;
-                }
-            }
-            catch (e) {
-                this.logger.error(e);
-            }
-            this.cacheConfig.cacheLocation = BrowserCacheLocation.MemoryStorage;
-            return new MemoryStorage();
+        async initialize(correlationId) {
+            await this.browserStorage.initialize(correlationId);
         }
         /**
          * Parses passed value as JSON object, JSON.parse() will throw an error.
@@ -11783,10 +11787,10 @@
          * set account entity in the platform cache
          * @param account
          */
-        async setAccount(account) {
+        async setAccount(account, correlationId) {
             this.logger.trace("BrowserCacheManager.setAccount called");
             const key = account.generateAccountKey();
-            await this.browserStorage.setUserData(key, JSON.stringify(account));
+            await invokeAsync(this.browserStorage.setUserData.bind(this.browserStorage), PerformanceEvents.SetUserData, this.logger, this.performanceClient)(key, JSON.stringify(account), correlationId);
             this.addAccountKeyToMap(key);
         }
         /**
@@ -11976,10 +11980,10 @@
          * set IdToken credential to the platform cache
          * @param idToken
          */
-        async setIdTokenCredential(idToken) {
+        async setIdTokenCredential(idToken, correlationId) {
             this.logger.trace("BrowserCacheManager.setIdTokenCredential called");
             const idTokenKey = generateCredentialKey(idToken);
-            await this.browserStorage.setUserData(idTokenKey, JSON.stringify(idToken));
+            await invokeAsync(this.browserStorage.setUserData.bind(this.browserStorage), PerformanceEvents.SetUserData, this.logger, this.performanceClient)(idTokenKey, JSON.stringify(idToken), correlationId);
             this.addTokenKey(idTokenKey, CredentialType.ID_TOKEN);
         }
         /**
@@ -12007,10 +12011,10 @@
          * set accessToken credential to the platform cache
          * @param accessToken
          */
-        async setAccessTokenCredential(accessToken) {
+        async setAccessTokenCredential(accessToken, correlationId) {
             this.logger.trace("BrowserCacheManager.setAccessTokenCredential called");
             const accessTokenKey = generateCredentialKey(accessToken);
-            await this.browserStorage.setUserData(accessTokenKey, JSON.stringify(accessToken));
+            await invokeAsync(this.browserStorage.setUserData.bind(this.browserStorage), PerformanceEvents.SetUserData, this.logger, this.performanceClient)(accessTokenKey, JSON.stringify(accessToken), correlationId);
             this.addTokenKey(accessTokenKey, CredentialType.ACCESS_TOKEN);
         }
         /**
@@ -12038,10 +12042,10 @@
          * set refreshToken credential to the platform cache
          * @param refreshToken
          */
-        async setRefreshTokenCredential(refreshToken) {
+        async setRefreshTokenCredential(refreshToken, correlationId) {
             this.logger.trace("BrowserCacheManager.setRefreshTokenCredential called");
             const refreshTokenKey = generateCredentialKey(refreshToken);
-            await this.browserStorage.setUserData(refreshTokenKey, JSON.stringify(refreshToken));
+            await invokeAsync(this.browserStorage.setUserData.bind(this.browserStorage), PerformanceEvents.SetUserData, this.logger, this.performanceClient)(refreshTokenKey, JSON.stringify(refreshToken), correlationId);
             this.addTokenKey(refreshTokenKey, CredentialType.REFRESH_TOKEN);
         }
         /**
@@ -12600,7 +12604,7 @@
                 idToken: idTokenEntity,
                 accessToken: accessTokenEntity,
             };
-            return this.saveCacheRecord(cacheRecord);
+            return this.saveCacheRecord(cacheRecord, result.correlationId);
         }
         /**
          * saves a cache record
@@ -12608,9 +12612,9 @@
          * @param storeInCache {?StoreInCache}
          * @param correlationId {?string} correlation id
          */
-        async saveCacheRecord(cacheRecord, storeInCache, correlationId) {
+        async saveCacheRecord(cacheRecord, correlationId, storeInCache) {
             try {
-                await super.saveCacheRecord(cacheRecord, storeInCache, correlationId);
+                await super.saveCacheRecord(cacheRecord, correlationId, storeInCache);
             }
             catch (e) {
                 if (e instanceof CacheError &&
@@ -12630,7 +12634,28 @@
             }
         }
     }
-    const DEFAULT_BROWSER_CACHE_MANAGER = (clientId, logger) => {
+    /**
+     * Returns a window storage class implementing the IWindowStorage interface that corresponds to the configured cacheLocation.
+     * @param cacheLocation
+     */
+    function getStorageImplementation(clientId, cacheLocation, logger, performanceClient) {
+        try {
+            switch (cacheLocation) {
+                case BrowserCacheLocation.LocalStorage:
+                    return new LocalStorage(clientId, logger, performanceClient);
+                case BrowserCacheLocation.SessionStorage:
+                    return new SessionStorage();
+                case BrowserCacheLocation.MemoryStorage:
+                default:
+                    break;
+            }
+        }
+        catch (e) {
+            logger.error(e);
+        }
+        return new MemoryStorage();
+    }
+    const DEFAULT_BROWSER_CACHE_MANAGER = (clientId, logger, performanceClient) => {
         const cacheOptions = {
             cacheLocation: BrowserCacheLocation.MemoryStorage,
             temporaryCacheLocation: BrowserCacheLocation.MemoryStorage,
@@ -12639,7 +12664,7 @@
             cacheMigrationEnabled: false,
             claimsBasedCachingEnabled: false,
         };
-        return new BrowserCacheManager(clientId, cacheOptions, DEFAULT_CRYPTO_IMPLEMENTATION, logger);
+        return new BrowserCacheManager(clientId, cacheOptions, DEFAULT_CRYPTO_IMPLEMENTATION, logger, performanceClient);
     };
 
     /*
@@ -13445,7 +13470,6 @@
             this.nativeMessageHandler = provider;
             this.nativeStorageManager = nativeStorageImpl;
             this.silentCacheClient = new SilentCacheClient(config, this.nativeStorageManager, browserCrypto, logger, eventHandler, navigationClient, performanceClient, provider, correlationId);
-            this.serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
             const extensionName = this.nativeMessageHandler.getExtensionId() ===
                 NativeConstants.PREFERRED_EXTENSION_ID
                 ? "chrome"
@@ -13480,6 +13504,7 @@
             // start the perf measurement
             const nativeATMeasurement = this.performanceClient.startMeasurement(PerformanceEvents.NativeInteractionClientAcquireToken, request.correlationId);
             const reqTimestamp = nowSeconds();
+            const serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
             try {
                 // initialize native request
                 const nativeRequest = await this.initializeNativeRequest(request);
@@ -13512,7 +13537,7 @@
                         isNativeBroker: true,
                         requestId: result.requestId,
                     });
-                    this.serverTelemetryManager.clearNativeBrokerErrorCode();
+                    serverTelemetryManager.clearNativeBrokerErrorCode();
                     return result;
                 })
                     .catch((error) => {
@@ -13527,7 +13552,7 @@
             }
             catch (e) {
                 if (e instanceof NativeAuthError) {
-                    this.serverTelemetryManager.setNativeBrokerErrorCode(e.errorCode);
+                    serverTelemetryManager.setNativeBrokerErrorCode(e.errorCode);
                 }
                 throw e;
             }
@@ -13604,7 +13629,8 @@
             catch (e) {
                 // Only throw fatal errors here to allow application to fallback to regular redirect. Otherwise proceed and the error will be thrown in handleRedirectPromise
                 if (e instanceof NativeAuthError) {
-                    this.serverTelemetryManager.setNativeBrokerErrorCode(e.errorCode);
+                    const serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
+                    serverTelemetryManager.setNativeBrokerErrorCode(e.errorCode);
                     if (isFatalNativeAuthError(e)) {
                         throw e;
                     }
@@ -13659,7 +13685,8 @@
                 const result = this.handleNativeResponse(response, request, reqTimestamp);
                 this.browserStorage.setInteractionInProgress(false);
                 const res = await result;
-                this.serverTelemetryManager.clearNativeBrokerErrorCode();
+                const serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
+                serverTelemetryManager.clearNativeBrokerErrorCode();
                 return res;
             }
             catch (e) {
@@ -13705,7 +13732,7 @@
             const result = await this.generateAuthenticationResult(response, request, idTokenClaims, baseAccount, authority.canonicalAuthority, reqTimestamp);
             // cache accounts and tokens in the appropriate storage
             await this.cacheAccount(baseAccount);
-            this.cacheNativeTokens(response, request, homeAccountIdentifier, idTokenClaims, response.access_token, result.tenantId, reqTimestamp);
+            await this.cacheNativeTokens(response, request, homeAccountIdentifier, idTokenClaims, response.access_token, result.tenantId, reqTimestamp);
             return result;
         }
         /**
@@ -13831,7 +13858,7 @@
          */
         async cacheAccount(accountEntity) {
             // Store the account info and hence `nativeAccountId` in browser cache
-            await this.browserStorage.setAccount(accountEntity);
+            await this.browserStorage.setAccount(accountEntity, this.correlationId);
             // Remove any existing cached tokens for this account in browser storage
             this.browserStorage.removeAccountContext(accountEntity).catch((e) => {
                 this.logger.error(`Error occurred while removing account context from browser storage. ${e}`);
@@ -13862,7 +13889,7 @@
                 idToken: cachedIdToken,
                 accessToken: cachedAccessToken,
             };
-            void this.nativeStorageManager.saveCacheRecord(nativeCacheRecord, request.storeInCache);
+            return this.nativeStorageManager.saveCacheRecord(nativeCacheRecord, this.correlationId, request.storeInCache);
         }
         addTelemetryFromNativeResponse(response) {
             const mats = this.getMATSFromResponse(response);
@@ -14297,15 +14324,15 @@
          * @param nativeExtensionProvider
          * @param authenticationScheme
          */
-        static isNativeAvailable(config, logger, nativeExtensionProvider, authenticationScheme) {
-            logger.trace("isNativeAvailable called");
-            if (!config.system.allowNativeBroker) {
-                logger.trace("isNativeAvailable: allowNativeBroker is not enabled, returning false");
+        static isPlatformBrokerAvailable(config, logger, nativeExtensionProvider, authenticationScheme) {
+            logger.trace("isPlatformBrokerAvailable called");
+            if (!config.system.allowPlatformBroker) {
+                logger.trace("isPlatformBrokerAvailable: allowPlatformBroker is not enabled, returning false");
                 // Developer disabled WAM
                 return false;
             }
             if (!nativeExtensionProvider) {
-                logger.trace("isNativeAvailable: WAM extension provider is not initialized, returning false");
+                logger.trace("isPlatformBrokerAvailable: Platform extension provider is not initialized, returning false");
                 // Extension is not available
                 return false;
             }
@@ -14313,10 +14340,10 @@
                 switch (authenticationScheme) {
                     case AuthenticationScheme.BEARER:
                     case AuthenticationScheme.POP:
-                        logger.trace("isNativeAvailable: authenticationScheme is supported, returning true");
+                        logger.trace("isPlatformBrokerAvailable: authenticationScheme is supported, returning true");
                         return true;
                     default:
-                        logger.trace("isNativeAvailable: authenticationScheme is not supported, returning false");
+                        logger.trace("isPlatformBrokerAvailable: authenticationScheme is not supported, returning false");
                         return false;
                 }
             }
@@ -14553,17 +14580,17 @@
                     requestExtraQueryParameters: validRequest.extraQueryParameters,
                     account: validRequest.account,
                 });
-                const isNativeBroker = NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeMessageHandler, request.authenticationScheme);
+                const isPlatformBroker = NativeMessageHandler.isPlatformBrokerAvailable(this.config, this.logger, this.nativeMessageHandler, request.authenticationScheme);
                 // Start measurement for server calls with native brokering enabled
                 let fetchNativeAccountIdMeasurement;
-                if (isNativeBroker) {
+                if (isPlatformBroker) {
                     fetchNativeAccountIdMeasurement =
                         this.performanceClient.startMeasurement(PerformanceEvents.FetchAccountIdWithNativeBroker, request.correlationId);
                 }
                 // Create acquire token url.
                 const navigateUrl = await authClient.getAuthCodeUrl({
                     ...validRequest,
-                    nativeBroker: isNativeBroker,
+                    platformBroker: isPlatformBroker,
                 });
                 // Create popup interaction handler.
                 const interactionHandler = new InteractionHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.performanceClient);
@@ -15080,7 +15107,7 @@
                 // Create acquire token url.
                 const navigateUrl = await authClient.getAuthCodeUrl({
                     ...validRequest,
-                    nativeBroker: NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeMessageHandler, request.authenticationScheme),
+                    platformBroker: NativeMessageHandler.isPlatformBrokerAvailable(this.config, this.logger, this.nativeMessageHandler, request.authenticationScheme),
                 });
                 const redirectStartPage = this.getRedirectStartPage(request.redirectStartPage);
                 this.logger.verbosePii(`Redirect start page: ${redirectStartPage}`);
@@ -15594,7 +15621,7 @@
             // Create authorize request url
             const navigateUrl = await invokeAsync(authClient.getAuthCodeUrl.bind(authClient), PerformanceEvents.GetAuthCodeUrl, this.logger, this.performanceClient, correlationId)({
                 ...silentRequest,
-                nativeBroker: NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeMessageHandler, silentRequest.authenticationScheme),
+                platformBroker: NativeMessageHandler.isPlatformBrokerAvailable(this.config, this.logger, this.nativeMessageHandler, silentRequest.authenticationScheme),
             });
             // Create silent handler
             const interactionHandler = new InteractionHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.performanceClient);
@@ -15713,6 +15740,7 @@
             if (!this.isBrowserEnvironment) {
                 throw createBrowserAuthError(nonBrowserEnvironment);
             }
+            const correlationId = request.correlationId || createNewGuid();
             const idTokenClaims = response.id_token
                 ? extractTokenClaims(response.id_token, base64Decode)
                 : undefined;
@@ -15726,10 +15754,10 @@
             const authority = request.authority
                 ? new Authority(Authority.generateAuthority(request.authority, request.azureCloudOptions), this.config.system.networkClient, this.storage, authorityOptions, this.logger, request.correlationId || createNewGuid())
                 : undefined;
-            const cacheRecordAccount = await this.loadAccount(request, options.clientInfo || response.client_info || "", idTokenClaims, authority);
-            const idToken = await this.loadIdToken(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm);
-            const accessToken = await this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, options);
-            const refreshToken = await this.loadRefreshToken(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment);
+            const cacheRecordAccount = await this.loadAccount(request, options.clientInfo || response.client_info || "", correlationId, idTokenClaims, authority);
+            const idToken = await this.loadIdToken(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, correlationId);
+            const accessToken = await this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, options, correlationId);
+            const refreshToken = await this.loadRefreshToken(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, correlationId);
             return this.generateAuthenticationResult(request, {
                 account: cacheRecordAccount,
                 idToken,
@@ -15746,11 +15774,11 @@
          * @param requestHomeAccountId
          * @returns `AccountEntity`
          */
-        async loadAccount(request, clientInfo, idTokenClaims, authority) {
+        async loadAccount(request, clientInfo, correlationId, idTokenClaims, authority) {
             this.logger.verbose("TokenCache - loading account");
             if (request.account) {
                 const accountEntity = AccountEntity.createFromAccountInfo(request.account);
-                await this.storage.setAccount(accountEntity);
+                await this.storage.setAccount(accountEntity, correlationId);
                 return accountEntity;
             }
             else if (!authority || (!clientInfo && !idTokenClaims)) {
@@ -15762,7 +15790,7 @@
             const cachedAccount = buildAccountToCache(this.storage, authority, homeAccountId, base64Decode, idTokenClaims, clientInfo, authority.hostnameAndPort, claimsTenantId, undefined, // authCodePayload
             undefined, // nativeAccountId
             this.logger);
-            await this.storage.setAccount(cachedAccount);
+            await this.storage.setAccount(cachedAccount, correlationId);
             return cachedAccount;
         }
         /**
@@ -15773,14 +15801,14 @@
          * @param tenantId
          * @returns `IdTokenEntity`
          */
-        async loadIdToken(response, homeAccountId, environment, tenantId) {
+        async loadIdToken(response, homeAccountId, environment, tenantId, correlationId) {
             if (!response.id_token) {
                 this.logger.verbose("TokenCache - no id token found in response");
                 return null;
             }
             this.logger.verbose("TokenCache - loading id token");
             const idTokenEntity = createIdTokenEntity(homeAccountId, environment, response.id_token, this.config.auth.clientId, tenantId);
-            await this.storage.setIdTokenCredential(idTokenEntity);
+            await this.storage.setIdTokenCredential(idTokenEntity, correlationId);
             return idTokenEntity;
         }
         /**
@@ -15792,7 +15820,7 @@
          * @param tenantId
          * @returns `AccessTokenEntity`
          */
-        async loadAccessToken(request, response, homeAccountId, environment, tenantId, options) {
+        async loadAccessToken(request, response, homeAccountId, environment, tenantId, options, correlationId) {
             if (!response.access_token) {
                 this.logger.verbose("TokenCache - no access token found in response");
                 return null;
@@ -15816,7 +15844,7 @@
                 (response.ext_expires_in || response.expires_in) +
                     new Date().getTime() / 1000;
             const accessTokenEntity = createAccessTokenEntity(homeAccountId, environment, response.access_token, this.config.auth.clientId, tenantId, scopes.printScopes(), expiresOn, extendedExpiresOn, base64Decode);
-            await this.storage.setAccessTokenCredential(accessTokenEntity);
+            await this.storage.setAccessTokenCredential(accessTokenEntity, correlationId);
             return accessTokenEntity;
         }
         /**
@@ -15827,7 +15855,7 @@
          * @param environment
          * @returns `RefreshTokenEntity`
          */
-        async loadRefreshToken(response, homeAccountId, environment) {
+        async loadRefreshToken(response, homeAccountId, environment, correlationId) {
             if (!response.refresh_token) {
                 this.logger.verbose("TokenCache - no refresh token found in response");
                 return null;
@@ -15835,7 +15863,7 @@
             this.logger.verbose("TokenCache - loading refresh token");
             const refreshTokenEntity = createRefreshTokenEntity(homeAccountId, environment, response.refresh_token, this.config.auth.clientId, response.foci, undefined, // userAssertionHash
             response.refresh_token_expires_in);
-            await this.storage.setRefreshTokenCredential(refreshTokenEntity);
+            await this.storage.setRefreshTokenCredential(refreshTokenEntity, correlationId);
             return refreshTokenEntity;
         }
         /**
@@ -16031,8 +16059,8 @@
             this.eventHandler = new EventHandler(this.logger);
             // Initialize the browser storage class.
             this.browserStorage = this.isBrowserEnvironment
-                ? new BrowserCacheManager(this.config.auth.clientId, this.config.cache, this.browserCrypto, this.logger, buildStaticAuthorityOptions(this.config.auth), this.performanceClient)
-                : DEFAULT_BROWSER_CACHE_MANAGER(this.config.auth.clientId, this.logger);
+                ? new BrowserCacheManager(this.config.auth.clientId, this.config.cache, this.browserCrypto, this.logger, this.performanceClient, buildStaticAuthorityOptions(this.config.auth))
+                : DEFAULT_BROWSER_CACHE_MANAGER(this.config.auth.clientId, this.logger, this.performanceClient);
             // initialize in memory storage for native flows
             const nativeCacheOptions = {
                 cacheLocation: BrowserCacheLocation.MemoryStorage,
@@ -16042,7 +16070,7 @@
                 cacheMigrationEnabled: false,
                 claimsBasedCachingEnabled: false,
             };
-            this.nativeInternalStorage = new BrowserCacheManager(this.config.auth.clientId, nativeCacheOptions, this.browserCrypto, this.logger, undefined, this.performanceClient);
+            this.nativeInternalStorage = new BrowserCacheManager(this.config.auth.clientId, nativeCacheOptions, this.browserCrypto, this.logger, this.performanceClient);
             // Initialize the token cache
             this.tokenCache = new TokenCache(this.config, this.browserStorage, this.logger, this.browserCrypto);
             this.activeSilentTokenRequests = new Map();
@@ -16084,12 +16112,12 @@
                 this.eventHandler.emitEvent(EventType.INITIALIZE_END);
                 return;
             }
-            await this.browserStorage.initialize();
             const initCorrelationId = request?.correlationId || this.getRequestCorrelationId();
-            const allowNativeBroker = this.config.system.allowNativeBroker;
+            const allowPlatformBroker = this.config.system.allowPlatformBroker;
             const initMeasurement = this.performanceClient.startMeasurement(PerformanceEvents.InitializeClientApplication, initCorrelationId);
             this.eventHandler.emitEvent(EventType.INITIALIZE_START);
-            if (allowNativeBroker) {
+            await invokeAsync(this.browserStorage.initialize.bind(this.browserStorage), PerformanceEvents.InitializeCache, this.logger, this.performanceClient, initCorrelationId)(initCorrelationId);
+            if (allowPlatformBroker) {
                 try {
                     this.nativeExtensionProvider =
                         await NativeMessageHandler.createProvider(this.logger, this.config.system.nativeBrokerHandshakeTimeout, this.performanceClient);
@@ -16104,7 +16132,10 @@
             }
             this.initialized = true;
             this.eventHandler.emitEvent(EventType.INITIALIZE_END);
-            initMeasurement.end({ allowNativeBroker, success: true });
+            initMeasurement.end({
+                allowPlatformBroker: allowPlatformBroker,
+                success: true,
+            });
         }
         // #region Redirect Flow
         /**
@@ -16148,7 +16179,7 @@
             const loggedInAccounts = this.getAllAccounts();
             const request = this.browserStorage.getCachedNativeRequest();
             const useNative = request &&
-                NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeExtensionProvider) &&
+                NativeMessageHandler.isPlatformBrokerAvailable(this.config, this.logger, this.nativeExtensionProvider) &&
                 this.nativeExtensionProvider &&
                 !hash;
             const correlationId = useNative
@@ -16277,7 +16308,8 @@
                     this.eventHandler.emitEvent(EventType.LOGIN_START, exports.InteractionType.Redirect, request);
                 }
                 let result;
-                if (this.nativeExtensionProvider && this.canUseNative(request)) {
+                if (this.nativeExtensionProvider &&
+                    this.canUsePlatformBroker(request)) {
                     const nativeClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, ApiId.acquireTokenRedirect, this.performanceClient, this.nativeExtensionProvider, this.getNativeAccountId(request), this.nativeInternalStorage, correlationId);
                     result = nativeClient
                         .acquireTokenRedirect(request, atrMeasurement)
@@ -16348,7 +16380,7 @@
                 this.eventHandler.emitEvent(EventType.LOGIN_START, exports.InteractionType.Popup, request);
             }
             let result;
-            if (this.canUseNative(request)) {
+            if (this.canUsePlatformBroker(request)) {
                 result = this.acquireTokenNative({
                     ...request,
                     correlationId,
@@ -16465,7 +16497,7 @@
             this.logger.verbose("ssoSilent called", correlationId);
             this.eventHandler.emitEvent(EventType.SSO_SILENT_START, exports.InteractionType.Silent, validRequest);
             let result;
-            if (this.canUseNative(validRequest)) {
+            if (this.canUsePlatformBroker(validRequest)) {
                 result = this.acquireTokenNative(validRequest, ApiId.ssoSilent).catch((e) => {
                     // If native token acquisition fails for availability reasons fallback to standard flow
                     if (e instanceof NativeAuthError && isFatalNativeAuthError(e)) {
@@ -16563,7 +16595,7 @@
                     return await response;
                 }
                 else if (request.nativeAccountId) {
-                    if (this.canUseNative(request, request.nativeAccountId)) {
+                    if (this.canUsePlatformBroker(request, request.nativeAccountId)) {
                         const result = await this.acquireTokenNative({
                             ...request,
                             correlationId,
@@ -16810,7 +16842,7 @@
             this.logger.verbose("hydrateCache called");
             // Account gets saved to browser storage regardless of native or not
             const accountEntity = AccountEntity.createFromAccountInfo(result.account, result.cloudGraphHostName, result.msGraphHost);
-            await this.browserStorage.setAccount(accountEntity);
+            await this.browserStorage.setAccount(accountEntity, result.correlationId);
             if (result.fromNativeBroker) {
                 this.logger.verbose("Response was from native broker, storing in-memory");
                 // Tokens from native broker are stored in-memory
@@ -16834,13 +16866,13 @@
             return nativeClient.acquireToken(request);
         }
         /**
-         * Returns boolean indicating if this request can use the native broker
+         * Returns boolean indicating if this request can use the platform broker
          * @param request
          */
-        canUseNative(request, accountId) {
-            this.logger.trace("canUseNative called");
-            if (!NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeExtensionProvider, request.authenticationScheme)) {
-                this.logger.trace("canUseNative: isNativeAvailable returned false, returning false");
+        canUsePlatformBroker(request, accountId) {
+            this.logger.trace("canUsePlatformBroker called");
+            if (!NativeMessageHandler.isPlatformBrokerAvailable(this.config, this.logger, this.nativeExtensionProvider, request.authenticationScheme)) {
+                this.logger.trace("canUsePlatformBroker: isPlatformBrokerAvailable returned false, returning false");
                 return false;
             }
             if (request.prompt) {
@@ -16848,15 +16880,15 @@
                     case PromptValue.NONE:
                     case PromptValue.CONSENT:
                     case PromptValue.LOGIN:
-                        this.logger.trace("canUseNative: prompt is compatible with native flow");
+                        this.logger.trace("canUsePlatformBroker: prompt is compatible with platform broker flow");
                         break;
                     default:
-                        this.logger.trace(`canUseNative: prompt = ${request.prompt} is not compatible with native flow, returning false`);
+                        this.logger.trace(`canUsePlatformBroker: prompt = ${request.prompt} is not compatible with platform broker flow, returning false`);
                         return false;
                 }
             }
             if (!accountId && !this.getNativeAccountId(request)) {
-                this.logger.trace("canUseNative: nativeAccountId is not available, returning false");
+                this.logger.trace("canUsePlatformBroker: nativeAccountId is not available, returning false");
                 return false;
             }
             return true;
@@ -17297,7 +17329,7 @@
          * @returns
          */
         async acquireTokenSilentNoIframe(silentRequest, cacheLookupPolicy) {
-            if (NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeExtensionProvider, silentRequest.authenticationScheme) &&
+            if (NativeMessageHandler.isPlatformBrokerAvailable(this.config, this.logger, this.nativeExtensionProvider, silentRequest.authenticationScheme) &&
                 silentRequest.account.nativeAccountId) {
                 this.logger.verbose("acquireTokenSilent - attempting to acquire token from native platform");
                 return this.acquireTokenNative(silentRequest, ApiId.acquireTokenSilent_silentFlow).catch(async (e) => {
@@ -17583,20 +17615,17 @@
             this.performanceClient = this.config.telemetry.client;
             // Initialize the crypto class.
             this.browserCrypto = operatingContext.isBrowserEnvironment()
-                ? new CryptoOps(this.logger, this.performanceClient)
+                ? new CryptoOps(this.logger, this.performanceClient, true)
                 : DEFAULT_CRYPTO_IMPLEMENTATION;
             // Initialize the browser storage class.
             this.browserStorage = this.operatingContext.isBrowserEnvironment()
-                ? new BrowserCacheManager(this.config.auth.clientId, this.config.cache, this.browserCrypto, this.logger, buildStaticAuthorityOptions(this.config.auth))
-                : DEFAULT_BROWSER_CACHE_MANAGER(this.config.auth.clientId, this.logger);
+                ? new BrowserCacheManager(this.config.auth.clientId, this.config.cache, this.browserCrypto, this.logger, this.performanceClient, buildStaticAuthorityOptions(this.config.auth))
+                : DEFAULT_BROWSER_CACHE_MANAGER(this.config.auth.clientId, this.logger, this.performanceClient);
             this.eventHandler = new EventHandler(this.logger);
             this.nestedAppAuthAdapter = new NestedAppAuthAdapter(this.config.auth.clientId, this.config.auth.clientCapabilities, this.browserCrypto, this.logger);
             // Set the active account if available
             const accountContext = this.bridgeProxy.getAccountContext();
-            if (accountContext) {
-                const cachedAccount = getAccount(accountContext, this.logger, this.browserStorage);
-                setActiveAccount(cachedAccount, this.browserStorage);
-            }
+            this.currentAccountContext = accountContext ? accountContext : null;
         }
         /**
          * Factory function to create a new instance of NestedAppAuthController
@@ -17611,8 +17640,9 @@
          * Specific implementation of initialize function for NestedAppAuthController
          * @returns
          */
-        async initialize() {
-            await this.browserStorage.initialize();
+        async initialize(request) {
+            const initCorrelationId = request?.correlationId || createNewGuid();
+            await this.browserStorage.initialize(initCorrelationId);
             return Promise.resolve();
         }
         /**
@@ -17648,7 +17678,12 @@
                 };
                 // cache the tokens in the response
                 await this.hydrateCache(result, request);
-                this.browserStorage.setActiveAccount(result.account);
+                // cache the account context in memory after successful token fetch
+                this.currentAccountContext = {
+                    homeAccountId: result.account.homeAccountId,
+                    environment: result.account.environment,
+                    tenantId: result.account.tenantId,
+                };
                 this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Popup, result);
                 atPopupMeasurement.add({
                     accessTokenSize: result.accessToken.length,
@@ -17698,7 +17733,12 @@
                 const result = this.nestedAppAuthAdapter.fromNaaTokenResponse(naaRequest, response, reqTimestamp);
                 // cache the tokens in the response
                 await this.hydrateCache(result, request);
-                this.browserStorage.setActiveAccount(result.account);
+                // cache the account context in memory after successful token fetch
+                this.currentAccountContext = {
+                    homeAccountId: result.account.homeAccountId,
+                    environment: result.account.environment,
+                    tenantId: result.account.tenantId,
+                };
                 this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, result);
                 ssoSilentMeasurement?.add({
                     accessTokenSize: result.accessToken.length,
@@ -17734,8 +17774,16 @@
                 this.logger.verbose("Claims are present in the request, skipping cache lookup");
                 return null;
             }
+            // if the request has forceRefresh, we cannot look up in the cache
+            if (request.forceRefresh) {
+                this.logger.verbose("forceRefresh is set to true, skipping cache lookup");
+                return null;
+            }
             // respect cache lookup policy
             let result = null;
+            if (!request.cacheLookupPolicy) {
+                request.cacheLookupPolicy = CacheLookupPolicy.Default;
+            }
             switch (request.cacheLookupPolicy) {
                 case CacheLookupPolicy.Default:
                 case CacheLookupPolicy.AccessToken:
@@ -17769,12 +17817,11 @@
          * @returns
          */
         async acquireTokenFromCacheInternal(request) {
-            const accountContext = this.bridgeProxy.getAccountContext();
+            // always prioritize the account context from the bridge
+            const accountContext = this.bridgeProxy.getAccountContext() || this.currentAccountContext;
             let currentAccount = null;
             if (accountContext) {
-                const hubAccount = getAccount(accountContext, this.logger, this.browserStorage);
-                // always prioritize for hub account context, the reqirement of `request.account` will be removed soon
-                currentAccount = hubAccount || request.account;
+                currentAccount = getAccount(accountContext, this.logger, this.browserStorage);
             }
             // fall back to brokering if no cached account is found
             if (!currentAccount) {
@@ -18038,7 +18085,7 @@
         async hydrateCache(result, request) {
             this.logger.verbose("hydrateCache called");
             const accountEntity = AccountEntity.createFromAccountInfo(result.account, result.cloudGraphHostName, result.msGraphHost);
-            await this.browserStorage.setAccount(accountEntity);
+            await this.browserStorage.setAccount(accountEntity, result.correlationId);
             return this.browserStorage.hydrateCache(result, request);
         }
     }
@@ -18418,7 +18465,9 @@
         await nestedAppAuth.initialize();
         if (nestedAppAuth.isAvailable()) {
             const controller = new NestedAppAuthController(nestedAppAuth);
-            return new PublicClientApplication(configuration, controller);
+            const nestablePCA = new PublicClientApplication(configuration, controller);
+            await nestablePCA.initialize();
+            return nestablePCA;
         }
         return createStandardPublicClientApplication(configuration);
     }
@@ -18470,8 +18519,8 @@
                 : DEFAULT_CRYPTO_IMPLEMENTATION;
             // Initialize the browser storage class.
             this.browserStorage = this.isBrowserEnvironment
-                ? new BrowserCacheManager(this.config.auth.clientId, this.config.cache, this.browserCrypto, this.logger, undefined, this.performanceClient)
-                : DEFAULT_BROWSER_CACHE_MANAGER(this.config.auth.clientId, this.logger);
+                ? new BrowserCacheManager(this.config.auth.clientId, this.config.cache, this.browserCrypto, this.logger, this.performanceClient, undefined)
+                : DEFAULT_BROWSER_CACHE_MANAGER(this.config.auth.clientId, this.logger, this.performanceClient);
         }
         getBrowserStorage() {
             return this.browserStorage;