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

package/lib/msal-browser.cjs

@@ -1,8 +1,8 @@
-/*! @azure/msal-browser v4.0.0-alpha.0 2024-12-18 */
+/*! @azure/msal-browser v4.0.2 2025-01-22 */
 'use strict';
 '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.
@@ -306,7 +306,7 @@ const JsonWebTokenTypes = {
 // 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.
@@ -323,7 +323,7 @@ var AuthErrorCodes = /*#__PURE__*/Object.freeze({
     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.
@@ -372,7 +372,7 @@ function createAuthError(code, additionalMessage) {
         : 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.
@@ -470,7 +470,7 @@ var ClientAuthErrorCodes = /*#__PURE__*/Object.freeze({
     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.
@@ -722,7 +722,7 @@ function createClientAuthError(errorCode, additionalMessage) {
     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.
@@ -761,7 +761,7 @@ const DEFAULT_CRYPTO_IMPLEMENTATION = {
     },
 };
 
-/*! @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.
@@ -952,12 +952,12 @@ class Logger {
     }
 }
 
-/*! @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.
@@ -977,7 +977,7 @@ const AzureCloudInstance = {
     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.
@@ -1038,7 +1038,7 @@ function checkMaxAge(authTime, maxAge) {
     }
 }
 
-/*! @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.
@@ -1075,7 +1075,7 @@ function wasClockTurnedBack(cachedAt) {
     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.
@@ -1402,7 +1402,7 @@ function isAuthorityMetadataExpired(metadata) {
     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.
@@ -1427,14 +1427,14 @@ const missingSshKid = "missing_ssh_kid";
 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,
@@ -1456,7 +1456,7 @@ var ClientConfigurationErrorCodes = /*#__PURE__*/Object.freeze({
     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.
@@ -1483,7 +1483,7 @@ const ClientConfigurationErrorMessages = {
     [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.",
 };
 /**
@@ -1571,9 +1571,9 @@ const ClientConfigurationErrorMessage = {
         code: cannotSetOIDCOptions,
         desc: ClientConfigurationErrorMessages[cannotSetOIDCOptions],
     },
-    cannotAllowNativeBroker: {
-        code: cannotAllowNativeBroker,
-        desc: ClientConfigurationErrorMessages[cannotAllowNativeBroker],
+    cannotAllowPlatformBroker: {
+        code: cannotAllowPlatformBroker,
+        desc: ClientConfigurationErrorMessages[cannotAllowPlatformBroker],
     },
     authorityMismatch: {
         code: authorityMismatch,
@@ -1594,7 +1594,7 @@ function createClientConfigurationError(errorCode) {
     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.
@@ -1691,7 +1691,7 @@ class StringUtils {
     }
 }
 
-/*! @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.
@@ -1711,8 +1711,10 @@ class ScopeSet {
         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));
     }
@@ -1742,17 +1744,6 @@ class ScopeSet {
         }
         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
@@ -1891,7 +1882,7 @@ class ScopeSet {
     }
 }
 
-/*! @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.
@@ -1931,7 +1922,7 @@ function buildClientInfoFromHomeAccountId(homeAccountId) {
     };
 }
 
-/*! @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.
@@ -2010,7 +2001,7 @@ function updateAccountTenantProfileData(baseAccountInfo, tenantProfile, idTokenC
     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.
@@ -2025,7 +2016,7 @@ const AuthorityType = {
     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.
@@ -2047,7 +2038,7 @@ function getTenantIdFromIdTokenClaims(idTokenClaims) {
     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.
@@ -2060,7 +2051,7 @@ const ProtocolMode = {
     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.
@@ -2303,7 +2294,7 @@ class AccountEntity {
     }
 }
 
-/*! @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.
@@ -2350,7 +2341,7 @@ function getDeserializedResponse(responseString) {
     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.
@@ -2514,7 +2505,7 @@ class UrlString {
     }
 }
 
-/*! @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.
@@ -2654,7 +2645,7 @@ function getCloudDiscoveryMetadataFromNetworkResponse(response, authorityHost) {
     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.
@@ -2662,7 +2653,7 @@ function getCloudDiscoveryMetadataFromNetworkResponse(response, authorityHost) {
 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.
@@ -2689,7 +2680,7 @@ class CacheError extends 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.
@@ -2854,24 +2845,24 @@ class CacheManager {
      * @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);
@@ -2901,7 +2892,7 @@ class CacheManager {
      * saves access token credential
      * @param credential
      */
-    async saveAccessToken(credential) {
+    async saveAccessToken(credential, correlationId) {
         const accessTokenFilter = {
             clientId: credential.clientId,
             credentialType: credential.credentialType,
@@ -2928,7 +2919,7 @@ class CacheManager {
             }
         });
         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
@@ -3874,7 +3865,7 @@ class DefaultStorageClass extends CacheManager {
     }
 }
 
-/*! @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.
@@ -3973,7 +3964,7 @@ function isOidcProtocolMode(config) {
     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.
@@ -3983,7 +3974,7 @@ const CcsCredentialType = {
     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.
@@ -4033,7 +4024,7 @@ const X_CLIENT_EXTRA_SKU = "x-client-xtra-sku";
 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.
@@ -4100,7 +4091,7 @@ class RequestValidator {
     }
 }
 
-/*! @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.
@@ -4508,7 +4499,7 @@ class RequestParameterBuilder {
     }
 }
 
-/*! @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.
@@ -4520,7 +4511,7 @@ function isOpenIdConfigResponse(response) {
         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.
@@ -4530,7 +4521,7 @@ function isCloudInstanceDiscoveryResponse(response) {
         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.
@@ -4540,7 +4531,7 @@ function isCloudInstanceDiscoveryErrorResponse(response) {
         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.
@@ -4698,6 +4689,7 @@ const PerformanceEvents = {
      */
     InitializeSilentRequest: "initializeSilentRequest",
     InitializeClientApplication: "initializeClientApplication",
+    InitializeCache: "initializeCache",
     /**
      * Helper function in SilentIframeClient class (msal-browser).
      */
@@ -4775,6 +4767,8 @@ const PerformanceEvents = {
      */
     ClearTokensAndKeysWithClaims: "clearTokensAndKeysWithClaims",
     CacheManagerGetRefreshToken: "cacheManagerGetRefreshToken",
+    ImportExistingCache: "importExistingCache",
+    SetUserData: "setUserData",
     /**
      * Crypto Operations
      */
@@ -4783,6 +4777,12 @@ const PerformanceEvents = {
     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"],
@@ -4867,6 +4867,9 @@ const PerformanceEventAbbreviations = new Map([
         PerformanceEvents.InitializeClientApplication,
         "InitClientApplication",
     ],
+    [PerformanceEvents.InitializeCache, "InitCache"],
+    [PerformanceEvents.ImportExistingCache, "importCache"],
+    [PerformanceEvents.SetUserData, "setUserData"],
     [PerformanceEvents.SilentIframeClientTokenHelper, "SIClientTHelper"],
     [
         PerformanceEvents.SilentHandlerInitiateAuthRequest,
@@ -5000,6 +5003,12 @@ const PerformanceEventAbbreviations = new Map([
     ],
     [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.
@@ -5025,9 +5034,11 @@ const IntFields = new Set([
     "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.
@@ -5123,7 +5134,7 @@ const invokeAsync = (callback, eventName, logger, telemetryClient, correlationId
     };
 };
 
-/*! @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.
@@ -5232,7 +5243,7 @@ RegionDiscovery.IMDS_OPTIONS = {
     },
 };
 
-/*! @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.
@@ -6071,7 +6082,7 @@ function buildStaticAuthorityOptions(authOptions) {
     };
 }
 
-/*! @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.
@@ -6102,7 +6113,7 @@ async function createDiscoveredInstance(authorityUri, networkClient, cacheManage
     }
 }
 
-/*! @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.
@@ -6121,7 +6132,7 @@ class ServerError extends AuthError {
     }
 }
 
-/*! @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.
@@ -6219,7 +6230,7 @@ class ThrottlingUtils {
     }
 }
 
-/*! @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.
@@ -6249,7 +6260,7 @@ function createNetworkError(error, httpStatus, responseHeaders) {
     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.
@@ -6399,7 +6410,7 @@ class BaseClient {
     }
 }
 
-/*! @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.
@@ -6425,7 +6436,7 @@ var InteractionRequiredAuthErrorCodes = /*#__PURE__*/Object.freeze({
     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.
@@ -6513,7 +6524,7 @@ function createInteractionRequiredAuthError(errorCode) {
     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.
@@ -6585,7 +6596,7 @@ class ProtocolUtils {
     }
 }
 
-/*! @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.
@@ -6669,7 +6680,7 @@ class PopTokenGenerator {
     }
 }
 
-/*! @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.
@@ -6696,7 +6707,7 @@ class PopTokenGenerator {
     }
 }
 
-/*! @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.
@@ -6862,7 +6873,7 @@ class ResponseHandler {
                     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 &&
@@ -7073,7 +7084,7 @@ function buildAccountToCache(cacheStorage, authority, homeAccountId, base64Decod
     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.
@@ -7091,7 +7102,7 @@ async function getClientAssertion(clientAssertion, clientId, tokenEndpoint) {
     }
 }
 
-/*! @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.
@@ -7465,7 +7476,7 @@ class AuthorizationCodeClient extends BaseClient {
             });
         }
         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
@@ -7533,7 +7544,7 @@ class AuthorizationCodeClient extends BaseClient {
     }
 }
 
-/*! @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.
@@ -7753,7 +7764,7 @@ class RefreshTokenClient extends BaseClient {
     }
 }
 
-/*! @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.
@@ -7889,7 +7900,7 @@ class SilentFlowClient extends BaseClient {
     }
 }
 
-/*! @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.
@@ -7904,7 +7915,7 @@ const StubbedNetworkModule = {
     },
 };
 
-/*! @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.
@@ -7962,7 +7973,7 @@ class AuthenticationHeaderParser {
     }
 }
 
-/*! @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.
@@ -8225,7 +8236,7 @@ class ServerTelemetryManager {
     }
 }
 
-/*! @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.
@@ -8233,7 +8244,7 @@ class ServerTelemetryManager {
 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.
@@ -8258,7 +8269,7 @@ function createJoseHeaderError(code) {
     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.
@@ -8298,7 +8309,7 @@ class JoseHeader {
     }
 }
 
-/*! @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.
@@ -8377,7 +8388,7 @@ class StubPerformanceClient {
     }
 }
 
-/*! @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.
@@ -9693,14 +9704,14 @@ const keygenAlgorithmOptions = {
 /**
  * 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);
     }
 }
@@ -9985,7 +9996,9 @@ function isInPopup() {
  * 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.
@@ -10365,7 +10378,7 @@ function buildConfiguration({ auth: userInputAuth, cache: userInputCache, system
         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,
@@ -10388,11 +10401,11 @@ function buildConfiguration({ auth: userInputAuth, cache: userInputCache, system
         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: {
@@ -10412,7 +10425,7 @@ function buildConfiguration({ auth: userInputAuth, cache: userInputCache, system
 
 /* 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.
@@ -11171,10 +11184,10 @@ class AsyncMemoryStorage {
  * 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;
     }
@@ -11452,15 +11465,17 @@ function getTokenKeys(clientId, storage) {
  */
 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);
@@ -11469,27 +11484,26 @@ class LocalStorage {
             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,
@@ -11510,11 +11524,11 @@ class LocalStorage {
     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,
@@ -11557,25 +11571,27 @@ class LocalStorage {
      * 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;
         }
@@ -11586,36 +11602,46 @@ class LocalStorage {
         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
@@ -11699,40 +11725,18 @@ function extractBrowserRequestState(browserCrypto, state) {
  * 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.
@@ -11779,10 +11783,10 @@ class BrowserCacheManager extends CacheManager {
      * 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);
     }
     /**
@@ -11972,10 +11976,10 @@ class BrowserCacheManager extends CacheManager {
      * 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);
     }
     /**
@@ -12003,10 +12007,10 @@ class BrowserCacheManager extends CacheManager {
      * 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);
     }
     /**
@@ -12034,10 +12038,10 @@ class BrowserCacheManager extends CacheManager {
      * 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);
     }
     /**
@@ -12596,7 +12600,7 @@ class BrowserCacheManager extends CacheManager {
             idToken: idTokenEntity,
             accessToken: accessTokenEntity,
         };
-        return this.saveCacheRecord(cacheRecord);
+        return this.saveCacheRecord(cacheRecord, result.correlationId);
     }
     /**
      * saves a cache record
@@ -12604,9 +12608,9 @@ class BrowserCacheManager extends CacheManager {
      * @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 &&
@@ -12626,7 +12630,28 @@ class BrowserCacheManager extends CacheManager {
         }
     }
 }
-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,
@@ -12635,7 +12660,7 @@ const DEFAULT_BROWSER_CACHE_MANAGER = (clientId, logger) => {
         cacheMigrationEnabled: false,
         claimsBasedCachingEnabled: false,
     };
-    return new BrowserCacheManager(clientId, cacheOptions, DEFAULT_CRYPTO_IMPLEMENTATION, logger);
+    return new BrowserCacheManager(clientId, cacheOptions, DEFAULT_CRYPTO_IMPLEMENTATION, logger, performanceClient);
 };
 
 /*
@@ -13441,7 +13466,6 @@ class NativeInteractionClient extends BaseInteractionClient {
         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"
@@ -13476,6 +13500,7 @@ class NativeInteractionClient extends BaseInteractionClient {
         // 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);
@@ -13508,7 +13533,7 @@ class NativeInteractionClient extends BaseInteractionClient {
                     isNativeBroker: true,
                     requestId: result.requestId,
                 });
-                this.serverTelemetryManager.clearNativeBrokerErrorCode();
+                serverTelemetryManager.clearNativeBrokerErrorCode();
                 return result;
             })
                 .catch((error) => {
@@ -13523,7 +13548,7 @@ class NativeInteractionClient extends BaseInteractionClient {
         }
         catch (e) {
             if (e instanceof NativeAuthError) {
-                this.serverTelemetryManager.setNativeBrokerErrorCode(e.errorCode);
+                serverTelemetryManager.setNativeBrokerErrorCode(e.errorCode);
             }
             throw e;
         }
@@ -13600,7 +13625,8 @@ class NativeInteractionClient extends BaseInteractionClient {
         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;
                 }
@@ -13655,7 +13681,8 @@ class NativeInteractionClient extends BaseInteractionClient {
             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) {
@@ -13701,7 +13728,7 @@ class NativeInteractionClient extends BaseInteractionClient {
         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;
     }
     /**
@@ -13827,7 +13854,7 @@ class NativeInteractionClient extends BaseInteractionClient {
      */
     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}`);
@@ -13858,7 +13885,7 @@ class NativeInteractionClient extends BaseInteractionClient {
             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);
@@ -14293,15 +14320,15 @@ class NativeMessageHandler {
      * @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;
         }
@@ -14309,10 +14336,10 @@ class NativeMessageHandler {
             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;
             }
         }
@@ -14549,17 +14576,17 @@ class PopupClient extends StandardInteractionClient {
                 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);
@@ -15076,7 +15103,7 @@ class RedirectClient extends StandardInteractionClient {
             // 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}`);
@@ -15590,7 +15617,7 @@ class SilentIframeClient extends StandardInteractionClient {
         // 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);
@@ -15709,6 +15736,7 @@ class TokenCache {
         if (!this.isBrowserEnvironment) {
             throw createBrowserAuthError(nonBrowserEnvironment);
         }
+        const correlationId = request.correlationId || createNewGuid();
         const idTokenClaims = response.id_token
             ? extractTokenClaims(response.id_token, base64Decode)
             : undefined;
@@ -15722,10 +15750,10 @@ class TokenCache {
         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,
@@ -15742,11 +15770,11 @@ class TokenCache {
      * @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)) {
@@ -15758,7 +15786,7 @@ class TokenCache {
         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;
     }
     /**
@@ -15769,14 +15797,14 @@ class TokenCache {
      * @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;
     }
     /**
@@ -15788,7 +15816,7 @@ class TokenCache {
      * @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;
@@ -15812,7 +15840,7 @@ class TokenCache {
             (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;
     }
     /**
@@ -15823,7 +15851,7 @@ class TokenCache {
      * @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;
@@ -15831,7 +15859,7 @@ class TokenCache {
         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;
     }
     /**
@@ -16027,8 +16055,8 @@ class StandardController {
         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,
@@ -16038,7 +16066,7 @@ class StandardController {
             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();
@@ -16080,12 +16108,12 @@ class StandardController {
             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);
@@ -16100,7 +16128,10 @@ class StandardController {
         }
         this.initialized = true;
         this.eventHandler.emitEvent(EventType.INITIALIZE_END);
-        initMeasurement.end({ allowNativeBroker, success: true });
+        initMeasurement.end({
+            allowPlatformBroker: allowPlatformBroker,
+            success: true,
+        });
     }
     // #region Redirect Flow
     /**
@@ -16144,7 +16175,7 @@ class StandardController {
         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
@@ -16273,7 +16304,8 @@ class StandardController {
                 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)
@@ -16344,7 +16376,7 @@ class StandardController {
             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,
@@ -16461,7 +16493,7 @@ class StandardController {
         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)) {
@@ -16559,7 +16591,7 @@ class StandardController {
                 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,
@@ -16806,7 +16838,7 @@ class StandardController {
         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
@@ -16830,13 +16862,13 @@ class StandardController {
         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) {
@@ -16844,15 +16876,15 @@ class StandardController {
                 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;
@@ -17293,7 +17325,7 @@ class StandardController {
      * @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) => {
@@ -17579,20 +17611,17 @@ class NestedAppAuthController {
         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
@@ -17607,8 +17636,9 @@ class NestedAppAuthController {
      * 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();
     }
     /**
@@ -17644,7 +17674,12 @@ class NestedAppAuthController {
             };
             // 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,
@@ -17694,7 +17729,12 @@ class NestedAppAuthController {
             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,
@@ -17730,8 +17770,16 @@ class NestedAppAuthController {
             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:
@@ -17765,12 +17813,11 @@ class NestedAppAuthController {
      * @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) {
@@ -18034,7 +18081,7 @@ class NestedAppAuthController {
     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);
     }
 }
@@ -18414,7 +18461,9 @@ async function createNestablePublicClientApplication(configuration) {
     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);
 }
@@ -18466,8 +18515,8 @@ class UnknownOperatingContextController {
             : 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;