@azure/msal-browser 4.18.0 → 4.19.0

package/dist/custom-auth-path/cache/BrowserCacheManager.d.ts

@@ -1,4 +1,4 @@
-import { AccessTokenEntity, AccountEntity, AccountInfo, AppMetadataEntity, AuthorityMetadataEntity, CacheManager, CacheRecord, CommonAuthorizationUrlRequest, ICrypto, IdTokenEntity, IPerformanceClient, Logger, RefreshTokenEntity, ServerTelemetryEntity, StaticAuthorityOptions, StoreInCache, ThrottlingEntity, TokenKeys } from "@azure/msal-common/browser";
+import { AccessTokenEntity, AccountEntity, AccountInfo, AppMetadataEntity, AuthorityMetadataEntity, CacheManager, CacheRecord, CommonAuthorizationUrlRequest, ICrypto, IdTokenEntity, IPerformanceClient, Logger, RefreshTokenEntity, ServerTelemetryEntity, StaticAuthorityOptions, StoreInCache, ThrottlingEntity, TokenKeys, CredentialEntity } from "@azure/msal-common/browser";
 import { CacheOptions } from "../config/Configuration.js";
 import { INTERACTION_TYPE } from "../utils/BrowserConstants.js";
 import { MemoryStorage } from "./MemoryStorage.js";
@@ -26,6 +26,11 @@ export declare class BrowserCacheManager extends CacheManager {
     private eventHandler;
     constructor(clientId: string, cacheConfig: Required<CacheOptions>, cryptoImpl: ICrypto, logger: Logger, performanceClient: IPerformanceClient, eventHandler: EventHandler, staticAuthorityOptions?: StaticAuthorityOptions);
     initialize(correlationId: string): Promise<void>;
+    /**
+     * Migrates any existing cache data from previous versions of MSAL.js into the current cache structure.
+     */
+    migrateExistingCache(correlationId: string): Promise<void>;
+    updateV0ToCurrent(currentSchema: number, v0Keys: Array<string>, v1Keys: Array<string>, correlationId: string): Promise<void[]>;
     /**
      * Tracks upgrades and downgrades for telemetry and debugging purposes
      */
@@ -79,12 +84,7 @@ export declare class BrowserCacheManager extends CacheManager {
      * Extends inherited removeAccount function to include removal of the account key from the map
      * @param key
      */
-    removeAccount(key: string, correlationId: string): void;
-    /**
-     * Removes credentials associated with the provided account
-     * @param account
-     */
-    removeAccountContext(account: AccountEntity, correlationId: string): void;
+    removeAccount(account: AccountInfo, correlationId: string): void;
     /**
      * Removes given idToken from the cache and from the key map
      * @param key
@@ -101,7 +101,7 @@ export declare class BrowserCacheManager extends CacheManager {
      * @param correlationId
      * @param tokenKeys
      */
-    removeAccessTokenKeys(keys: Array<string>, correlationId: string): void;
+    removeAccessTokenKeys(keys: Array<string>, correlationId: string, schemaVersion?: number): void;
     /**
      * Removes given refreshToken from the cache and from the key map
      * @param key
@@ -111,14 +111,14 @@ export declare class BrowserCacheManager extends CacheManager {
      * Gets the keys for the cached tokens associated with this clientId
      * @returns
      */
-    getTokenKeys(): TokenKeys;
+    getTokenKeys(schemaVersion?: number): TokenKeys;
     /**
      * Stores the token keys in the cache
      * @param tokenKeys
      * @param correlationId
      * @returns
      */
-    setTokenKeys(tokenKeys: TokenKeys, correlationId: string): void;
+    setTokenKeys(tokenKeys: TokenKeys, correlationId: string, schemaVersion?: number): void;
     /**
      * generates idToken entity from a string
      * @param idTokenKey
@@ -254,11 +254,26 @@ export declare class BrowserCacheManager extends CacheManager {
      */
     clearTokensAndKeysWithClaims(correlationId: string): void;
     /**
-     * Prepend msal.<client-id> to each key; Skip for any JSON object as Key (defined schemas do not need the key appended: AccessToken Keys or the upcoming schema)
+     * Prepend msal.<client-id> to each key
      * @param key
      * @param addInstanceId
      */
     generateCacheKey(key: string): string;
+    /**
+     * Cache Key: msal.<schema_version>-<home_account_id>-<environment>-<credential_type>-<client_id or familyId>-<realm>-<scopes>-<claims hash>-<scheme>
+     * IdToken Example: uid.utid-login.microsoftonline.com-idtoken-app_client_id-contoso.com
+     * AccessToken Example: uid.utid-login.microsoftonline.com-accesstoken-app_client_id-contoso.com-scope1 scope2--pop
+     * RefreshToken Example: uid.utid-login.microsoftonline.com-refreshtoken-1-contoso.com
+     * @param credentialEntity
+     * @returns
+     */
+    generateCredentialKey(credential: CredentialEntity): string;
+    /**
+     * Cache Key: msal.<schema_version>.<home_account_id>.<environment>.<tenant_id>
+     * @param account
+     * @returns
+     */
+    generateAccountKey(account: AccountInfo): string;
     /**
      * Reset all temporary cache items
      * @param state

package/dist/custom-auth-path/cache/BrowserCacheManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrowserCacheManager.d.ts","sourceRoot":"","sources":["../../../src/cache/BrowserCacheManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BrowserCacheManager.d.ts","sourceRoot":"","sources":["../../../src/cache/BrowserCacheManager.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,iBAAiB,EACjB,aAAa,EACb,WAAW,EAEX,iBAAiB,EAEjB,uBAAuB,EAIvB,YAAY,EACZ,WAAW,EACX,6BAA6B,EAI7B,OAAO,EACP,aAAa,EAEb,kBAAkB,EAClB,MAAM,EAGN,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,EACtB,YAAY,EAEZ,gBAAgB,EAEhB,SAAS,EACT,gBAAgB,EAGnB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK1D,OAAO,EAGH,gBAAgB,EAEnB,MAAM,8BAA8B,CAAC;AAItC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAMxD;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,YAAY;IAEjD,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAE9C,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAEjD,SAAS,CAAC,eAAe,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAEjD,SAAS,CAAC,qBAAqB,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAExD,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,OAAO,CAAC,YAAY,CAAe;gBAG/B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,QAAQ,CAAC,YAAY,CAAC,EACnC,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,kBAAkB,EACrC,YAAY,EAAE,YAAY,EAC1B,sBAAsB,CAAC,EAAE,sBAAsB;IA4B7C,UAAU,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;OAEG;IACG,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0E1D,iBAAiB,CACnB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EACrB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EACrB,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,EAAE,CAAC;IAsHlB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAmB3B;;;OAGG;IACH,SAAS,CAAC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAoBhE;;;;OAIG;IACH,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAoEhE;;;;;OAKG;IACG,WAAW,CACb,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC;IAgEhB;;;;;OAKG;IACH,UAAU,CACN,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACtB,aAAa,GAAG,IAAI;IAmBvB;;;OAGG;IACG,UAAU,CACZ,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;OAGG;IACH,cAAc,IAAI,KAAK,CAAC,MAAM,CAAC;IAI/B;;;OAGG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO;IA0B/D;;;OAGG;IACH,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IA8BjE;;;OAGG;IACH,aAAa,CAAC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAuChE;;;OAGG;IACH,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAWvD;;;OAGG;IACH,iBAAiB,CACb,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,eAAe,GAAE,OAAc,GAChC,IAAI;IAKP;;;;;OAKG;IACH,qBAAqB,CACjB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EACnB,aAAa,EAAE,MAAM,EACrB,aAAa,GAAE,MAA4C,GAC5D,IAAI;IAqBP;;;OAGG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAW5D;;;OAGG;IACH,YAAY,CACR,aAAa,GAAE,MAA4C,GAC5D,SAAS;IAIZ;;;;;OAKG;IACH,YAAY,CACR,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,MAAM,EACrB,aAAa,GAAE,MAA4C,GAC5D,IAAI;IAoBP;;;OAGG;IACH,oBAAoB,CAChB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACtB,aAAa,GAAG,IAAI;IAwBvB;;;OAGG;IACG,oBAAoB,CACtB,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC;IAuBhB;;;OAGG;IACH,wBAAwB,CACpB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,GACtB,iBAAiB,GAAG,IAAI;IA0B3B;;;OAGG;IACG,wBAAwB,CAC1B,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC;IA2BhB;;;OAGG;IACH,yBAAyB,CACrB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,GACtB,kBAAkB,GAAG,IAAI;IA0B5B;;;OAGG;IACG,yBAAyB,CAC3B,YAAY,EAAE,kBAAkB,EAChC,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC;IAyBhB;;;OAGG;IACH,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAwBhE;;;OAGG;IACH,cAAc,CACV,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,MAAM,GACtB,IAAI;IAUP;;;OAGG;IACH,kBAAkB,CACd,kBAAkB,EAAE,MAAM,GAC3B,qBAAqB,GAAG,IAAI;IA0B/B;;;;OAIG;IACH,kBAAkB,CACd,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,qBAAqB,EACtC,aAAa,EAAE,MAAM,GACtB,IAAI;IASP;;OAEG;IACH,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,GAAG,IAAI;IAqBjE;;OAEG;IACH,wBAAwB,IAAI,KAAK,CAAC,MAAM,CAAC;IAOzC;;;;OAIG;IACH,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI;IAQpE;;OAEG;IACH,kBAAkB,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;IAUtC;;;OAGG;IACH,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,uBAAuB,GAAG,IAAI;IAKxE;;OAEG;IACH,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAmC3D;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IA0B1E;;;OAGG;IACH,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IA2BvE;;;;OAIG;IACH,kBAAkB,CACd,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,gBAAgB,EACjC,aAAa,EAAE,MAAM,GACtB,IAAI;IASP;;;;OAIG;IACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI;IAsCzE;;;;;;OAMG;IACH,iBAAiB,CACb,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,WAAW,CAAC,EAAE,OAAO,GACtB,IAAI;IAiBP;;;OAGG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI7B;;;;OAIG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAUtC;;OAEG;IACH,OAAO,IAAI,MAAM,EAAE;IAInB;;OAEG;IACH,KAAK,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IA4BlC;;;;;OAKG;IACH,4BAA4B,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IA+BzD;;;;OAIG;IACH,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAOrC;;;;;;;OAOG;IACH,qBAAqB,CAAC,UAAU,EAAE,gBAAgB,GAAG,MAAM;IA0B3D;;;;OAIG;IACH,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM;IAYhD;;;OAGG;IACH,iBAAiB,IAAI,IAAI;IAqBzB,qBAAqB,CACjB,eAAe,EAAE,6BAA6B,EAC9C,YAAY,CAAC,EAAE,MAAM,GACtB,IAAI;IAoBP;;OAEG;IACH,gBAAgB,IAAI,CAAC,6BAA6B,EAAE,MAAM,CAAC;IAqC3D;;OAEG;IACH,sBAAsB,IAAI,mBAAmB,GAAG,IAAI;IA0BpD,uBAAuB,CAAC,aAAa,CAAC,EAAE,OAAO,GAAG,OAAO;IAUzD,wBAAwB,IAAI;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,gBAAgB,CAAC;KAC1B,GAAG,IAAI;IAiBR,wBAAwB,CACpB,UAAU,EAAE,OAAO,EACnB,IAAI,GAAE,gBAA0C,GACjD,IAAI;IAwBP;;;;OAIG;IACG,YAAY,CACd,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EACD,aAAa,GACb,gBAAgB,GAChB,eAAe,GACf,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC;IAoDhB;;;;;OAKG;IACG,eAAe,CACjB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,YAAY,GAC5B,OAAO,CAAC,IAAI,CAAC;CA8BnB;AA6BD,eAAO,MAAM,6BAA6B,aAC5B,MAAM,UACR,MAAM,qBACK,kBAAkB,gBACvB,YAAY,KAC3B,mBAkBF,CAAC"}

package/dist/custom-auth-path/cache/BrowserCacheManager.mjs

@@ -1,8 +1,9 @@
-/*! @azure/msal-browser v4.18.0 2025-07-30 */
+/*! @azure/msal-browser v4.19.0 2025-08-05 */
 'use strict';
-import { CacheManager, createCacheError, CacheErrorCodes, invokeAsync, PerformanceEvents, AccountEntity, CacheHelpers, Constants, PersistentCacheKeys, TimeUtils, StringUtils, CacheError, DEFAULT_CRYPTO_IMPLEMENTATION } from '@azure/msal-common/browser';
+import { CacheManager, CacheHelpers, TimeUtils, DEFAULT_TOKEN_RENEWAL_OFFSET_SEC, createCacheError, CacheErrorCodes, invokeAsync, PerformanceEvents, AccountEntity, Constants, PersistentCacheKeys, StringUtils, AuthenticationScheme, CacheError, DEFAULT_CRYPTO_IMPLEMENTATION, CredentialType } from '@azure/msal-common/browser';
 import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
-import { StaticCacheKeys, BrowserCacheLocation, InMemoryCacheKeys, TemporaryCacheKeys, INTERACTION_TYPE } from '../utils/BrowserConstants.mjs';
+import { BrowserCacheLocation, InMemoryCacheKeys, TemporaryCacheKeys, INTERACTION_TYPE } from '../utils/BrowserConstants.mjs';
+import { ACCOUNT_SCHEMA_VERSION, CREDENTIAL_SCHEMA_VERSION, getAccountKeysCacheKey, PREFIX, CACHE_KEY_SEPARATOR, VERSION_CACHE_KEY, getTokenKeysCacheKey } from './CacheKeys.mjs';
 import { LocalStorage } from './LocalStorage.mjs';
 import { SessionStorage } from './SessionStorage.mjs';
 import { MemoryStorage } from './MemoryStorage.mjs';
@@ -13,6 +14,8 @@ import { getAccountKeys, getTokenKeys } from './CacheHelpers.mjs';
 import { EventType } from '../event/EventType.mjs';
 import { clearHash } from '../utils/BrowserUtils.mjs';
 import { version } from '../packageMetadata.mjs';
+import { removeElementFromArray } from '../utils/Helpers.mjs';
+import { isEncrypted } from './EncryptedData.mjs';
 import { noTokenRequestCacheError, unableToParseTokenRequestCacheError, interactionInProgress } from '../error/BrowserAuthErrorCodes.mjs';
 
 /*
@@ -36,20 +39,132 @@ class BrowserCacheManager extends CacheManager {
         this.eventHandler = eventHandler;
     }
     async initialize(correlationId) {
+        this.performanceClient.addFields({
+            cacheLocation: this.cacheConfig.cacheLocation,
+            cacheRetentionDays: this.cacheConfig.cacheRetentionDays,
+        }, correlationId);
         await this.browserStorage.initialize(correlationId);
+        await this.migrateExistingCache(correlationId);
         this.trackVersionChanges(correlationId);
     }
+    /**
+     * Migrates any existing cache data from previous versions of MSAL.js into the current cache structure.
+     */
+    async migrateExistingCache(correlationId) {
+        const accountKeys0 = getAccountKeys(this.browserStorage, 0);
+        const tokenKeys0 = getTokenKeys(this.clientId, this.browserStorage, 0);
+        this.performanceClient.addFields({
+            oldAccountCount: accountKeys0.length,
+            oldAccessCount: tokenKeys0.accessToken.length,
+            oldIdCount: tokenKeys0.idToken.length,
+            oldRefreshCount: tokenKeys0.refreshToken.length,
+        }, correlationId);
+        const accountKeys1 = getAccountKeys(this.browserStorage, 1);
+        const tokenKeys1 = getTokenKeys(this.clientId, this.browserStorage, 1);
+        this.performanceClient.addFields({
+            currAccountCount: accountKeys1.length,
+            currAccessCount: tokenKeys1.accessToken.length,
+            currIdCount: tokenKeys1.idToken.length,
+            currRefreshCount: tokenKeys1.refreshToken.length,
+        }, correlationId);
+        await Promise.all([
+            this.updateV0ToCurrent(ACCOUNT_SCHEMA_VERSION, accountKeys0, accountKeys1, correlationId),
+            this.updateV0ToCurrent(CREDENTIAL_SCHEMA_VERSION, tokenKeys0.idToken, tokenKeys1.idToken, correlationId),
+            this.updateV0ToCurrent(CREDENTIAL_SCHEMA_VERSION, tokenKeys0.accessToken, tokenKeys1.accessToken, correlationId),
+            this.updateV0ToCurrent(CREDENTIAL_SCHEMA_VERSION, tokenKeys0.refreshToken, tokenKeys1.refreshToken, correlationId),
+        ]);
+        if (accountKeys0.length > 0) {
+            this.browserStorage.setItem(getAccountKeysCacheKey(0), JSON.stringify(accountKeys0));
+        }
+        else {
+            this.browserStorage.removeItem(getAccountKeysCacheKey(0));
+        }
+        if (accountKeys1.length > 0) {
+            this.browserStorage.setItem(getAccountKeysCacheKey(1), JSON.stringify(accountKeys1));
+        }
+        else {
+            this.browserStorage.removeItem(getAccountKeysCacheKey(1));
+        }
+        this.setTokenKeys(tokenKeys0, correlationId, 0);
+        this.setTokenKeys(tokenKeys1, correlationId, 1);
+    }
+    async updateV0ToCurrent(currentSchema, v0Keys, v1Keys, correlationId) {
+        const upgradePromises = [];
+        for (const v0Key of [...v0Keys]) {
+            const rawV0Value = this.browserStorage.getItem(v0Key);
+            const parsedV0Value = this.validateAndParseJson(rawV0Value || "");
+            if (!parsedV0Value) {
+                removeElementFromArray(v0Keys, v0Key);
+                continue;
+            }
+            if (!parsedV0Value.lastUpdatedAt) {
+                // Add lastUpdatedAt to the existing v0 entry if it doesnt exist so we know when it's safe to remove it
+                parsedV0Value.lastUpdatedAt = Date.now().toString();
+                this.setItem(v0Key, JSON.stringify(parsedV0Value), correlationId);
+            }
+            const decryptedData = isEncrypted(parsedV0Value)
+                ? await this.browserStorage.decryptData(v0Key, parsedV0Value, correlationId)
+                : parsedV0Value;
+            let expirationTime;
+            if (decryptedData) {
+                if (CacheHelpers.isAccessTokenEntity(decryptedData)) {
+                    expirationTime = decryptedData.expiresOn;
+                }
+                else if (CacheHelpers.isRefreshTokenEntity(decryptedData)) {
+                    expirationTime = decryptedData.expiresOn;
+                }
+            }
+            if (!decryptedData ||
+                TimeUtils.isCacheExpired(parsedV0Value.lastUpdatedAt, this.cacheConfig.cacheRetentionDays) ||
+                (expirationTime &&
+                    TimeUtils.isTokenExpired(expirationTime, DEFAULT_TOKEN_RENEWAL_OFFSET_SEC))) {
+                this.browserStorage.removeItem(v0Key);
+                removeElementFromArray(v0Keys, v0Key);
+                this.performanceClient.incrementFields({ expiredCacheRemovedCount: 1 }, correlationId);
+                continue;
+            }
+            if (this.cacheConfig.cacheLocation !==
+                BrowserCacheLocation.LocalStorage ||
+                isEncrypted(parsedV0Value)) {
+                const v1Key = `${PREFIX}.${currentSchema}${CACHE_KEY_SEPARATOR}${v0Key}`;
+                const rawV1Entry = this.browserStorage.getItem(v1Key);
+                if (!rawV1Entry) {
+                    upgradePromises.push(this.setUserData(v1Key, JSON.stringify(decryptedData), correlationId, parsedV0Value.lastUpdatedAt).then(() => {
+                        v1Keys.push(v1Key);
+                        this.performanceClient.incrementFields({ upgradedCacheCount: 1 }, correlationId);
+                    }));
+                    continue;
+                }
+                else {
+                    const parsedV1Entry = this.validateAndParseJson(rawV1Entry);
+                    // If the entry already exists but is older than the v0 entry, replace it
+                    if (Number(parsedV0Value.lastUpdatedAt) >
+                        Number(parsedV1Entry.lastUpdatedAt)) {
+                        upgradePromises.push(this.setUserData(v1Key, JSON.stringify(decryptedData), correlationId, parsedV0Value.lastUpdatedAt).then(() => {
+                            this.performanceClient.incrementFields({ updatedCacheFromV0Count: 1 }, correlationId);
+                        }));
+                        continue;
+                    }
+                }
+            }
+            /*
+             * Note: If we reach here for unencrypted localStorage data, we continue without migrating
+             * as we can't migrate unencrypted localStorage data right now since we can't guarantee KMSI=no
+             */
+        }
+        return Promise.all(upgradePromises);
+    }
     /**
      * Tracks upgrades and downgrades for telemetry and debugging purposes
      */
     trackVersionChanges(correlationId) {
-        const previousVersion = this.browserStorage.getItem(StaticCacheKeys.VERSION);
+        const previousVersion = this.browserStorage.getItem(VERSION_CACHE_KEY);
         if (previousVersion) {
             this.logger.info(`MSAL.js was last initialized by version: ${previousVersion}`);
             this.performanceClient.addFields({ previousLibraryVersion: previousVersion }, correlationId);
         }
         if (previousVersion !== version) {
-            this.setItem(StaticCacheKeys.VERSION, version, correlationId);
+            this.setItem(VERSION_CACHE_KEY, version, correlationId);
         }
     }
     /**
@@ -57,6 +172,9 @@ class BrowserCacheManager extends CacheManager {
      * @param input
      */
     validateAndParseJson(jsonValue) {
+        if (!jsonValue) {
+            return null;
+        }
         try {
             const parsedJson = JSON.parse(jsonValue);
             /**
@@ -79,6 +197,7 @@ class BrowserCacheManager extends CacheManager {
      * @param value
      */
     setItem(key, value, correlationId) {
+        let tokenKeysV0Count = 0;
         let accessTokenKeys = [];
         const maxRetries = 20;
         for (let i = 0; i <= maxRetries; i++) {
@@ -86,7 +205,13 @@ class BrowserCacheManager extends CacheManager {
                 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);
+                    if (i <= tokenKeysV0Count) {
+                        this.removeAccessTokenKeys(accessTokenKeys.slice(0, i), correlationId, 0);
+                    }
+                    else {
+                        this.removeAccessTokenKeys(accessTokenKeys.slice(0, tokenKeysV0Count), correlationId, 0);
+                        this.removeAccessTokenKeys(accessTokenKeys.slice(tokenKeysV0Count, i), correlationId);
+                    }
                 }
                 break; // If setItem succeeds, exit the loop
             }
@@ -96,16 +221,17 @@ class BrowserCacheManager extends CacheManager {
                     CacheErrorCodes.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 we are currently trying to set the token keys, use the value we're trying to set
+                        const tokenKeys0 = key ===
+                            getTokenKeysCacheKey(this.clientId, 0)
+                            ? JSON.parse(value).accessToken
+                            : this.getTokenKeys(0).accessToken;
+                        const tokenKeys1 = key ===
+                            getTokenKeysCacheKey(this.clientId)
+                            ? JSON.parse(value).accessToken
+                            : this.getTokenKeys().accessToken;
+                        accessTokenKeys = [...tokenKeys0, ...tokenKeys1];
+                        tokenKeysV0Count = tokenKeys0.length;
                     }
                     if (accessTokenKeys.length <= i) {
                         // Nothing to remove, rethrow the error
@@ -129,6 +255,7 @@ class BrowserCacheManager extends CacheManager {
      * @param correlationId
      */
     async setUserData(key, value, correlationId, timestamp) {
+        let tokenKeysV0Count = 0;
         let accessTokenKeys = [];
         const maxRetries = 20;
         for (let i = 0; i <= maxRetries; i++) {
@@ -136,7 +263,13 @@ class BrowserCacheManager extends CacheManager {
                 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);
+                    if (i <= tokenKeysV0Count) {
+                        this.removeAccessTokenKeys(accessTokenKeys.slice(0, i), correlationId, 0);
+                    }
+                    else {
+                        this.removeAccessTokenKeys(accessTokenKeys.slice(0, tokenKeysV0Count), correlationId, 0);
+                        this.removeAccessTokenKeys(accessTokenKeys.slice(tokenKeysV0Count, i), correlationId);
+                    }
                 }
                 break; // If setItem succeeds, exit the loop
             }
@@ -146,7 +279,10 @@ class BrowserCacheManager extends CacheManager {
                     CacheErrorCodes.cacheQuotaExceeded &&
                     i < maxRetries) {
                     if (!accessTokenKeys.length) {
-                        accessTokenKeys = this.getTokenKeys().accessToken;
+                        const tokenKeys0 = this.getTokenKeys(0).accessToken;
+                        const tokenKeys1 = this.getTokenKeys().accessToken;
+                        accessTokenKeys = [...tokenKeys0, ...tokenKeys1];
+                        tokenKeysV0Count = tokenKeys0.length;
                     }
                     if (accessTokenKeys.length <= i) {
                         // Nothing left to remove, rethrow the error
@@ -188,7 +324,7 @@ class BrowserCacheManager extends CacheManager {
      */
     async setAccount(account, correlationId) {
         this.logger.trace("BrowserCacheManager.setAccount called");
-        const key = account.generateAccountKey();
+        const key = this.generateAccountKey(account.getAccountInfo());
         const timestamp = Date.now().toString();
         account.lastUpdatedAt = timestamp;
         await this.setUserData(key, JSON.stringify(account), correlationId, timestamp);
@@ -220,7 +356,7 @@ class BrowserCacheManager extends CacheManager {
         if (accountKeys.indexOf(key) === -1) {
             // Only add key if it does not already exist in the map
             accountKeys.push(key);
-            this.setItem(StaticCacheKeys.ACCOUNT_KEYS, JSON.stringify(accountKeys), correlationId);
+            this.setItem(getAccountKeysCacheKey(), JSON.stringify(accountKeys), correlationId);
             this.logger.verbose("BrowserCacheManager.addAccountKeyToMap account key added");
             return true;
         }
@@ -242,11 +378,11 @@ class BrowserCacheManager extends CacheManager {
             accountKeys.splice(removalIndex, 1);
             if (accountKeys.length === 0) {
                 // If no keys left, remove the map
-                this.removeItem(StaticCacheKeys.ACCOUNT_KEYS);
+                this.removeItem(getAccountKeysCacheKey());
                 return;
             }
             else {
-                this.setItem(StaticCacheKeys.ACCOUNT_KEYS, JSON.stringify(accountKeys), correlationId);
+                this.setItem(getAccountKeysCacheKey(), JSON.stringify(accountKeys), correlationId);
             }
             this.logger.trace("BrowserCacheManager.removeAccountKeyFromMap account key removed");
         }
@@ -258,21 +394,26 @@ class BrowserCacheManager extends CacheManager {
      * Extends inherited removeAccount function to include removal of the account key from the map
      * @param key
      */
-    removeAccount(key, correlationId) {
-        super.removeAccount(key, correlationId);
-        this.removeAccountKeyFromMap(key, correlationId);
-    }
-    /**
-     * Removes credentials associated with the provided account
-     * @param account
-     */
-    removeAccountContext(account, correlationId) {
-        super.removeAccountContext(account, correlationId);
+    removeAccount(account, correlationId) {
+        const activeAccount = this.getActiveAccount(correlationId);
+        if (activeAccount?.homeAccountId === account.homeAccountId &&
+            activeAccount?.environment === account.environment) {
+            this.setActiveAccount(null, correlationId);
+        }
+        super.removeAccount(account, correlationId);
+        this.removeAccountKeyFromMap(this.generateAccountKey(account), correlationId);
+        // Remove all other associated cache items
+        this.browserStorage.getKeys().forEach((key) => {
+            if (key.includes(account.homeAccountId) &&
+                key.includes(account.environment)) {
+                this.browserStorage.removeItem(key);
+            }
+        });
         /**
          * @deprecated - Remove this in next major version in favor of more consistent LOGOUT event
          */
         if (this.cacheConfig.cacheLocation === BrowserCacheLocation.LocalStorage) {
-            this.eventHandler.emitEvent(EventType.ACCOUNT_REMOVED, undefined, account.getAccountInfo());
+            this.eventHandler.emitEvent(EventType.ACCOUNT_REMOVED, undefined, account);
         }
     }
     /**
@@ -303,9 +444,9 @@ class BrowserCacheManager extends CacheManager {
      * @param correlationId
      * @param tokenKeys
      */
-    removeAccessTokenKeys(keys, correlationId) {
+    removeAccessTokenKeys(keys, correlationId, schemaVersion = CREDENTIAL_SCHEMA_VERSION) {
         this.logger.trace("removeAccessTokenKey called");
-        const tokenKeys = this.getTokenKeys();
+        const tokenKeys = this.getTokenKeys(schemaVersion);
         let keysRemoved = 0;
         keys.forEach((key) => {
             const accessRemoval = tokenKeys.accessToken.indexOf(key);
@@ -316,7 +457,7 @@ class BrowserCacheManager extends CacheManager {
         });
         if (keysRemoved > 0) {
             this.logger.info(`removed ${keysRemoved} accessToken keys from tokenKeys map`);
-            this.setTokenKeys(tokenKeys, correlationId);
+            this.setTokenKeys(tokenKeys, correlationId, schemaVersion);
             return;
         }
     }
@@ -338,8 +479,8 @@ class BrowserCacheManager extends CacheManager {
      * Gets the keys for the cached tokens associated with this clientId
      * @returns
      */
-    getTokenKeys() {
-        return getTokenKeys(this.clientId, this.browserStorage);
+    getTokenKeys(schemaVersion = CREDENTIAL_SCHEMA_VERSION) {
+        return getTokenKeys(this.clientId, this.browserStorage, schemaVersion);
     }
     /**
      * Stores the token keys in the cache
@@ -347,16 +488,16 @@ class BrowserCacheManager extends CacheManager {
      * @param correlationId
      * @returns
      */
-    setTokenKeys(tokenKeys, correlationId) {
+    setTokenKeys(tokenKeys, correlationId, schemaVersion = CREDENTIAL_SCHEMA_VERSION) {
         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}`);
+            this.removeItem(getTokenKeysCacheKey(this.clientId, schemaVersion));
             return;
         }
         else {
-            this.setItem(`${StaticCacheKeys.TOKEN_KEYS}.${this.clientId}`, JSON.stringify(tokenKeys), correlationId);
+            this.setItem(getTokenKeysCacheKey(this.clientId, schemaVersion), JSON.stringify(tokenKeys), correlationId);
         }
     }
     /**
@@ -384,7 +525,7 @@ class BrowserCacheManager extends CacheManager {
      */
     async setIdTokenCredential(idToken, correlationId) {
         this.logger.trace("BrowserCacheManager.setIdTokenCredential called");
-        const idTokenKey = CacheHelpers.generateCredentialKey(idToken);
+        const idTokenKey = this.generateCredentialKey(idToken);
         const timestamp = Date.now().toString();
         idToken.lastUpdatedAt = timestamp;
         await this.setUserData(idTokenKey, JSON.stringify(idToken), correlationId, timestamp);
@@ -421,7 +562,7 @@ class BrowserCacheManager extends CacheManager {
      */
     async setAccessTokenCredential(accessToken, correlationId) {
         this.logger.trace("BrowserCacheManager.setAccessTokenCredential called");
-        const accessTokenKey = CacheHelpers.generateCredentialKey(accessToken);
+        const accessTokenKey = this.generateCredentialKey(accessToken);
         const timestamp = Date.now().toString();
         accessToken.lastUpdatedAt = timestamp;
         await this.setUserData(accessTokenKey, JSON.stringify(accessToken), correlationId, timestamp);
@@ -460,7 +601,7 @@ class BrowserCacheManager extends CacheManager {
      */
     async setRefreshTokenCredential(refreshToken, correlationId) {
         this.logger.trace("BrowserCacheManager.setRefreshTokenCredential called");
-        const refreshTokenKey = CacheHelpers.generateCredentialKey(refreshToken);
+        const refreshTokenKey = this.generateCredentialKey(refreshToken);
         const timestamp = Date.now().toString();
         refreshToken.lastUpdatedAt = timestamp;
         await this.setUserData(refreshTokenKey, JSON.stringify(refreshToken), correlationId, timestamp);
@@ -732,14 +873,14 @@ class BrowserCacheManager extends CacheManager {
         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 ||
+            if (cacheKey.indexOf(PREFIX) !== -1 ||
                 cacheKey.indexOf(this.clientId) !== -1) {
                 this.removeTemporaryItem(cacheKey);
             }
         });
         // Removes all remaining MSAL cache items
         this.browserStorage.getKeys().forEach((cacheKey) => {
-            if (cacheKey.indexOf(Constants.CACHE_PREFIX) !== -1 ||
+            if (cacheKey.indexOf(PREFIX) !== -1 ||
                 cacheKey.indexOf(this.clientId) !== -1) {
                 this.browserStorage.removeItem(cacheKey);
             }
@@ -771,19 +912,60 @@ class BrowserCacheManager extends CacheManager {
         }
     }
     /**
-     * Prepend msal.<client-id> to each key; Skip for any JSON object as Key (defined schemas do not need the key appended: AccessToken Keys or the upcoming schema)
+     * Prepend msal.<client-id> to each key
      * @param key
      * @param addInstanceId
      */
     generateCacheKey(key) {
-        const generatedKey = this.validateAndParseJson(key);
-        if (!generatedKey) {
-            if (StringUtils.startsWith(key, Constants.CACHE_PREFIX)) {
-                return key;
-            }
-            return `${Constants.CACHE_PREFIX}.${this.clientId}.${key}`;
+        if (StringUtils.startsWith(key, PREFIX)) {
+            return key;
         }
-        return JSON.stringify(key);
+        return `${PREFIX}.${this.clientId}.${key}`;
+    }
+    /**
+     * Cache Key: msal.<schema_version>-<home_account_id>-<environment>-<credential_type>-<client_id or familyId>-<realm>-<scopes>-<claims hash>-<scheme>
+     * IdToken Example: uid.utid-login.microsoftonline.com-idtoken-app_client_id-contoso.com
+     * AccessToken Example: uid.utid-login.microsoftonline.com-accesstoken-app_client_id-contoso.com-scope1 scope2--pop
+     * RefreshToken Example: uid.utid-login.microsoftonline.com-refreshtoken-1-contoso.com
+     * @param credentialEntity
+     * @returns
+     */
+    generateCredentialKey(credential) {
+        const familyId = (credential.credentialType === CredentialType.REFRESH_TOKEN &&
+            credential.familyId) ||
+            credential.clientId;
+        const scheme = credential.tokenType &&
+            credential.tokenType.toLowerCase() !==
+                AuthenticationScheme.BEARER.toLowerCase()
+            ? credential.tokenType.toLowerCase()
+            : "";
+        const credentialKey = [
+            `${PREFIX}.${CREDENTIAL_SCHEMA_VERSION}`,
+            credential.homeAccountId,
+            credential.environment,
+            credential.credentialType,
+            familyId,
+            credential.realm || "",
+            credential.target || "",
+            credential.requestedClaimsHash || "",
+            scheme,
+        ];
+        return credentialKey.join(CACHE_KEY_SEPARATOR).toLowerCase();
+    }
+    /**
+     * Cache Key: msal.<schema_version>.<home_account_id>.<environment>.<tenant_id>
+     * @param account
+     * @returns
+     */
+    generateAccountKey(account) {
+        const homeTenantId = account.homeAccountId.split(".")[1];
+        const accountKey = [
+            `${PREFIX}.${ACCOUNT_SCHEMA_VERSION}`,
+            account.homeAccountId,
+            account.environment,
+            homeTenantId || account.tenantId || "",
+        ];
+        return accountKey.join(CACHE_KEY_SEPARATOR).toLowerCase();
     }
     /**
      * Reset all temporary cache items
@@ -860,7 +1042,7 @@ class BrowserCacheManager extends CacheManager {
         }
     }
     getInteractionInProgress() {
-        const key = `${Constants.CACHE_PREFIX}.${TemporaryCacheKeys.INTERACTION_STATUS_KEY}`;
+        const key = `${PREFIX}.${TemporaryCacheKeys.INTERACTION_STATUS_KEY}`;
         const value = this.getTemporaryCache(key, false);
         try {
             return value ? JSON.parse(value) : null;
@@ -876,7 +1058,7 @@ class BrowserCacheManager extends CacheManager {
     }
     setInteractionInProgress(inProgress, type = INTERACTION_TYPE.SIGNIN) {
         // Ensure we don't overwrite interaction in progress for a different clientId
-        const key = `${Constants.CACHE_PREFIX}.${TemporaryCacheKeys.INTERACTION_STATUS_KEY}`;
+        const key = `${PREFIX}.${TemporaryCacheKeys.INTERACTION_STATUS_KEY}`;
         if (inProgress) {
             if (this.getInteractionInProgress()) {
                 throw createBrowserAuthError(interactionInProgress);
@@ -976,6 +1158,7 @@ function getStorageImplementation(clientId, cacheLocation, logger, performanceCl
 const DEFAULT_BROWSER_CACHE_MANAGER = (clientId, logger, performanceClient, eventHandler) => {
     const cacheOptions = {
         cacheLocation: BrowserCacheLocation.MemoryStorage,
+        cacheRetentionDays: 5,
         temporaryCacheLocation: BrowserCacheLocation.MemoryStorage,
         storeAuthStateInCookie: false,
         secureCookies: false,