@azure/msal-browser 4.13.2 → 4.15.0

package/lib/msal-browser.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v4.13.2 2025-06-18 */
+/*! @azure/msal-browser v4.15.0 2025-07-08 */
 '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.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -139,19 +139,11 @@
         CREATE: "create",
         NO_SESSION: "no_session",
     };
-    /**
-     * allowed values for codeVerifier
-     */
-    const CodeChallengeMethodValues = {
-        PLAIN: "plain",
-        S256: "S256",
-    };
     /**
      * Allowed values for response_type
      */
     const OAuthResponseType = {
         CODE: "code",
-        IDTOKEN_TOKEN: "id_token token",
         IDTOKEN_TOKEN_REFRESHTOKEN: "id_token token refresh_token",
     };
     /**
@@ -166,29 +158,19 @@
      * allowed values for response_mode
      */
     const ResponseMode = {
-        QUERY: "query",
-        FRAGMENT: "fragment",
-        FORM_POST: "form_post",
-    };
+        QUERY: "query"};
     /**
      * allowed grant_type
      */
     const GrantType = {
-        IMPLICIT_GRANT: "implicit",
         AUTHORIZATION_CODE_GRANT: "authorization_code",
-        CLIENT_CREDENTIALS_GRANT: "client_credentials",
-        RESOURCE_OWNER_PASSWORD_GRANT: "password",
-        REFRESH_TOKEN_GRANT: "refresh_token",
-        DEVICE_CODE_GRANT: "device_code",
-        JWT_BEARER: "urn:ietf:params:oauth:grant-type:jwt-bearer",
-    };
+        REFRESH_TOKEN_GRANT: "refresh_token"};
     /**
      * Account types in Cache
      */
     const CacheAccountType = {
         MSSTS_ACCOUNT_TYPE: "MSSTS",
         ADFS_ACCOUNT_TYPE: "ADFS",
-        MSAV1_ACCOUNT_TYPE: "MSA",
         GENERIC_ACCOUNT_TYPE: "Generic", // NTLM, Kerberos, FBA, Basic etc
     };
     /**
@@ -225,7 +207,6 @@
     };
     const SERVER_TELEM_CONSTANTS = {
         SCHEMA_VERSION: 5,
-        MAX_CUR_HEADER_BYTES: 80,
         MAX_LAST_HEADER_BYTES: 330,
         MAX_CACHED_ERRORS: 50,
         CACHE_KEY: "server-telemetry",
@@ -273,9 +254,7 @@
      * Region Discovery Outcomes
      */
     const RegionDiscoveryOutcomes = {
-        CONFIGURED_MATCHES_DETECTED: "1",
         CONFIGURED_NO_AUTO_DETECTION: "2",
-        CONFIGURED_NOT_DETECTED: "3",
         AUTO_DETECTION_REQUESTED_SUCCESSFUL: "4",
         AUTO_DETECTION_REQUESTED_FAILED: "5",
     };
@@ -302,7 +281,7 @@
     // Token renewal offset default in seconds
     const DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -319,7 +298,7 @@
         unexpectedError: unexpectedError
     });
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -368,7 +347,7 @@
             : AuthErrorMessages[code]);
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -466,7 +445,7 @@
         userTimeoutReached: userTimeoutReached
     });
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -718,7 +697,7 @@
         return new ClientAuthError(errorCode, additionalMessage);
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -757,7 +736,7 @@
         },
     };
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -948,12 +927,12 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /* eslint-disable header/header */
     const name$1 = "@azure/msal-common";
-    const version$1 = "15.7.1";
+    const version$1 = "15.8.1";
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -973,7 +952,7 @@
         AzureUsGovernment: "https://login.microsoftonline.us",
     };
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1034,7 +1013,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1089,7 +1068,7 @@
         return cachedAtSec > nowSeconds();
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1416,7 +1395,7 @@
         return metadata.expiresAt <= nowSeconds();
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1427,7 +1406,6 @@
     const urlParseError = "url_parse_error";
     const urlEmptyError = "empty_url_error";
     const emptyInputScopesError = "empty_input_scopes_error";
-    const invalidPromptValue = "invalid_prompt_value";
     const invalidClaims = "invalid_claims";
     const tokenRequestEmpty = "token_request_empty";
     const logoutRequestEmpty = "logout_request_empty";
@@ -1457,7 +1435,6 @@
         invalidClaims: invalidClaims,
         invalidCloudDiscoveryMetadata: invalidCloudDiscoveryMetadata,
         invalidCodeChallengeMethod: invalidCodeChallengeMethod,
-        invalidPromptValue: invalidPromptValue,
         logoutRequestEmpty: logoutRequestEmpty,
         missingNonceAuthenticationHeader: missingNonceAuthenticationHeader,
         missingSshJwk: missingSshJwk,
@@ -1470,7 +1447,7 @@
         urlParseError: urlParseError
     });
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1483,7 +1460,6 @@
         [urlParseError]: "URL could not be parsed into appropriate segments.",
         [urlEmptyError]: "URL was empty or null.",
         [emptyInputScopesError]: "Scopes cannot be passed as null, undefined or empty array because they are required to obtain an access token.",
-        [invalidPromptValue]: "Please see here for valid configuration options: https://azuread.github.io/microsoft-authentication-library-for-js/ref/modules/_azure_msal_common.html#commonauthorizationurlrequest",
         [invalidClaims]: "Given claims parameter must be a stringified JSON object.",
         [tokenRequestEmpty]: "Token request was empty and not found in cache.",
         [logoutRequestEmpty]: "The logout request was null or undefined.",
@@ -1529,10 +1505,6 @@
             code: emptyInputScopesError,
             desc: ClientConfigurationErrorMessages[emptyInputScopesError],
         },
-        invalidPrompt: {
-            code: invalidPromptValue,
-            desc: ClientConfigurationErrorMessages[invalidPromptValue],
-        },
         invalidClaimsRequest: {
             code: invalidClaims,
             desc: ClientConfigurationErrorMessages[invalidClaims],
@@ -1608,7 +1580,7 @@
         return new ClientConfigurationError(errorCode);
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1705,7 +1677,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1896,7 +1868,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1936,7 +1908,7 @@
         };
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2015,7 +1987,7 @@
         return updatedAccountInfo;
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2030,7 +2002,7 @@
         Ciam: 3,
     };
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2052,7 +2024,7 @@
         return null;
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2076,7 +2048,7 @@
         EAR: "EAR",
     };
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2319,7 +2291,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2384,7 +2356,7 @@
         return queryParameterArray.join("&");
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2548,7 +2520,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2579,7 +2551,6 @@
             },
         },
         instanceDiscoveryMetadata: {
-            tenant_discovery_endpoint: "https://{canonicalAuthority}/v2.0/.well-known/openid-configuration",
             metadata: [
                 {
                     preferred_network: "login.microsoftonline.com",
@@ -2688,42 +2659,60 @@
         return null;
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
      */
-    const cacheQuotaExceededErrorCode = "cache_quota_exceeded";
-    const cacheUnknownErrorCode = "cache_error_unknown";
+    const cacheQuotaExceeded = "cache_quota_exceeded";
+    const cacheErrorUnknown = "cache_error_unknown";
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
      */
     const CacheErrorMessages = {
-        [cacheQuotaExceededErrorCode]: "Exceeded cache storage capacity.",
-        [cacheUnknownErrorCode]: "Unexpected error occurred when using cache storage.",
+        [cacheQuotaExceeded]: "Exceeded cache storage capacity.",
+        [cacheErrorUnknown]: "Unexpected error occurred when using cache storage.",
     };
     /**
      * Error thrown when there is an error with the cache
      */
-    class CacheError extends Error {
+    class CacheError extends AuthError {
         constructor(errorCode, errorMessage) {
             const message = errorMessage ||
                 (CacheErrorMessages[errorCode]
                     ? CacheErrorMessages[errorCode]
-                    : CacheErrorMessages[cacheUnknownErrorCode]);
+                    : CacheErrorMessages[cacheErrorUnknown]);
             super(`${errorCode}: ${message}`);
             Object.setPrototypeOf(this, CacheError.prototype);
             this.name = "CacheError";
             this.errorCode = errorCode;
             this.errorMessage = message;
         }
+    }
+    /**
+     * Helper function to wrap browser errors in a CacheError object
+     * @param e
+     * @returns
+     */
+    function createCacheError(e) {
+        if (!(e instanceof Error)) {
+            return new CacheError(cacheErrorUnknown);
+        }
+        if (e.name === "QuotaExceededError" ||
+            e.name === "NS_ERROR_DOM_QUOTA_REACHED" ||
+            e.message.includes("exceeded the quota")) {
+            return new CacheError(cacheQuotaExceeded);
+        }
+        else {
+            return new CacheError(e.name, e.message);
+        }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2746,14 +2735,14 @@
          * @param accountFilter - (Optional) filter to narrow down the accounts returned
          * @returns Array of AccountInfo objects in cache
          */
-        getAllAccounts(accountFilter) {
-            return this.buildTenantProfiles(this.getAccountsFilteredBy(accountFilter || {}), accountFilter);
+        getAllAccounts(accountFilter, correlationId) {
+            return this.buildTenantProfiles(this.getAccountsFilteredBy(accountFilter, correlationId), correlationId, accountFilter);
         }
         /**
          * Gets first tenanted AccountInfo object found based on provided filters
          */
-        getAccountInfoFilteredBy(accountFilter) {
-            const allAccounts = this.getAllAccounts(accountFilter);
+        getAccountInfoFilteredBy(accountFilter, correlationId) {
+            const allAccounts = this.getAllAccounts(accountFilter, correlationId);
             if (allAccounts.length > 1) {
                 // If one or more accounts are found, prioritize accounts that have an ID token
                 const sortedAccounts = allAccounts.sort((account) => {
@@ -2774,8 +2763,8 @@
          * @param accountFilter
          * @returns
          */
-        getBaseAccountInfo(accountFilter) {
-            const accountEntities = this.getAccountsFilteredBy(accountFilter);
+        getBaseAccountInfo(accountFilter, correlationId) {
+            const accountEntities = this.getAccountsFilteredBy(accountFilter, correlationId);
             if (accountEntities.length > 0) {
                 return accountEntities[0].getAccountInfo();
             }
@@ -2790,12 +2779,12 @@
          * @param accountFilter
          * @returns Array of AccountInfo objects that match account and tenant profile filters
          */
-        buildTenantProfiles(cachedAccounts, accountFilter) {
+        buildTenantProfiles(cachedAccounts, correlationId, accountFilter) {
             return cachedAccounts.flatMap((accountEntity) => {
-                return this.getTenantProfilesFromAccountEntity(accountEntity, accountFilter?.tenantId, accountFilter);
+                return this.getTenantProfilesFromAccountEntity(accountEntity, correlationId, accountFilter?.tenantId, accountFilter);
             });
         }
-        getTenantedAccountInfoByFilter(accountInfo, tokenKeys, tenantProfile, tenantProfileFilter) {
+        getTenantedAccountInfoByFilter(accountInfo, tokenKeys, tenantProfile, correlationId, tenantProfileFilter) {
             let tenantedAccountInfo = null;
             let idTokenClaims;
             if (tenantProfileFilter) {
@@ -2803,7 +2792,7 @@
                     return null;
                 }
             }
-            const idToken = this.getIdToken(accountInfo, tokenKeys, tenantProfile.tenantId);
+            const idToken = this.getIdToken(accountInfo, correlationId, tokenKeys, tenantProfile.tenantId);
             if (idToken) {
                 idTokenClaims = extractTokenClaims(idToken.secret, this.cryptoImpl.base64Decode);
                 if (!this.idTokenClaimsMatchTenantProfileFilter(idTokenClaims, tenantProfileFilter)) {
@@ -2815,7 +2804,7 @@
             tenantedAccountInfo = updateAccountTenantProfileData(accountInfo, tenantProfile, idTokenClaims, idToken?.secret);
             return tenantedAccountInfo;
         }
-        getTenantProfilesFromAccountEntity(accountEntity, targetTenantId, tenantProfileFilter) {
+        getTenantProfilesFromAccountEntity(accountEntity, correlationId, targetTenantId, tenantProfileFilter) {
             const accountInfo = accountEntity.getAccountInfo();
             let searchTenantProfiles = accountInfo.tenantProfiles || new Map();
             const tokenKeys = this.getTokenKeys();
@@ -2835,7 +2824,7 @@
             }
             const matchingTenantProfiles = [];
             searchTenantProfiles.forEach((tenantProfile) => {
-                const tenantedAccountInfo = this.getTenantedAccountInfoByFilter(accountInfo, tokenKeys, tenantProfile, tenantProfileFilter);
+                const tenantedAccountInfo = this.getTenantedAccountInfoByFilter(accountInfo, tokenKeys, tenantProfile, correlationId, tenantProfileFilter);
                 if (tenantedAccountInfo) {
                     matchingTenantProfiles.push(tenantedAccountInfo);
                 }
@@ -2909,26 +2898,16 @@
                     await this.setRefreshTokenCredential(cacheRecord.refreshToken, correlationId);
                 }
                 if (!!cacheRecord.appMetadata) {
-                    this.setAppMetadata(cacheRecord.appMetadata);
+                    this.setAppMetadata(cacheRecord.appMetadata, correlationId);
                 }
             }
             catch (e) {
                 this.commonLogger?.error(`CacheManager.saveCacheRecord: failed`);
-                if (e instanceof Error) {
-                    this.commonLogger?.errorPii(`CacheManager.saveCacheRecord: ${e.message}`, correlationId);
-                    if (e.name === "QuotaExceededError" ||
-                        e.name === "NS_ERROR_DOM_QUOTA_REACHED" ||
-                        e.message.includes("exceeded the quota")) {
-                        this.commonLogger?.error(`CacheManager.saveCacheRecord: exceeded storage quota`, correlationId);
-                        throw new CacheError(cacheQuotaExceededErrorCode);
-                    }
-                    else {
-                        throw new CacheError(e.name, e.message);
-                    }
+                if (e instanceof AuthError) {
+                    throw e;
                 }
                 else {
-                    this.commonLogger?.errorPii(`CacheManager.saveCacheRecord: ${e}`, correlationId);
-                    throw new CacheError(cacheUnknownErrorCode);
+                    throw createCacheError(e);
                 }
             }
         }
@@ -2952,7 +2931,7 @@
                 if (!this.accessTokenKeyMatchesFilter(key, accessTokenFilter, false)) {
                     return;
                 }
-                const tokenEntity = this.getAccessTokenCredential(key);
+                const tokenEntity = this.getAccessTokenCredential(key, correlationId);
                 if (tokenEntity &&
                     this.credentialMatchesFilter(tokenEntity, accessTokenFilter)) {
                     const tokenScopeSet = ScopeSet.fromString(tokenEntity.target);
@@ -2968,7 +2947,7 @@
          * Not checking for casing as keys are all generated in lower case, remember to convert to lower case if object properties are compared
          * @param accountFilter - An object containing Account properties to filter by
          */
-        getAccountsFilteredBy(accountFilter) {
+        getAccountsFilteredBy(accountFilter, correlationId) {
             const allAccountKeys = this.getAccountKeys();
             const matchingAccounts = [];
             allAccountKeys.forEach((cacheKey) => {
@@ -2976,7 +2955,7 @@
                     // Don't parse value if the key doesn't match the account filters
                     return;
                 }
-                const entity = this.getAccount(cacheKey, this.commonLogger);
+                const entity = this.getAccount(cacheKey, correlationId);
                 // Match base account fields
                 if (!entity) {
                     return;
@@ -3213,12 +3192,12 @@
          * @param account
          */
         removeAccount(accountKey, correlationId) {
-            const account = this.getAccount(accountKey, this.commonLogger);
+            const account = this.getAccount(accountKey, correlationId);
             if (!account) {
                 return;
             }
             this.removeAccountContext(account, correlationId);
-            this.removeItem(accountKey);
+            this.removeItem(accountKey, correlationId);
         }
         /**
          * Removes credentials associated with the provided account
@@ -3229,7 +3208,7 @@
             const accountId = account.generateAccountId();
             allTokenKeys.idToken.forEach((key) => {
                 if (key.indexOf(accountId) === 0) {
-                    this.removeIdToken(key);
+                    this.removeIdToken(key, correlationId);
                 }
             });
             allTokenKeys.accessToken.forEach((key) => {
@@ -3239,45 +3218,43 @@
             });
             allTokenKeys.refreshToken.forEach((key) => {
                 if (key.indexOf(accountId) === 0) {
-                    this.removeRefreshToken(key);
+                    this.removeRefreshToken(key, correlationId);
                 }
             });
         }
         /**
-         * returns a boolean if the given credential is removed
-         * @param credential
+         * Removes accessToken from the cache
+         * @param key
+         * @param correlationId
          */
         removeAccessToken(key, correlationId) {
-            const credential = this.getAccessTokenCredential(key);
-            if (!credential) {
+            const credential = this.getAccessTokenCredential(key, correlationId);
+            this.removeItem(key, correlationId);
+            this.performanceClient.incrementFields({ accessTokensRemoved: 1 }, correlationId);
+            if (!credential ||
+                credential.credentialType.toLowerCase() !==
+                    CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME.toLowerCase() ||
+                credential.tokenType !== AuthenticationScheme.POP) {
+                // If the credential is not a PoP token, we can return
                 return;
             }
-            this.removeItem(key);
             // Remove Token Binding Key from key store for PoP Tokens Credentials
-            if (credential.credentialType.toLowerCase() ===
-                CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME.toLowerCase()) {
-                if (credential.tokenType === AuthenticationScheme.POP) {
-                    const accessTokenWithAuthSchemeEntity = credential;
-                    const kid = accessTokenWithAuthSchemeEntity.keyId;
-                    if (kid) {
-                        void this.cryptoImpl
-                            .removeTokenBindingKey(kid)
-                            .catch(() => {
-                            this.commonLogger.error(`Failed to remove token binding key ${kid}`, correlationId);
-                            this.performanceClient?.incrementFields({ removeTokenBindingKeyFailure: 1 }, correlationId);
-                        });
-                    }
-                }
+            const kid = credential.keyId;
+            if (kid) {
+                void this.cryptoImpl.removeTokenBindingKey(kid).catch(() => {
+                    this.commonLogger.error(`Failed to remove token binding key ${kid}`, correlationId);
+                    this.performanceClient?.incrementFields({ removeTokenBindingKeyFailure: 1 }, correlationId);
+                });
             }
         }
         /**
          * Removes all app metadata objects from cache.
          */
-        removeAppMetadata() {
+        removeAppMetadata(correlationId) {
             const allCacheKeys = this.getKeys();
             allCacheKeys.forEach((cacheKey) => {
                 if (this.isAppMetadata(cacheKey)) {
-                    this.removeItem(cacheKey);
+                    this.removeItem(cacheKey, correlationId);
                 }
             });
             return true;
@@ -3286,9 +3263,9 @@
          * Retrieve AccountEntity from cache
          * @param account
          */
-        readAccountFromCache(account) {
+        readAccountFromCache(account, correlationId) {
             const accountKey = AccountEntity.generateAccountCacheKey(account);
-            return this.getAccount(accountKey, this.commonLogger);
+            return this.getAccount(accountKey, correlationId);
         }
         /**
          * Retrieve IdTokenEntity from cache
@@ -3298,7 +3275,7 @@
          * @param performanceClient {?IPerformanceClient}
          * @param correlationId {?string}
          */
-        getIdToken(account, tokenKeys, targetRealm, performanceClient, correlationId) {
+        getIdToken(account, correlationId, tokenKeys, targetRealm, performanceClient) {
             this.commonLogger.trace("CacheManager - getIdToken called");
             const idTokenFilter = {
                 homeAccountId: account.homeAccountId,
@@ -3307,7 +3284,7 @@
                 clientId: this.clientId,
                 realm: targetRealm,
             };
-            const idTokenMap = this.getIdTokensByFilter(idTokenFilter, tokenKeys);
+            const idTokenMap = this.getIdTokensByFilter(idTokenFilter, correlationId, tokenKeys);
             const numIdTokens = idTokenMap.size;
             if (numIdTokens < 1) {
                 this.commonLogger.info("CacheManager:getIdToken - No token found");
@@ -3340,7 +3317,7 @@
                 // Multiple tokens for a single tenant profile, remove all and return null
                 this.commonLogger.info("CacheManager:getIdToken - Multiple matching ID tokens found, clearing them");
                 tokensToBeRemoved.forEach((idToken, key) => {
-                    this.removeIdToken(key);
+                    this.removeIdToken(key, correlationId);
                 });
                 if (performanceClient && correlationId) {
                     performanceClient.addFields({ multiMatchedID: idTokenMap.size }, correlationId);
@@ -3355,7 +3332,7 @@
          * @param filter
          * @returns
          */
-        getIdTokensByFilter(filter, tokenKeys) {
+        getIdTokensByFilter(filter, correlationId, tokenKeys) {
             const idTokenKeys = (tokenKeys && tokenKeys.idToken) || this.getTokenKeys().idToken;
             const idTokens = new Map();
             idTokenKeys.forEach((key) => {
@@ -3365,7 +3342,7 @@
                 })) {
                     return;
                 }
-                const idToken = this.getIdTokenCredential(key);
+                const idToken = this.getIdTokenCredential(key, correlationId);
                 if (idToken && this.credentialMatchesFilter(idToken, filter)) {
                     idTokens.set(key, idToken);
                 }
@@ -3394,20 +3371,21 @@
          * Removes idToken from the cache
          * @param key
          */
-        removeIdToken(key) {
-            this.removeItem(key);
+        removeIdToken(key, correlationId) {
+            this.removeItem(key, correlationId);
         }
         /**
          * Removes refresh token from the cache
          * @param key
          */
-        removeRefreshToken(key) {
-            this.removeItem(key);
+        removeRefreshToken(key, correlationId) {
+            this.removeItem(key, correlationId);
         }
         /**
          * Retrieve AccessTokenEntity from cache
          * @param account {AccountInfo}
          * @param request {BaseAuthRequest}
+         * @param correlationId {?string}
          * @param tokenKeys {?TokenKeys}
          * @param performanceClient {?IPerformanceClient}
          */
@@ -3442,7 +3420,7 @@
             accessTokenKeys.forEach((key) => {
                 // Validate key
                 if (this.accessTokenKeyMatchesFilter(key, accessTokenFilter, true)) {
-                    const accessToken = this.getAccessTokenCredential(key);
+                    const accessToken = this.getAccessTokenCredential(key, correlationId);
                     // Validate value
                     if (accessToken &&
                         this.credentialMatchesFilter(accessToken, accessTokenFilter)) {
@@ -3512,14 +3490,14 @@
          * @param filter
          * @returns
          */
-        getAccessTokensByFilter(filter) {
+        getAccessTokensByFilter(filter, correlationId) {
             const tokenKeys = this.getTokenKeys();
             const accessTokens = [];
             tokenKeys.accessToken.forEach((key) => {
                 if (!this.accessTokenKeyMatchesFilter(key, filter, true)) {
                     return;
                 }
-                const accessToken = this.getAccessTokenCredential(key);
+                const accessToken = this.getAccessTokenCredential(key, correlationId);
                 if (accessToken &&
                     this.credentialMatchesFilter(accessToken, filter)) {
                     accessTokens.push(accessToken);
@@ -3531,11 +3509,11 @@
          * Helper to retrieve the appropriate refresh token from cache
          * @param account {AccountInfo}
          * @param familyRT {boolean}
+         * @param correlationId {?string}
          * @param tokenKeys {?TokenKeys}
          * @param performanceClient {?IPerformanceClient}
-         * @param correlationId {?string}
          */
-        getRefreshToken(account, familyRT, tokenKeys, performanceClient, correlationId) {
+        getRefreshToken(account, familyRT, correlationId, tokenKeys, performanceClient) {
             this.commonLogger.trace("CacheManager - getRefreshToken called");
             const id = familyRT ? THE_FAMILY_ID : undefined;
             const refreshTokenFilter = {
@@ -3551,7 +3529,7 @@
             refreshTokenKeys.forEach((key) => {
                 // Validate key
                 if (this.refreshTokenKeyMatchesFilter(key, refreshTokenFilter)) {
-                    const refreshToken = this.getRefreshTokenCredential(key);
+                    const refreshToken = this.getRefreshTokenCredential(key, correlationId);
                     // Validate value
                     if (refreshToken &&
                         this.credentialMatchesFilter(refreshToken, refreshTokenFilter)) {
@@ -3901,7 +3879,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4393,7 +4371,6 @@
      * @enum {number}
      */
     const PerformanceEventStatus = {
-        NotStarted: 0,
         InProgress: 1,
         Completed: 2,
     };
@@ -4414,7 +4391,7 @@
         "encryptedCacheExpiredCount",
     ]);
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4493,7 +4470,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4593,7 +4570,7 @@
         return (config.authOptions.authority.options.protocolMode === ProtocolMode.OIDC);
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4603,7 +4580,7 @@
         UPN: "UPN",
     };
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4653,7 +4630,7 @@
     const EAR_JWK = "ear_jwk";
     const EAR_JWE_CRYPTO = "ear_jwe_crypto";
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5021,7 +4998,7 @@
         parameters.set(EAR_JWE_CRYPTO, jweCryptoB64Encoded);
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5033,7 +5010,7 @@
             response.hasOwnProperty("jwks_uri"));
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5043,7 +5020,7 @@
             response.hasOwnProperty("metadata"));
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5053,7 +5030,7 @@
             response.hasOwnProperty("error_description"));
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5149,7 +5126,7 @@
         };
     };
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5255,7 +5232,7 @@
         },
     };
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6094,7 +6071,7 @@
         };
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6125,7 +6102,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6144,7 +6121,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6165,7 +6142,7 @@
         };
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6185,12 +6162,12 @@
          * @param cacheManager
          * @param thumbprint
          */
-        static preProcess(cacheManager, thumbprint) {
+        static preProcess(cacheManager, thumbprint, correlationId) {
             const key = ThrottlingUtils.generateThrottlingStorageKey(thumbprint);
             const value = cacheManager.getThrottlingCache(key);
             if (value) {
                 if (value.throttleTime < Date.now()) {
-                    cacheManager.removeItem(key);
+                    cacheManager.removeItem(key, correlationId);
                     return;
                 }
                 throw new ServerError(value.errorCodes?.join(" ") || Constants.EMPTY_STRING, value.errorMessage, value.subError);
@@ -6202,7 +6179,7 @@
          * @param thumbprint
          * @param response
          */
-        static postProcess(cacheManager, thumbprint, response) {
+        static postProcess(cacheManager, thumbprint, response, correlationId) {
             if (ThrottlingUtils.checkResponseStatus(response) ||
                 ThrottlingUtils.checkResponseForRetryAfter(response)) {
                 const thumbprintValue = {
@@ -6212,7 +6189,7 @@
                     errorMessage: response.body.error_description,
                     subError: response.body.suberror,
                 };
-                cacheManager.setThrottlingCache(ThrottlingUtils.generateThrottlingStorageKey(thumbprint), thumbprintValue);
+                cacheManager.setThrottlingCache(ThrottlingUtils.generateThrottlingStorageKey(thumbprint), thumbprintValue, correlationId);
             }
         }
         /**
@@ -6248,11 +6225,11 @@
         static removeThrottle(cacheManager, clientId, request, homeAccountIdentifier) {
             const thumbprint = getRequestThumbprint(clientId, request, homeAccountIdentifier);
             const key = this.generateThrottlingStorageKey(thumbprint);
-            cacheManager.removeItem(key);
+            cacheManager.removeItem(key, request.correlationId);
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6283,7 +6260,7 @@
         return new NetworkError(error, httpStatus, responseHeaders);
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6365,7 +6342,7 @@
          * @param correlationId - CorrelationId for telemetry
          */
         async sendPostRequest(thumbprint, tokenEndpoint, options, correlationId) {
-            ThrottlingUtils.preProcess(this.cacheManager, thumbprint);
+            ThrottlingUtils.preProcess(this.cacheManager, thumbprint, correlationId);
             let response;
             try {
                 response = await invokeAsync((this.networkClient.sendPostRequestAsync.bind(this.networkClient)), PerformanceEvents.NetworkClientSendPostRequestAsync, this.logger, this.performanceClient, correlationId)(tokenEndpoint, options);
@@ -6400,7 +6377,7 @@
                     throw createClientAuthError(networkError);
                 }
             }
-            ThrottlingUtils.postProcess(this.cacheManager, thumbprint, response);
+            ThrottlingUtils.postProcess(this.cacheManager, thumbprint, response, correlationId);
             return response;
         }
         /**
@@ -6431,7 +6408,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6459,7 +6436,7 @@
         uxNotAllowed: uxNotAllowed
     });
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6549,7 +6526,7 @@
         return new InteractionRequiredAuthError(errorCode, InteractionRequiredAuthErrorMessages[errorCode]);
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6621,16 +6598,14 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
      */
     const KeyLocation = {
-        SW: "sw",
-        UHW: "uhw",
-    };
+        SW: "sw"};
     /** @internal */
     class PopTokenGenerator {
         constructor(cryptoUtils, performanceClient) {
@@ -6705,7 +6680,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6732,7 +6707,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6845,7 +6820,7 @@
                     !forceCacheRefreshTokenResponse &&
                     cacheRecord.account) {
                     const key = cacheRecord.account.generateAccountKey();
-                    const account = this.cacheStorage.getAccount(key);
+                    const account = this.cacheStorage.getAccount(key, request.correlationId);
                     if (!account) {
                         this.logger.warning("Account used to refresh tokens not in persistence, refreshed tokens will not be stored in the cache");
                         return await ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenClaims, requestStateObj, undefined, serverRequestId);
@@ -6880,7 +6855,7 @@
             let cachedAccount;
             if (serverTokenResponse.id_token && !!idTokenClaims) {
                 cachedIdToken = createIdTokenEntity(this.homeAccountIdentifier, env, serverTokenResponse.id_token, this.clientId, claimsTenantId || "");
-                cachedAccount = buildAccountToCache(this.cacheStorage, authority, this.homeAccountIdentifier, this.cryptoObj.base64Decode, idTokenClaims, serverTokenResponse.client_info, env, claimsTenantId, authCodePayload, undefined, // nativeAccountId
+                cachedAccount = buildAccountToCache(this.cacheStorage, authority, this.homeAccountIdentifier, this.cryptoObj.base64Decode, request.correlationId, idTokenClaims, serverTokenResponse.client_info, env, claimsTenantId, authCodePayload, undefined, // nativeAccountId
                 this.logger);
             }
             // AccessToken
@@ -7029,7 +7004,7 @@
             };
         }
     }
-    function buildAccountToCache(cacheStorage, authority, homeAccountId, base64Decode, idTokenClaims, clientInfo, environment, claimsTenantId, authCodePayload, nativeAccountId, logger) {
+    function buildAccountToCache(cacheStorage, authority, homeAccountId, base64Decode, correlationId, idTokenClaims, clientInfo, environment, claimsTenantId, authCodePayload, nativeAccountId, logger) {
         logger?.verbose("setCachedAccount called");
         // Check if base account is already cached
         const accountKeys = cacheStorage.getAccountKeys();
@@ -7038,7 +7013,7 @@
         });
         let cachedAccount = null;
         if (baseAccountKey) {
-            cachedAccount = cacheStorage.getAccount(baseAccountKey);
+            cachedAccount = cacheStorage.getAccount(baseAccountKey, correlationId);
         }
         const baseAccount = cachedAccount ||
             AccountEntity.createAccount({
@@ -7063,74 +7038,7 @@
         return baseAccount;
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
-
-    /*
-     * Copyright (c) Microsoft Corporation. All rights reserved.
-     * Licensed under the MIT License.
-     */
-    /**
-     * Validates server consumable params from the "request" objects
-     */
-    class RequestValidator {
-        /**
-         * Utility to check if the `redirectUri` in the request is a non-null value
-         * @param redirectUri
-         */
-        static validateRedirectUri(redirectUri) {
-            if (!redirectUri) {
-                throw createClientConfigurationError(redirectUriEmpty);
-            }
-        }
-        /**
-         * Utility to validate prompt sent by the user in the request
-         * @param prompt
-         */
-        static validatePrompt(prompt) {
-            const promptValues = [];
-            for (const value in PromptValue) {
-                promptValues.push(PromptValue[value]);
-            }
-            if (promptValues.indexOf(prompt) < 0) {
-                throw createClientConfigurationError(invalidPromptValue);
-            }
-        }
-        static validateClaims(claims) {
-            try {
-                JSON.parse(claims);
-            }
-            catch (e) {
-                throw createClientConfigurationError(invalidClaims);
-            }
-        }
-        /**
-         * Utility to validate code_challenge and code_challenge_method
-         * @param codeChallenge
-         * @param codeChallengeMethod
-         */
-        static validateCodeChallengeParams(codeChallenge, codeChallengeMethod) {
-            if (!codeChallenge || !codeChallengeMethod) {
-                throw createClientConfigurationError(pkceParamsMissing);
-            }
-            else {
-                this.validateCodeChallengeMethod(codeChallengeMethod);
-            }
-        }
-        /**
-         * Utility to validate code_challenge_method
-         * @param codeChallengeMethod
-         */
-        static validateCodeChallengeMethod(codeChallengeMethod) {
-            if ([
-                CodeChallengeMethodValues.PLAIN,
-                CodeChallengeMethodValues.S256,
-            ].indexOf(codeChallengeMethod) < 0) {
-                throw createClientConfigurationError(invalidCodeChallengeMethod);
-            }
-        }
-    }
-
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -7148,7 +7056,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7242,7 +7150,9 @@
              */
             if (!this.includeRedirectUri) {
                 // Just validate
-                RequestValidator.validateRedirectUri(request.redirectUri);
+                if (!request.redirectUri) {
+                    throw createClientConfigurationError(redirectUriEmpty);
+                }
             }
             else {
                 // Validate and include redirect uri
@@ -7381,7 +7291,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7454,7 +7364,7 @@
         async acquireTokenWithCachedRefreshToken(request, foci) {
             this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
             // fetches family RT or application RT based on FOCI value
-            const refreshToken = invoke(this.cacheManager.getRefreshToken.bind(this.cacheManager), PerformanceEvents.CacheManagerGetRefreshToken, this.logger, this.performanceClient, request.correlationId)(request.account, foci, undefined, this.performanceClient, request.correlationId);
+            const refreshToken = invoke(this.cacheManager.getRefreshToken.bind(this.cacheManager), PerformanceEvents.CacheManagerGetRefreshToken, this.logger, this.performanceClient, request.correlationId)(request.account, foci, request.correlationId, undefined, this.performanceClient);
             if (!refreshToken) {
                 throw createInteractionRequiredAuthError(noTokensFound);
             }
@@ -7484,7 +7394,7 @@
                         // Remove bad refresh token from cache
                         this.logger.verbose("acquireTokenWithRefreshToken: bad refresh token, removing from cache");
                         const badRefreshTokenKey = generateCredentialKey(refreshToken);
-                        this.cacheManager.removeRefreshToken(badRefreshTokenKey);
+                        this.cacheManager.removeRefreshToken(badRefreshTokenKey, request.correlationId);
                     }
                 }
                 throw e;
@@ -7590,7 +7500,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7642,9 +7552,9 @@
             }
             const environment = request.authority || this.authority.getPreferredCache();
             const cacheRecord = {
-                account: this.cacheManager.readAccountFromCache(request.account),
+                account: this.cacheManager.readAccountFromCache(request.account, request.correlationId),
                 accessToken: cachedAccessToken,
-                idToken: this.cacheManager.getIdToken(request.account, tokenKeys, requestTenantId, this.performanceClient, request.correlationId),
+                idToken: this.cacheManager.getIdToken(request.account, request.correlationId, tokenKeys, requestTenantId, this.performanceClient),
                 refreshToken: null,
                 appMetadata: this.cacheManager.readAppMetadataFromCache(environment),
             };
@@ -7688,7 +7598,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7703,7 +7613,7 @@
         },
     };
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7927,7 +7837,7 @@
         return account.idTokenClaims?.login_hint || null;
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7985,7 +7895,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8124,7 +8034,7 @@
             else {
                 lastRequests.errors.push(SERVER_TELEM_CONSTANTS.UNKNOWN_ERROR);
             }
-            this.cacheManager.setServerTelemetry(this.telemetryCacheKey, lastRequests);
+            this.cacheManager.setServerTelemetry(this.telemetryCacheKey, lastRequests, this.correlationId);
             return;
         }
         /**
@@ -8133,7 +8043,7 @@
         incrementCacheHits() {
             const lastRequests = this.getLastRequests();
             lastRequests.cacheHits += 1;
-            this.cacheManager.setServerTelemetry(this.telemetryCacheKey, lastRequests);
+            this.cacheManager.setServerTelemetry(this.telemetryCacheKey, lastRequests, this.correlationId);
             return lastRequests.cacheHits;
         }
         /**
@@ -8157,7 +8067,7 @@
             const errorCount = lastRequests.errors.length;
             if (numErrorsFlushed === errorCount) {
                 // All errors were sent on last request, clear Telemetry cache
-                this.cacheManager.removeItem(this.telemetryCacheKey);
+                this.cacheManager.removeItem(this.telemetryCacheKey, this.correlationId);
             }
             else {
                 // Partial data was flushed to server, construct a new telemetry cache item with errors that were not flushed
@@ -8166,7 +8076,7 @@
                     errors: lastRequests.errors.slice(numErrorsFlushed),
                     cacheHits: 0,
                 };
-                this.cacheManager.setServerTelemetry(this.telemetryCacheKey, serverTelemEntity);
+                this.cacheManager.setServerTelemetry(this.telemetryCacheKey, serverTelemEntity, this.correlationId);
             }
         }
         /**
@@ -8233,7 +8143,7 @@
         setNativeBrokerErrorCode(errorCode) {
             const lastRequests = this.getLastRequests();
             lastRequests.nativeBrokerErrorCode = errorCode;
-            this.cacheManager.setServerTelemetry(this.telemetryCacheKey, lastRequests);
+            this.cacheManager.setServerTelemetry(this.telemetryCacheKey, lastRequests, this.correlationId);
         }
         getNativeBrokerErrorCode() {
             return this.getLastRequests().nativeBrokerErrorCode;
@@ -8241,14 +8151,14 @@
         clearNativeBrokerErrorCode() {
             const lastRequests = this.getLastRequests();
             delete lastRequests.nativeBrokerErrorCode;
-            this.cacheManager.setServerTelemetry(this.telemetryCacheKey, lastRequests);
+            this.cacheManager.setServerTelemetry(this.telemetryCacheKey, lastRequests, this.correlationId);
         }
         static makeExtraSkuString(params) {
             return makeExtraSkuString(params);
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -8256,7 +8166,7 @@
     const missingKidError = "missing_kid_error";
     const missingAlgError = "missing_alg_error";
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8281,7 +8191,7 @@
         return new JoseHeaderError(code, JoseHeaderErrorMessages[code]);
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8321,7 +8231,7 @@
         }
     }
 
-    /*! @azure/msal-common v15.7.1 2025-06-18 */
+    /*! @azure/msal-common v15.8.1 2025-07-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8983,7 +8893,8 @@
     const invalidPopTokenRequest = "invalid_pop_token_request";
     const failedToBuildHeaders = "failed_to_build_headers";
     const failedToParseHeaders = "failed_to_parse_headers";
-    const failedToDecryptEarResponse = "failed_to_decrypt_ear_response";
+    const failedToDecryptEarResponse = "failed_to_decrypt_ear_response";
+    const timedOut = "timed_out";
 
     var BrowserAuthErrorCodes = /*#__PURE__*/Object.freeze({
         __proto__: null,
@@ -9031,6 +8942,7 @@
         silentPromptValueError: silentPromptValueError,
         spaCodeAndNativeAccountIdPresent: spaCodeAndNativeAccountIdPresent,
         stateInteractionTypeMismatch: stateInteractionTypeMismatch,
+        timedOut: timedOut,
         unableToAcquireTokenFromNativePlatform: unableToAcquireTokenFromNativePlatform,
         unableToLoadToken: unableToLoadToken,
         unableToParseState: unableToParseState,
@@ -9098,6 +9010,7 @@
         [failedToBuildHeaders]: "Failed to build request headers object.",
         [failedToParseHeaders]: "Failed to parse response headers",
         [failedToDecryptEarResponse]: "Failed to decrypt ear response",
+        [timedOut]: "The request timed out.",
     };
     /**
      * BrowserAuthErrorMessage class containing string constants used by error codes and messages.
@@ -9311,10 +9224,6 @@
      * Constants
      */
     const BrowserConstants = {
-        /**
-         * Interaction in progress cache value
-         */
-        INTERACTION_IN_PROGRESS_VALUE: "interaction_in_progress",
         /**
          * Invalid grant error code
          */
@@ -10166,9 +10075,9 @@
             else {
                 window.location.assign(url); // CodeQL [SM03712] Application owner controls the URL. User can't change it.
             }
-            return new Promise((resolve) => {
+            return new Promise((resolve, reject) => {
                 setTimeout(() => {
-                    resolve(true);
+                    reject(createBrowserAuthError(timedOut, "failed_to_redirect"));
                 }, options.timeout);
             });
         }
@@ -10426,7 +10335,7 @@
 
     /* eslint-disable header/header */
     const name = "@azure/msal-browser";
-    const version = "4.13.2";
+    const version = "4.15.0";
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -11539,7 +11448,7 @@
         setItem(key, value) {
             window.localStorage.setItem(key, value);
         }
-        async setUserData(key, value, correlationId) {
+        async setUserData(key, value, correlationId, timestamp) {
             if (!this.initialized || !this.encryptionCookie) {
                 throw createBrowserAuthError(uninitializedPublicClientApplication);
             }
@@ -11548,6 +11457,7 @@
                 id: this.encryptionCookie.id,
                 nonce: nonce,
                 data: data,
+                lastUpdatedAt: timestamp,
             };
             this.memoryStorage.setItem(key, value);
             this.setItem(key, JSON.stringify(encryptedData));
@@ -11817,7 +11727,7 @@
                 this.performanceClient.addFields({ previousLibraryVersion: previousVersion }, correlationId);
             }
             if (previousVersion !== version) {
-                this.browserStorage.setItem(StaticCacheKeys.VERSION, version);
+                this.setItem(StaticCacheKeys.VERSION, version, correlationId);
             }
         }
         /**
@@ -11841,22 +11751,111 @@
                 return null;
             }
         }
+        /**
+         * Helper to setItem in browser storage, with cleanup in case of quota errors
+         * @param key
+         * @param value
+         */
+        setItem(key, value, correlationId) {
+            let accessTokenKeys = [];
+            const maxRetries = 20;
+            for (let i = 0; i <= maxRetries; i++) {
+                try {
+                    this.browserStorage.setItem(key, value);
+                    if (i > 0) {
+                        // Finally update the token keys array with the tokens removed
+                        this.removeAccessTokenKeys(accessTokenKeys.slice(0, i), correlationId);
+                    }
+                    break; // If setItem succeeds, exit the loop
+                }
+                catch (e) {
+                    const cacheError = createCacheError(e);
+                    if (cacheError.errorCode ===
+                        cacheQuotaExceeded &&
+                        i < maxRetries) {
+                        if (!accessTokenKeys.length) {
+                            if (key ===
+                                `${StaticCacheKeys.TOKEN_KEYS}.${this.clientId}`) {
+                                // If we are currently trying to set the token keys, use the value we're trying to set
+                                accessTokenKeys = JSON.parse(value)
+                                    .accessToken;
+                            }
+                            else {
+                                // If token keys have not been initialized, get them
+                                accessTokenKeys = this.getTokenKeys().accessToken;
+                            }
+                        }
+                        if (accessTokenKeys.length <= i) {
+                            // Nothing to remove, rethrow the error
+                            throw cacheError;
+                        }
+                        // When cache quota is exceeded, start removing access tokens until we can successfully set the item
+                        this.removeAccessToken(accessTokenKeys[i], correlationId, false // Don't save token keys yet, do it at the end
+                        );
+                    }
+                    else {
+                        // If the error is not a quota exceeded error, rethrow it
+                        throw cacheError;
+                    }
+                }
+            }
+        }
+        /**
+         * Helper to setUserData in browser storage, with cleanup in case of quota errors
+         * @param key
+         * @param value
+         * @param correlationId
+         */
+        async setUserData(key, value, correlationId, timestamp) {
+            let accessTokenKeys = [];
+            const maxRetries = 20;
+            for (let i = 0; i <= maxRetries; i++) {
+                try {
+                    await invokeAsync(this.browserStorage.setUserData.bind(this.browserStorage), PerformanceEvents.SetUserData, this.logger, this.performanceClient)(key, value, correlationId, timestamp);
+                    if (i > 0) {
+                        // Finally update the token keys array with the tokens removed
+                        this.removeAccessTokenKeys(accessTokenKeys.slice(0, i), correlationId);
+                    }
+                    break; // If setItem succeeds, exit the loop
+                }
+                catch (e) {
+                    const cacheError = createCacheError(e);
+                    if (cacheError.errorCode ===
+                        cacheQuotaExceeded &&
+                        i < maxRetries) {
+                        if (!accessTokenKeys.length) {
+                            accessTokenKeys = this.getTokenKeys().accessToken;
+                        }
+                        if (accessTokenKeys.length <= i) {
+                            // Nothing left to remove, rethrow the error
+                            throw cacheError;
+                        }
+                        // When cache quota is exceeded, start removing access tokens until we can successfully set the item
+                        this.removeAccessToken(accessTokenKeys[i], correlationId, false // Don't save token keys yet, do it at the end
+                        );
+                    }
+                    else {
+                        // If the error is not a quota exceeded error, rethrow it
+                        throw cacheError;
+                    }
+                }
+            }
+        }
         /**
          * Reads account from cache, deserializes it into an account entity and returns it.
          * If account is not found from the key, returns null and removes key from map.
          * @param accountKey
          * @returns
          */
-        getAccount(accountKey) {
+        getAccount(accountKey, correlationId) {
             this.logger.trace("BrowserCacheManager.getAccount called");
             const serializedAccount = this.browserStorage.getUserData(accountKey);
             if (!serializedAccount) {
-                this.removeAccountKeyFromMap(accountKey);
+                this.removeAccountKeyFromMap(accountKey, correlationId);
                 return null;
             }
             const parsedAccount = this.validateAndParseJson(serializedAccount);
             if (!parsedAccount || !AccountEntity.isAccountEntity(parsedAccount)) {
-                this.removeAccountKeyFromMap(accountKey);
                 return null;
             }
             return CacheManager.toObject(new AccountEntity(), parsedAccount);
@@ -11868,8 +11867,10 @@
         async setAccount(account, correlationId) {
             this.logger.trace("BrowserCacheManager.setAccount called");
             const key = account.generateAccountKey();
-            await invokeAsync(this.browserStorage.setUserData.bind(this.browserStorage), PerformanceEvents.SetUserData, this.logger, this.performanceClient)(key, JSON.stringify(account), correlationId);
-            const wasAdded = this.addAccountKeyToMap(key);
+            const timestamp = Date.now().toString();
+            account.lastUpdatedAt = timestamp;
+            await this.setUserData(key, JSON.stringify(account), correlationId, timestamp);
+            const wasAdded = this.addAccountKeyToMap(key, correlationId);
             /**
              * @deprecated - Remove this in next major version in favor of more consistent LOGIN event
              */
@@ -11890,14 +11891,14 @@
          * Add a new account to the key map
          * @param key
          */
-        addAccountKeyToMap(key) {
+        addAccountKeyToMap(key, correlationId) {
             this.logger.trace("BrowserCacheManager.addAccountKeyToMap called");
             this.logger.tracePii(`BrowserCacheManager.addAccountKeyToMap called with key: ${key}`);
             const accountKeys = this.getAccountKeys();
             if (accountKeys.indexOf(key) === -1) {
                 // Only add key if it does not already exist in the map
                 accountKeys.push(key);
-                this.browserStorage.setItem(StaticCacheKeys.ACCOUNT_KEYS, JSON.stringify(accountKeys));
+                this.setItem(StaticCacheKeys.ACCOUNT_KEYS, JSON.stringify(accountKeys), correlationId);
                 this.logger.verbose("BrowserCacheManager.addAccountKeyToMap account key added");
                 return true;
             }
@@ -11910,14 +11911,21 @@
          * Remove an account from the key map
          * @param key
          */
-        removeAccountKeyFromMap(key) {
+        removeAccountKeyFromMap(key, correlationId) {
             this.logger.trace("BrowserCacheManager.removeAccountKeyFromMap called");
             this.logger.tracePii(`BrowserCacheManager.removeAccountKeyFromMap called with key: ${key}`);
             const accountKeys = this.getAccountKeys();
             const removalIndex = accountKeys.indexOf(key);
             if (removalIndex > -1) {
                 accountKeys.splice(removalIndex, 1);
-                this.browserStorage.setItem(StaticCacheKeys.ACCOUNT_KEYS, JSON.stringify(accountKeys));
+                if (accountKeys.length === 0) {
+                    // If no keys left, remove the map
+                    this.removeItem(StaticCacheKeys.ACCOUNT_KEYS);
+                    return;
+                }
+                else {
+                    this.setItem(StaticCacheKeys.ACCOUNT_KEYS, JSON.stringify(accountKeys), correlationId);
+                }
                 this.logger.trace("BrowserCacheManager.removeAccountKeyFromMap account key removed");
             }
             else {
@@ -11930,7 +11938,7 @@
          */
         removeAccount(key, correlationId) {
             super.removeAccount(key, correlationId);
-            this.removeAccountKeyFromMap(key);
+            this.removeAccountKeyFromMap(key, correlationId);
         }
         /**
          * Removes credentials associated with the provided account
@@ -11949,25 +11957,60 @@
          * Removes given idToken from the cache and from the key map
          * @param key
          */
-        removeIdToken(key) {
-            super.removeIdToken(key);
-            this.removeTokenKey(key, CredentialType.ID_TOKEN);
+        removeIdToken(key, correlationId) {
+            super.removeIdToken(key, correlationId);
+            const tokenKeys = this.getTokenKeys();
+            const idRemoval = tokenKeys.idToken.indexOf(key);
+            if (idRemoval > -1) {
+                this.logger.info("idToken removed from tokenKeys map");
+                tokenKeys.idToken.splice(idRemoval, 1);
+                this.setTokenKeys(tokenKeys, correlationId);
+            }
         }
         /**
          * Removes given accessToken from the cache and from the key map
          * @param key
          */
-        removeAccessToken(key, correlationId) {
+        removeAccessToken(key, correlationId, updateTokenKeys = true) {
             super.removeAccessToken(key, correlationId);
-            this.removeTokenKey(key, CredentialType.ACCESS_TOKEN);
+            updateTokenKeys && this.removeAccessTokenKeys([key], correlationId);
+        }
+        /**
+         * Remove access token key from the key map
+         * @param key
+         * @param correlationId
+         * @param tokenKeys
+         */
+        removeAccessTokenKeys(keys, correlationId) {
+            this.logger.trace("removeAccessTokenKey called");
+            const tokenKeys = this.getTokenKeys();
+            let keysRemoved = 0;
+            keys.forEach((key) => {
+                const accessRemoval = tokenKeys.accessToken.indexOf(key);
+                if (accessRemoval > -1) {
+                    tokenKeys.accessToken.splice(accessRemoval, 1);
+                    keysRemoved++;
+                }
+            });
+            if (keysRemoved > 0) {
+                this.logger.info(`removed ${keysRemoved} accessToken keys from tokenKeys map`);
+                this.setTokenKeys(tokenKeys, correlationId);
+                return;
+            }
         }
         /**
          * Removes given refreshToken from the cache and from the key map
          * @param key
          */
-        removeRefreshToken(key) {
-            super.removeRefreshToken(key);
-            this.removeTokenKey(key, CredentialType.REFRESH_TOKEN);
+        removeRefreshToken(key, correlationId) {
+            super.removeRefreshToken(key, correlationId);
+            const tokenKeys = this.getTokenKeys();
+            const refreshRemoval = tokenKeys.refreshToken.indexOf(key);
+            if (refreshRemoval > -1) {
+                this.logger.info("refreshToken removed from tokenKeys map");
+                tokenKeys.refreshToken.splice(refreshRemoval, 1);
+                this.setTokenKeys(tokenKeys, correlationId);
+            }
         }
         /**
          * Gets the keys for the cached tokens associated with this clientId
@@ -11977,101 +12020,37 @@
             return getTokenKeys(this.clientId, this.browserStorage);
         }
         /**
-         * Adds the given key to the token key map
-         * @param key
-         * @param type
+         * Stores the token keys in the cache
+         * @param tokenKeys
+         * @param correlationId
+         * @returns
          */
-        addTokenKey(key, type) {
-            this.logger.trace("BrowserCacheManager addTokenKey called");
-            const tokenKeys = this.getTokenKeys();
-            switch (type) {
-                case CredentialType.ID_TOKEN:
-                    if (tokenKeys.idToken.indexOf(key) === -1) {
-                        this.logger.info("BrowserCacheManager: addTokenKey - idToken added to map");
-                        tokenKeys.idToken.push(key);
-                    }
-                    break;
-                case CredentialType.ACCESS_TOKEN:
-                    if (tokenKeys.accessToken.indexOf(key) === -1) {
-                        this.logger.info("BrowserCacheManager: addTokenKey - accessToken added to map");
-                        tokenKeys.accessToken.push(key);
-                    }
-                    break;
-                case CredentialType.REFRESH_TOKEN:
-                    if (tokenKeys.refreshToken.indexOf(key) === -1) {
-                        this.logger.info("BrowserCacheManager: addTokenKey - refreshToken added to map");
-                        tokenKeys.refreshToken.push(key);
-                    }
-                    break;
-                default:
-                    this.logger.error(`BrowserCacheManager:addTokenKey - CredentialType provided invalid. CredentialType: ${type}`);
-                    throw createClientAuthError(unexpectedCredentialType);
+        setTokenKeys(tokenKeys, correlationId) {
+            if (tokenKeys.idToken.length === 0 &&
+                tokenKeys.accessToken.length === 0 &&
+                tokenKeys.refreshToken.length === 0) {
+                // If no keys left, remove the map
+                this.removeItem(`${StaticCacheKeys.TOKEN_KEYS}.${this.clientId}`);
+                return;
             }
-            this.browserStorage.setItem(`${StaticCacheKeys.TOKEN_KEYS}.${this.clientId}`, JSON.stringify(tokenKeys));
-        }
-        /**
-         * Removes the given key from the token key map
-         * @param key
-         * @param type
-         */
-        removeTokenKey(key, type) {
-            this.logger.trace("BrowserCacheManager removeTokenKey called");
-            const tokenKeys = this.getTokenKeys();
-            switch (type) {
-                case CredentialType.ID_TOKEN:
-                    this.logger.infoPii(`BrowserCacheManager: removeTokenKey - attempting to remove idToken with key: ${key} from map`);
-                    const idRemoval = tokenKeys.idToken.indexOf(key);
-                    if (idRemoval > -1) {
-                        this.logger.info("BrowserCacheManager: removeTokenKey - idToken removed from map");
-                        tokenKeys.idToken.splice(idRemoval, 1);
-                    }
-                    else {
-                        this.logger.info("BrowserCacheManager: removeTokenKey - idToken does not exist in map. Either it was previously removed or it was never added.");
-                    }
-                    break;
-                case CredentialType.ACCESS_TOKEN:
-                    this.logger.infoPii(`BrowserCacheManager: removeTokenKey - attempting to remove accessToken with key: ${key} from map`);
-                    const accessRemoval = tokenKeys.accessToken.indexOf(key);
-                    if (accessRemoval > -1) {
-                        this.logger.info("BrowserCacheManager: removeTokenKey - accessToken removed from map");
-                        tokenKeys.accessToken.splice(accessRemoval, 1);
-                    }
-                    else {
-                        this.logger.info("BrowserCacheManager: removeTokenKey - accessToken does not exist in map. Either it was previously removed or it was never added.");
-                    }
-                    break;
-                case CredentialType.REFRESH_TOKEN:
-                    this.logger.infoPii(`BrowserCacheManager: removeTokenKey - attempting to remove refreshToken with key: ${key} from map`);
-                    const refreshRemoval = tokenKeys.refreshToken.indexOf(key);
-                    if (refreshRemoval > -1) {
-                        this.logger.info("BrowserCacheManager: removeTokenKey - refreshToken removed from map");
-                        tokenKeys.refreshToken.splice(refreshRemoval, 1);
-                    }
-                    else {
-                        this.logger.info("BrowserCacheManager: removeTokenKey - refreshToken does not exist in map. Either it was previously removed or it was never added.");
-                    }
-                    break;
-                default:
-                    this.logger.error(`BrowserCacheManager:removeTokenKey - CredentialType provided invalid. CredentialType: ${type}`);
-                    throw createClientAuthError(unexpectedCredentialType);
+            else {
+                this.setItem(`${StaticCacheKeys.TOKEN_KEYS}.${this.clientId}`, JSON.stringify(tokenKeys), correlationId);
             }
-            this.browserStorage.setItem(`${StaticCacheKeys.TOKEN_KEYS}.${this.clientId}`, JSON.stringify(tokenKeys));
         }
         /**
          * generates idToken entity from a string
          * @param idTokenKey
          */
-        getIdTokenCredential(idTokenKey) {
+        getIdTokenCredential(idTokenKey, correlationId) {
             const value = this.browserStorage.getUserData(idTokenKey);
             if (!value) {
                 this.logger.trace("BrowserCacheManager.getIdTokenCredential: called, no cache hit");
-                this.removeTokenKey(idTokenKey, CredentialType.ID_TOKEN);
+                this.removeIdToken(idTokenKey, correlationId);
                 return null;
             }
             const parsedIdToken = this.validateAndParseJson(value);
             if (!parsedIdToken || !isIdTokenEntity(parsedIdToken)) {
                 this.logger.trace("BrowserCacheManager.getIdTokenCredential: called, no cache hit");
-                this.removeTokenKey(idTokenKey, CredentialType.ID_TOKEN);
                 return null;
             }
             this.logger.trace("BrowserCacheManager.getIdTokenCredential: cache hit");
@@ -12084,25 +12063,31 @@
         async setIdTokenCredential(idToken, correlationId) {
             this.logger.trace("BrowserCacheManager.setIdTokenCredential called");
             const idTokenKey = generateCredentialKey(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);
+            const timestamp = Date.now().toString();
+            idToken.lastUpdatedAt = timestamp;
+            await this.setUserData(idTokenKey, JSON.stringify(idToken), correlationId, timestamp);
+            const tokenKeys = this.getTokenKeys();
+            if (tokenKeys.idToken.indexOf(idTokenKey) === -1) {
+                this.logger.info("BrowserCacheManager: addTokenKey - idToken added to map");
+                tokenKeys.idToken.push(idTokenKey);
+                this.setTokenKeys(tokenKeys, correlationId);
+            }
         }
         /**
          * generates accessToken entity from a string
          * @param key
          */
-        getAccessTokenCredential(accessTokenKey) {
+        getAccessTokenCredential(accessTokenKey, correlationId) {
             const value = this.browserStorage.getUserData(accessTokenKey);
             if (!value) {
                 this.logger.trace("BrowserCacheManager.getAccessTokenCredential: called, no cache hit");
-                this.removeTokenKey(accessTokenKey, CredentialType.ACCESS_TOKEN);
+                this.removeAccessTokenKeys([accessTokenKey], correlationId);
                 return null;
             }
             const parsedAccessToken = this.validateAndParseJson(value);
             if (!parsedAccessToken ||
                 !isAccessTokenEntity(parsedAccessToken)) {
                 this.logger.trace("BrowserCacheManager.getAccessTokenCredential: called, no cache hit");
-                this.removeTokenKey(accessTokenKey, CredentialType.ACCESS_TOKEN);
                 return null;
             }
             this.logger.trace("BrowserCacheManager.getAccessTokenCredential: cache hit");
@@ -12115,25 +12100,33 @@
         async setAccessTokenCredential(accessToken, correlationId) {
             this.logger.trace("BrowserCacheManager.setAccessTokenCredential called");
             const accessTokenKey = generateCredentialKey(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);
+            const timestamp = Date.now().toString();
+            accessToken.lastUpdatedAt = timestamp;
+            await this.setUserData(accessTokenKey, JSON.stringify(accessToken), correlationId, timestamp);
+            const tokenKeys = this.getTokenKeys();
+            const index = tokenKeys.accessToken.indexOf(accessTokenKey);
+            if (index !== -1) {
+                tokenKeys.accessToken.splice(index, 1); // Remove existing key before pushing to the end
+            }
+            this.logger.trace(`access token ${index === -1 ? "added to" : "updated in"} map`);
+            tokenKeys.accessToken.push(accessTokenKey);
+            this.setTokenKeys(tokenKeys, correlationId);
         }
         /**
          * generates refreshToken entity from a string
          * @param refreshTokenKey
          */
-        getRefreshTokenCredential(refreshTokenKey) {
+        getRefreshTokenCredential(refreshTokenKey, correlationId) {
             const value = this.browserStorage.getUserData(refreshTokenKey);
             if (!value) {
                 this.logger.trace("BrowserCacheManager.getRefreshTokenCredential: called, no cache hit");
-                this.removeTokenKey(refreshTokenKey, CredentialType.REFRESH_TOKEN);
+                this.removeRefreshToken(refreshTokenKey, correlationId);
                 return null;
             }
             const parsedRefreshToken = this.validateAndParseJson(value);
             if (!parsedRefreshToken ||
                 !isRefreshTokenEntity(parsedRefreshToken)) {
                 this.logger.trace("BrowserCacheManager.getRefreshTokenCredential: called, no cache hit");
-                this.removeTokenKey(refreshTokenKey, CredentialType.REFRESH_TOKEN);
                 return null;
             }
             this.logger.trace("BrowserCacheManager.getRefreshTokenCredential: cache hit");
@@ -12146,8 +12139,15 @@
         async setRefreshTokenCredential(refreshToken, correlationId) {
             this.logger.trace("BrowserCacheManager.setRefreshTokenCredential called");
             const refreshTokenKey = generateCredentialKey(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);
+            const timestamp = Date.now().toString();
+            refreshToken.lastUpdatedAt = timestamp;
+            await this.setUserData(refreshTokenKey, JSON.stringify(refreshToken), correlationId, timestamp);
+            const tokenKeys = this.getTokenKeys();
+            if (tokenKeys.refreshToken.indexOf(refreshTokenKey) === -1) {
+                this.logger.info("BrowserCacheManager: addTokenKey - refreshToken added to map");
+                tokenKeys.refreshToken.push(refreshTokenKey);
+                this.setTokenKeys(tokenKeys, correlationId);
+            }
         }
         /**
          * fetch appMetadata entity from the platform cache
@@ -12172,10 +12172,10 @@
          * set appMetadata entity to the platform cache
          * @param appMetadata
          */
-        setAppMetadata(appMetadata) {
+        setAppMetadata(appMetadata, correlationId) {
             this.logger.trace("BrowserCacheManager.setAppMetadata called");
             const appMetadataKey = generateAppMetadataKey(appMetadata);
-            this.browserStorage.setItem(appMetadataKey, JSON.stringify(appMetadata));
+            this.setItem(appMetadataKey, JSON.stringify(appMetadata), correlationId);
         }
         /**
          * fetch server telemetry entity from the platform cache
@@ -12201,9 +12201,9 @@
          * @param serverTelemetryKey
          * @param serverTelemetry
          */
-        setServerTelemetry(serverTelemetryKey, serverTelemetry) {
+        setServerTelemetry(serverTelemetryKey, serverTelemetry, correlationId) {
             this.logger.trace("BrowserCacheManager.setServerTelemetry called");
-            this.browserStorage.setItem(serverTelemetryKey, JSON.stringify(serverTelemetry));
+            this.setItem(serverTelemetryKey, JSON.stringify(serverTelemetry), correlationId);
         }
         /**
          *
@@ -12261,7 +12261,7 @@
         /**
          * Gets the active account
          */
-        getActiveAccount() {
+        getActiveAccount(correlationId) {
             const activeAccountKeyFilters = this.generateCacheKey(PersistentCacheKeys.ACTIVE_ACCOUNT_FILTERS);
             const activeAccountValueFilters = this.browserStorage.getItem(activeAccountKeyFilters);
             if (!activeAccountValueFilters) {
@@ -12275,7 +12275,7 @@
                     homeAccountId: activeAccountValueObj.homeAccountId,
                     localAccountId: activeAccountValueObj.localAccountId,
                     tenantId: activeAccountValueObj.tenantId,
-                });
+                }, correlationId);
             }
             this.logger.trace("BrowserCacheManager.getActiveAccount: No active account found");
             return null;
@@ -12284,7 +12284,7 @@
          * Sets the active account's localAccountId in cache
          * @param account
          */
-        setActiveAccount(account) {
+        setActiveAccount(account, correlationId) {
             const activeAccountKey = this.generateCacheKey(PersistentCacheKeys.ACTIVE_ACCOUNT_FILTERS);
             if (account) {
                 this.logger.verbose("setActiveAccount: Active account set");
@@ -12292,8 +12292,9 @@
                     homeAccountId: account.homeAccountId,
                     localAccountId: account.localAccountId,
                     tenantId: account.tenantId,
+                    lastUpdatedAt: nowSeconds().toString(),
                 };
-                this.browserStorage.setItem(activeAccountKey, JSON.stringify(activeAccountValue));
+                this.setItem(activeAccountKey, JSON.stringify(activeAccountValue), correlationId);
             }
             else {
                 this.logger.verbose("setActiveAccount: No account passed, active account not set");
@@ -12325,9 +12326,9 @@
          * @param throttlingCacheKey
          * @param throttlingCache
          */
-        setThrottlingCache(throttlingCacheKey, throttlingCache) {
+        setThrottlingCache(throttlingCacheKey, throttlingCache, correlationId) {
             this.logger.trace("BrowserCacheManager.setThrottlingCache called");
-            this.browserStorage.setItem(throttlingCacheKey, JSON.stringify(throttlingCache));
+            this.setItem(throttlingCacheKey, JSON.stringify(throttlingCache), correlationId);
         }
         /**
          * Gets cache item with given key.
@@ -12406,7 +12407,7 @@
         clear(correlationId) {
             // Removes all accounts and their credentials
             this.removeAllAccounts(correlationId);
-            this.removeAppMetadata();
+            this.removeAppMetadata(correlationId);
             // Remove temp storage first to make sure any cookies are cleared
             this.temporaryCacheStorage.getKeys().forEach((cacheKey) => {
                 if (cacheKey.indexOf(Constants.CACHE_PREFIX) !== -1 ||
@@ -12435,7 +12436,7 @@
             let removedAccessTokens = 0;
             tokenKeys.accessToken.forEach((key) => {
                 // if the access token has claims in its key, remove the token key and the token
-                const credential = this.getAccessTokenCredential(key);
+                const credential = this.getAccessTokenCredential(key, correlationId);
                 if (credential?.requestedClaimsHash &&
                     key.includes(credential.requestedClaimsHash.toLowerCase())) {
                     this.removeAccessToken(key, correlationId);
@@ -12671,22 +12672,24 @@
      * @param accountFilter - (Optional) filter to narrow down the accounts returned
      * @returns Array of AccountInfo objects in cache
      */
-    function getAllAccounts(logger, browserStorage, isInBrowser, accountFilter) {
+    function getAllAccounts(logger, browserStorage, isInBrowser, correlationId, accountFilter) {
         logger.verbose("getAllAccounts called");
-        return isInBrowser ? browserStorage.getAllAccounts(accountFilter) : [];
+        return isInBrowser
+            ? browserStorage.getAllAccounts(accountFilter || {}, correlationId)
+            : [];
     }
     /**
      * Returns the first account found in the cache that matches the account filter passed in.
      * @param accountFilter
      * @returns The first account found in the cache matching the provided filter or null if no account could be found.
      */
-    function getAccount(accountFilter, logger, browserStorage) {
+    function getAccount(accountFilter, logger, browserStorage, correlationId) {
         logger.trace("getAccount called");
         if (Object.keys(accountFilter).length === 0) {
             logger.warning("getAccount: No accountFilter provided");
             return null;
         }
-        const account = browserStorage.getAccountInfoFilteredBy(accountFilter);
+        const account = browserStorage.getAccountInfoFilteredBy(accountFilter, correlationId);
         if (account) {
             logger.verbose("getAccount: Account matching provided filter found, returning");
             return account;
@@ -12704,7 +12707,7 @@
      * @param username
      * @returns The account object stored in MSAL
      */
-    function getAccountByUsername(username, logger, browserStorage) {
+    function getAccountByUsername(username, logger, browserStorage, correlationId) {
         logger.trace("getAccountByUsername called");
         if (!username) {
             logger.warning("getAccountByUsername: No username provided");
@@ -12712,7 +12715,7 @@
         }
         const account = browserStorage.getAccountInfoFilteredBy({
             username,
-        });
+        }, correlationId);
         if (account) {
             logger.verbose("getAccountByUsername: Account matching username found, returning");
             logger.verbosePii(`getAccountByUsername: Returning signed-in accounts matching username: ${username}`);
@@ -12730,7 +12733,7 @@
      * @param homeAccountId
      * @returns The account object stored in MSAL
      */
-    function getAccountByHomeId(homeAccountId, logger, browserStorage) {
+    function getAccountByHomeId(homeAccountId, logger, browserStorage, correlationId) {
         logger.trace("getAccountByHomeId called");
         if (!homeAccountId) {
             logger.warning("getAccountByHomeId: No homeAccountId provided");
@@ -12738,7 +12741,7 @@
         }
         const account = browserStorage.getAccountInfoFilteredBy({
             homeAccountId,
-        });
+        }, correlationId);
         if (account) {
             logger.verbose("getAccountByHomeId: Account matching homeAccountId found, returning");
             logger.verbosePii(`getAccountByHomeId: Returning signed-in accounts matching homeAccountId: ${homeAccountId}`);
@@ -12756,7 +12759,7 @@
      * @param localAccountId
      * @returns The account object stored in MSAL
      */
-    function getAccountByLocalId(localAccountId, logger, browserStorage) {
+    function getAccountByLocalId(localAccountId, logger, browserStorage, correlationId) {
         logger.trace("getAccountByLocalId called");
         if (!localAccountId) {
             logger.warning("getAccountByLocalId: No localAccountId provided");
@@ -12764,7 +12767,7 @@
         }
         const account = browserStorage.getAccountInfoFilteredBy({
             localAccountId,
-        });
+        }, correlationId);
         if (account) {
             logger.verbose("getAccountByLocalId: Account matching localAccountId found, returning");
             logger.verbosePii(`getAccountByLocalId: Returning signed-in accounts matching localAccountId: ${localAccountId}`);
@@ -12779,14 +12782,14 @@
      * Sets the account to use as the active account. If no account is passed to the acquireToken APIs, then MSAL will use this active account.
      * @param account
      */
-    function setActiveAccount(account, browserStorage) {
-        browserStorage.setActiveAccount(account);
+    function setActiveAccount(account, browserStorage, correlationId) {
+        browserStorage.setActiveAccount(account, correlationId);
     }
     /**
      * Gets the currently active account
      */
-    function getActiveAccount(browserStorage) {
-        return browserStorage.getActiveAccount();
+    function getActiveAccount(browserStorage, correlationId) {
+        return browserStorage.getActiveAccount(correlationId);
     }
 
     /*
@@ -12910,15 +12913,15 @@
             this.logger = logger.clone(BrowserConstants.MSAL_SKU, version, this.correlationId);
             this.performanceClient = performanceClient;
         }
-        async clearCacheOnLogout(account) {
+        async clearCacheOnLogout(correlationId, account) {
             if (account) {
-                if (AccountEntity.accountInfoIsEqual(account, this.browserStorage.getActiveAccount(), false)) {
+                if (AccountEntity.accountInfoIsEqual(account, this.browserStorage.getActiveAccount(correlationId), false)) {
                     this.logger.verbose("Setting active account to null");
-                    this.browserStorage.setActiveAccount(null);
+                    this.browserStorage.setActiveAccount(null, correlationId);
                 }
                 // Clear given account.
                 try {
-                    this.browserStorage.removeAccount(AccountEntity.generateAccountCacheKey(account), this.correlationId);
+                    this.browserStorage.removeAccount(AccountEntity.generateAccountCacheKey(account), correlationId);
                     this.logger.verbose("Cleared cache items belonging to the account provided in the logout request.");
                 }
                 catch (error) {
@@ -12929,7 +12932,7 @@
                 try {
                     this.logger.verbose("No account provided in logout request, clearing all cache items.", this.correlationId);
                     // Clear all accounts and tokens
-                    this.browserStorage.clear(this.correlationId);
+                    this.browserStorage.clear(correlationId);
                     // Clear any stray keys from IndexedDB
                     await this.browserCrypto.clearKeystore();
                 }
@@ -13251,7 +13254,8 @@
             if (request.loginHint || request.sid) {
                 return validatedRequest;
             }
-            const account = request.account || this.browserStorage.getActiveAccount();
+            const account = request.account ||
+                this.browserStorage.getActiveAccount(this.correlationId);
             if (account) {
                 this.logger.verbose("Setting validated request account", this.correlationId);
                 this.logger.verbosePii(`Setting validated request account: ${account.homeAccountId}`, this.correlationId);
@@ -13541,7 +13545,7 @@
         logout(logoutRequest) {
             this.logger.verbose("logoutRedirect called");
             const validLogoutRequest = this.initializeLogoutRequest(logoutRequest);
-            return this.clearCacheOnLogout(validLogoutRequest?.account);
+            return this.clearCacheOnLogout(validLogoutRequest.correlationId, validLogoutRequest?.account);
         }
     }
 
@@ -13665,7 +13669,7 @@
             // fetch the account from browser cache
             const account = this.browserStorage.getBaseAccountInfo({
                 nativeAccountId,
-            });
+            }, this.correlationId);
             if (!account) {
                 throw createClientAuthError(noAccountFound);
             }
@@ -13781,7 +13785,7 @@
             const homeAccountIdentifier = this.createHomeAccountIdentifier(response, idTokenClaims);
             const cachedhomeAccountId = this.browserStorage.getAccountInfoFilteredBy({
                 nativeAccountId: request.accountId,
-            })?.homeAccountId;
+            }, this.correlationId)?.homeAccountId;
             // add exception for double brokering, please note this is temporary and will be fortified in future
             if (request.extraParameters?.child_client_id &&
                 response.account.id !== request.accountId) {
@@ -13796,7 +13800,7 @@
             const authority = await this.getDiscoveredAuthority({
                 requestAuthority: request.authority,
             });
-            const baseAccount = buildAccountToCache(this.browserStorage, authority, homeAccountIdentifier, base64Decode, idTokenClaims, response.client_info, undefined, // environment
+            const baseAccount = buildAccountToCache(this.browserStorage, authority, homeAccountIdentifier, base64Decode, this.correlationId, idTokenClaims, response.client_info, undefined, // environment
             idTokenClaims.tid, undefined, // auth code payload
             response.account.id, this.logger);
             // Ensure expires_in is in number format
@@ -13804,7 +13808,7 @@
             // generate authenticationResult
             const result = await this.generateAuthenticationResult(response, request, idTokenClaims, baseAccount, authority.canonicalAuthority, reqTimestamp);
             // cache accounts and tokens in the appropriate storage
-            await this.cacheAccount(baseAccount);
+            await this.cacheAccount(baseAccount, this.correlationId);
             await this.cacheNativeTokens(response, request, homeAccountIdentifier, idTokenClaims, response.access_token, result.tenantId, reqTimestamp);
             return result;
         }
@@ -13928,11 +13932,11 @@
          * cache the account entity in browser storage
          * @param accountEntity
          */
-        async cacheAccount(accountEntity) {
+        async cacheAccount(accountEntity, correlationId) {
             // Store the account info and hence `nativeAccountId` in browser cache
             await this.browserStorage.setAccount(accountEntity, this.correlationId);
             // Remove any existing cached tokens for this account in browser storage
-            this.browserStorage.removeAccountContext(accountEntity, this.correlationId);
+            this.browserStorage.removeAccountContext(accountEntity, correlationId);
         }
         /**
          * Stores the access_token and id_token in inmemory storage
@@ -15102,7 +15106,7 @@
             const serverTelemetryManager = this.initializeServerTelemetryManager(ApiId.logoutPopup);
             try {
                 // Clear cache on logout
-                await this.clearCacheOnLogout(validRequest.account);
+                await this.clearCacheOnLogout(this.correlationId, validRequest.account);
                 // Initialize the client
                 const authClient = await invokeAsync(this.createAuthCodeClient.bind(this), PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, this.logger, this.performanceClient, this.correlationId)({
                     serverTelemetryManager,
@@ -15480,6 +15484,11 @@
             this.browserStorage.cacheAuthorizeRequest(redirectRequest);
             const form = await getEARForm(document, this.config, discoveredAuthority, redirectRequest, this.logger, this.performanceClient);
             form.submit();
+            return new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    reject(createBrowserAuthError(timedOut, "failed_to_redirect"));
+                }, this.config.system.redirectNavigationTimeout);
+            });
         }
         /**
          * Checks if navigateToLoginRequestUrl is set, and:
@@ -15694,7 +15703,7 @@
             try {
                 this.eventHandler.emitEvent(EventType.LOGOUT_START, exports.InteractionType.Redirect, logoutRequest);
                 // Clear cache on logout
-                await this.clearCacheOnLogout(validLogoutRequest.account);
+                await this.clearCacheOnLogout(this.correlationId, validLogoutRequest.account);
                 const navigationOptions = {
                     apiId: ApiId.logout,
                     timeout: this.config.system.redirectNavigationTimeout,
@@ -16189,7 +16198,7 @@
             }
             const homeAccountId = AccountEntity.generateHomeAccountId(clientInfo, authority.authorityType, this.logger, this.cryptoObj, idTokenClaims);
             const claimsTenantId = idTokenClaims?.tid;
-            const cachedAccount = buildAccountToCache(this.storage, authority, homeAccountId, base64Decode, idTokenClaims, clientInfo, authority.hostnameAndPort, claimsTenantId, undefined, // authCodePayload
+            const cachedAccount = buildAccountToCache(this.storage, authority, homeAccountId, base64Decode, correlationId, idTokenClaims, clientInfo, authority.hostnameAndPort, claimsTenantId, undefined, // authCodePayload
             undefined, // nativeAccountId
             this.logger);
             await this.storage.setAccount(cachedAccount, correlationId);
@@ -17227,7 +17236,8 @@
          * @returns Array of AccountInfo objects in cache
          */
         getAllAccounts(accountFilter) {
-            return getAllAccounts(this.logger, this.browserStorage, this.isBrowserEnvironment, accountFilter);
+            const correlationId = this.getRequestCorrelationId();
+            return getAllAccounts(this.logger, this.browserStorage, this.isBrowserEnvironment, correlationId, accountFilter);
         }
         /**
          * Returns the first account found in the cache that matches the account filter passed in.
@@ -17235,7 +17245,8 @@
          * @returns The first account found in the cache matching the provided filter or null if no account could be found.
          */
         getAccount(accountFilter) {
-            return getAccount(accountFilter, this.logger, this.browserStorage);
+            const correlationId = this.getRequestCorrelationId();
+            return getAccount(accountFilter, this.logger, this.browserStorage, correlationId);
         }
         /**
          * Returns the signed in account matching username.
@@ -17246,7 +17257,8 @@
          * @returns The account object stored in MSAL
          */
         getAccountByUsername(username) {
-            return getAccountByUsername(username, this.logger, this.browserStorage);
+            const correlationId = this.getRequestCorrelationId();
+            return getAccountByUsername(username, this.logger, this.browserStorage, correlationId);
         }
         /**
          * Returns the signed in account matching homeAccountId.
@@ -17256,7 +17268,8 @@
          * @returns The account object stored in MSAL
          */
         getAccountByHomeId(homeAccountId) {
-            return getAccountByHomeId(homeAccountId, this.logger, this.browserStorage);
+            const correlationId = this.getRequestCorrelationId();
+            return getAccountByHomeId(homeAccountId, this.logger, this.browserStorage, correlationId);
         }
         /**
          * Returns the signed in account matching localAccountId.
@@ -17266,20 +17279,23 @@
          * @returns The account object stored in MSAL
          */
         getAccountByLocalId(localAccountId) {
-            return getAccountByLocalId(localAccountId, this.logger, this.browserStorage);
+            const correlationId = this.getRequestCorrelationId();
+            return getAccountByLocalId(localAccountId, this.logger, this.browserStorage, correlationId);
         }
         /**
          * Sets the account to use as the active account. If no account is passed to the acquireToken APIs, then MSAL will use this active account.
          * @param account
          */
         setActiveAccount(account) {
-            setActiveAccount(account, this.browserStorage);
+            const correlationId = this.getRequestCorrelationId();
+            setActiveAccount(account, this.browserStorage, correlationId);
         }
         /**
          * Gets the currently active account
          */
         getActiveAccount() {
-            return getActiveAccount(this.browserStorage);
+            const correlationId = this.getRequestCorrelationId();
+            return getActiveAccount(this.browserStorage, correlationId);
         }
         // #endregion
         /**
@@ -17619,9 +17635,7 @@
         async acquireTokenSilentDeduped(request, account, correlationId) {
             const thumbprint = getRequestThumbprint(this.config.auth.clientId, {
                 ...request,
-                authority: request.authority || this.config.auth.authority,
-                correlationId: correlationId,
-            }, account.homeAccountId);
+                authority: request.authority || this.config.auth.authority}, account.homeAccountId);
             const silentRequestKey = JSON.stringify(thumbprint);
             const inProgressRequest = this.activeSilentTokenRequests.get(silentRequestKey);
             if (typeof inProgressRequest === "undefined") {
@@ -18283,8 +18297,9 @@
             // always prioritize the account context from the bridge
             const accountContext = this.bridgeProxy.getAccountContext() || this.currentAccountContext;
             let currentAccount = null;
+            const correlationId = request.correlationId || this.browserCrypto.createNewGuid();
             if (accountContext) {
-                currentAccount = getAccount(accountContext, this.logger, this.browserStorage);
+                currentAccount = getAccount(accountContext, this.logger, this.browserStorage, correlationId);
             }
             // fall back to brokering if no cached account is found
             if (!currentAccount) {
@@ -18313,7 +18328,7 @@
                 this.logger.verbose("Cached access token has expired");
                 return Promise.resolve(null);
             }
-            const cachedIdToken = this.browserStorage.getIdToken(currentAccount, tokenKeys, currentAccount.tenantId, this.performanceClient, authRequest.correlationId);
+            const cachedIdToken = this.browserStorage.getIdToken(currentAccount, authRequest.correlationId, tokenKeys, currentAccount.tenantId, this.performanceClient);
             if (!cachedIdToken) {
                 this.logger.verbose("No cached id token found");
                 return Promise.resolve(null);
@@ -18410,7 +18425,8 @@
          * @returns Array of AccountInfo objects in cache
          */
         getAllAccounts(accountFilter) {
-            return getAllAccounts(this.logger, this.browserStorage, this.isBrowserEnv(), accountFilter);
+            const correlationId = this.browserCrypto.createNewGuid();
+            return getAllAccounts(this.logger, this.browserStorage, this.isBrowserEnv(), correlationId, accountFilter);
         }
         /**
          * Returns the first account found in the cache that matches the account filter passed in.
@@ -18418,7 +18434,8 @@
          * @returns The first account found in the cache matching the provided filter or null if no account could be found.
          */
         getAccount(accountFilter) {
-            return getAccount(accountFilter, this.logger, this.browserStorage);
+            const correlationId = this.browserCrypto.createNewGuid();
+            return getAccount(accountFilter, this.logger, this.browserStorage, correlationId);
         }
         /**
          * Returns the signed in account matching username.
@@ -18429,7 +18446,8 @@
          * @returns The account object stored in MSAL
          */
         getAccountByUsername(username) {
-            return getAccountByUsername(username, this.logger, this.browserStorage);
+            const correlationId = this.browserCrypto.createNewGuid();
+            return getAccountByUsername(username, this.logger, this.browserStorage, correlationId);
         }
         /**
          * Returns the signed in account matching homeAccountId.
@@ -18439,7 +18457,8 @@
          * @returns The account object stored in MSAL
          */
         getAccountByHomeId(homeAccountId) {
-            return getAccountByHomeId(homeAccountId, this.logger, this.browserStorage);
+            const correlationId = this.browserCrypto.createNewGuid();
+            return getAccountByHomeId(homeAccountId, this.logger, this.browserStorage, correlationId);
         }
         /**
          * Returns the signed in account matching localAccountId.
@@ -18449,7 +18468,8 @@
          * @returns The account object stored in MSAL
          */
         getAccountByLocalId(localAccountId) {
-            return getAccountByLocalId(localAccountId, this.logger, this.browserStorage);
+            const correlationId = this.browserCrypto.createNewGuid();
+            return getAccountByLocalId(localAccountId, this.logger, this.browserStorage, correlationId);
         }
         /**
          * Sets the account to use as the active account. If no account is passed to the acquireToken APIs, then MSAL will use this active account.
@@ -18460,13 +18480,15 @@
              * StandardController uses this to allow the developer to set the active account
              * in the nested app auth scenario the active account is controlled by the app hosting the nested app
              */
-            return setActiveAccount(account, this.browserStorage);
+            const correlationId = this.browserCrypto.createNewGuid();
+            return setActiveAccount(account, this.browserStorage, correlationId);
         }
         /**
          * Gets the currently active account
          */
         getActiveAccount() {
-            return getActiveAccount(this.browserStorage);
+            const correlationId = this.browserCrypto.createNewGuid();
+            return getActiveAccount(this.browserStorage, correlationId);
         }
         // #endregion
         handleRedirectPromise(hash // eslint-disable-line @typescript-eslint/no-unused-vars