@azure/msal-common 11.0.0 → 12.0.0

package/dist/index.cjs.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-common v11.0.0 2023-03-07 */
+/*! @azure/msal-common v12.0.0 2023-04-03 */
 'use strict';
 'use strict';
 
@@ -351,22 +351,6 @@ exports.CredentialType = void 0;
     CredentialType["ACCESS_TOKEN_WITH_AUTH_SCHEME"] = "AccessToken_With_AuthScheme";
     CredentialType["REFRESH_TOKEN"] = "RefreshToken";
 })(exports.CredentialType || (exports.CredentialType = {}));
-/**
- * Credential Type stored in the cache
- */
-exports.CacheSchemaType = void 0;
-(function (CacheSchemaType) {
-    CacheSchemaType["ACCOUNT"] = "Account";
-    CacheSchemaType["CREDENTIAL"] = "Credential";
-    CacheSchemaType["ID_TOKEN"] = "IdToken";
-    CacheSchemaType["ACCESS_TOKEN"] = "AccessToken";
-    CacheSchemaType["REFRESH_TOKEN"] = "RefreshToken";
-    CacheSchemaType["APP_METADATA"] = "AppMetadata";
-    CacheSchemaType["TEMPORARY"] = "TempCache";
-    CacheSchemaType["TELEMETRY"] = "Telemetry";
-    CacheSchemaType["UNDEFINED"] = "Undefined";
-    CacheSchemaType["THROTTLING"] = "Throttling";
-})(exports.CacheSchemaType || (exports.CacheSchemaType = {}));
 /**
  * Combine all cache types
  */
@@ -1443,7 +1427,7 @@ var Logger = /** @class */ (function () {
 
 /* eslint-disable header/header */
 var name = "@azure/msal-common";
-var version = "11.0.0";
+var version = "12.0.0";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1465,181 +1449,6 @@ exports.AzureCloudInstance = void 0;
     AzureCloudInstance["AzureUsGovernment"] = "https://login.microsoftonline.us";
 })(exports.AzureCloudInstance || (exports.AzureCloudInstance = {}));
 
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-/**
- * Base type for credentials to be stored in the cache: eg: ACCESS_TOKEN, ID_TOKEN etc
- *
- * Key:Value Schema:
- *
- * Key: <home_account_id*>-<environment>-<credential_type>-<client_id>-<realm*>-<target*>-<requestedClaims*>-<scheme*>
- *
- * Value Schema:
- * {
- *      homeAccountId: home account identifier for the auth scheme,
- *      environment: entity that issued the token, represented as a full host
- *      credentialType: Type of credential as a string, can be one of the following: RefreshToken, AccessToken, IdToken, Password, Cookie, Certificate, Other
- *      clientId: client ID of the application
- *      secret: Actual credential as a string
- *      familyId: Family ID identifier, usually only used for refresh tokens
- *      realm: Full tenant or organizational identifier that the account belongs to
- *      target: Permissions that are included in the token, or for refresh tokens, the resource identifier.
- *      tokenType: Matches the authentication scheme for which the token was issued (i.e. Bearer or pop)
- *      requestedClaimsHash: Matches the SHA 256 hash of the claims object included in the token request
- *      userAssertionHash: Matches the SHA 256 hash of the obo_assertion for the OBO flow
- * }
- */
-var CredentialEntity = /** @class */ (function () {
-    function CredentialEntity() {
-    }
-    /**
-     * Initializes a map with credential {CredentialType} regular expressions.
-     */
-    CredentialEntity._initRegex = function () {
-        var separator = Separators.CACHE_KEY_SEPARATOR;
-        CredentialEntity.credentialRegexMap = new Map();
-        for (var _i = 0, _a = Object.keys(exports.CredentialType); _i < _a.length; _i++) {
-            var credKey = _a[_i];
-            var credVal = exports.CredentialType[credKey].toLowerCase();
-            try {
-                // Verify credential type is preceded by a valid host name (environment) using lookbehind
-                CredentialEntity.credentialRegexMap.set(exports.CredentialType[credKey], new RegExp("(?<=" + separator + CredentialEntity.credentialDomainRegex + ")" + separator + credVal + separator));
-            }
-            catch (err) {
-                // Lookbehind is not supported (Safari or older versions of IE) - removing it
-                CredentialEntity.credentialRegexMap.set(exports.CredentialType[credKey], new RegExp("" + separator + CredentialEntity.credentialDomainRegex + separator + credVal + separator));
-            }
-        }
-    };
-    /**
-     * Generate Account Id key component as per the schema: <home_account_id>-<environment>
-     */
-    CredentialEntity.prototype.generateAccountId = function () {
-        return CredentialEntity.generateAccountIdForCacheKey(this.homeAccountId, this.environment);
-    };
-    /**
-     * Generate Credential Id key component as per the schema: <credential_type>-<client_id>-<realm>
-     */
-    CredentialEntity.prototype.generateCredentialId = function () {
-        return CredentialEntity.generateCredentialIdForCacheKey(this.credentialType, this.clientId, this.realm, this.familyId);
-    };
-    /**
-     * Generate target key component as per schema: <target>
-     */
-    CredentialEntity.prototype.generateTarget = function () {
-        return CredentialEntity.generateTargetForCacheKey(this.target);
-    };
-    /**
-     * generates credential key
-     */
-    CredentialEntity.prototype.generateCredentialKey = function () {
-        return CredentialEntity.generateCredentialCacheKey(this.homeAccountId, this.environment, this.credentialType, this.clientId, this.realm, this.target, this.familyId, this.tokenType, this.requestedClaimsHash);
-    };
-    /**
-     * returns the type of the cache (in this case credential)
-     */
-    CredentialEntity.prototype.generateType = function () {
-        switch (this.credentialType) {
-            case exports.CredentialType.ID_TOKEN:
-                return exports.CacheType.ID_TOKEN;
-            case exports.CredentialType.ACCESS_TOKEN:
-            case exports.CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME:
-                return exports.CacheType.ACCESS_TOKEN;
-            case exports.CredentialType.REFRESH_TOKEN:
-                return exports.CacheType.REFRESH_TOKEN;
-            default: {
-                throw ClientAuthError.createUnexpectedCredentialTypeError();
-            }
-        }
-    };
-    /**
-     * helper function to return `CredentialType`
-     * @param key
-     */
-    CredentialEntity.getCredentialType = function (key) {
-        var _a;
-        for (var _i = 0, _b = Object.keys(exports.CredentialType); _i < _b.length; _i++) {
-            var credKey = _b[_i];
-            if ((_a = this.credentialRegexMap.get(exports.CredentialType[credKey])) === null || _a === void 0 ? void 0 : _a.test(key.toLowerCase())) {
-                return exports.CredentialType[credKey];
-            }
-        }
-        return Constants.NOT_DEFINED;
-    };
-    /**
-     * generates credential key
-     * <home_account_id*>-\<environment>-<credential_type>-<client_id>-<realm\*>-<target\*>-<scheme\*>
-     */
-    CredentialEntity.generateCredentialCacheKey = function (homeAccountId, environment, credentialType, clientId, realm, target, familyId, tokenType, requestedClaimsHash) {
-        var credentialKey = [
-            this.generateAccountIdForCacheKey(homeAccountId, environment),
-            this.generateCredentialIdForCacheKey(credentialType, clientId, realm, familyId),
-            this.generateTargetForCacheKey(target),
-            this.generateClaimsHashForCacheKey(requestedClaimsHash),
-            this.generateSchemeForCacheKey(tokenType)
-        ];
-        return credentialKey.join(Separators.CACHE_KEY_SEPARATOR).toLowerCase();
-    };
-    /**
-     * generates Account Id for keys
-     * @param homeAccountId
-     * @param environment
-     */
-    CredentialEntity.generateAccountIdForCacheKey = function (homeAccountId, environment) {
-        var accountId = [homeAccountId, environment];
-        return accountId.join(Separators.CACHE_KEY_SEPARATOR).toLowerCase();
-    };
-    /**
-     * Generates Credential Id for keys
-     * @param credentialType
-     * @param realm
-     * @param clientId
-     * @param familyId
-     */
-    CredentialEntity.generateCredentialIdForCacheKey = function (credentialType, clientId, realm, familyId) {
-        var clientOrFamilyId = credentialType === exports.CredentialType.REFRESH_TOKEN
-            ? familyId || clientId
-            : clientId;
-        var credentialId = [
-            credentialType,
-            clientOrFamilyId,
-            realm || Constants.EMPTY_STRING,
-        ];
-        return credentialId.join(Separators.CACHE_KEY_SEPARATOR).toLowerCase();
-    };
-    /**
-     * Generate target key component as per schema: <target>
-     */
-    CredentialEntity.generateTargetForCacheKey = function (scopes) {
-        return (scopes || Constants.EMPTY_STRING).toLowerCase();
-    };
-    /**
-     * Generate requested claims key component as per schema: <requestedClaims>
-     */
-    CredentialEntity.generateClaimsHashForCacheKey = function (requestedClaimsHash) {
-        return (requestedClaimsHash || Constants.EMPTY_STRING).toLowerCase();
-    };
-    /**
-     * Generate scheme key componenet as per schema: <scheme>
-     */
-    CredentialEntity.generateSchemeForCacheKey = function (tokenType) {
-        /*
-         * PoP Tokens and SSH certs include scheme in cache key
-         * Cast to lowercase to handle "bearer" from ADFS
-         */
-        return (tokenType && tokenType.toLowerCase() !== exports.AuthenticationScheme.BEARER.toLowerCase()) ? tokenType.toLowerCase() : Constants.EMPTY_STRING;
-    };
-    /*
-     * Match host names like "login.microsoftonline.com", "https://accounts.google.com:4000", https://localhost:5000,
-     * "login.microsoftonline.com/common", "login.microsoftonline.com:4000/common", etc
-     */
-    CredentialEntity.credentialDomainRegex = "(https?:\\/\\/)?((([\\w-]+\\.)*([\\w-]{1,63})(\\.(\\w{2,63})))|(localhost))(\\:[0-9]{4,5})?(\\/[\\w-]+)?";
-    return CredentialEntity;
-}());
-CredentialEntity._initRegex();
-
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1924,6 +1733,21 @@ var ScopeSet = /** @class */ (function () {
         var inputScopes = scopeString.split(" ");
         return new ScopeSet(inputScopes);
     };
+    /**
+     * Creates the set of scopes to search for in cache lookups
+     * @param inputScopeString
+     * @returns
+     */
+    ScopeSet.createSearchScopes = function (inputScopeString) {
+        var scopeSet = new ScopeSet(inputScopeString);
+        if (!scopeSet.containsOnlyOIDCScopes()) {
+            scopeSet.removeOIDCScopes();
+        }
+        else {
+            scopeSet.removeScope(Constants.OFFLINE_ACCESS_SCOPE);
+        }
+        return scopeSet;
+    };
     /**
      * Used to validate the scopes input parameter requested  by the developer.
      * @param {Array<string>} inputScopes - Developer requested permissions. Not all scopes are guaranteed to be included in the access token returned.
@@ -2420,35 +2244,59 @@ var AuthToken = /** @class */ (function () {
  * Interface class which implement cache storage functions used by MSAL to perform validity checks, and store tokens.
  */
 var CacheManager = /** @class */ (function () {
-    function CacheManager(clientId, cryptoImpl) {
+    function CacheManager(clientId, cryptoImpl, logger) {
         this.clientId = clientId;
         this.cryptoImpl = cryptoImpl;
+        this.commonLogger = logger.clone(name, version);
     }
     /**
      * Returns all accounts in cache
      */
     CacheManager.prototype.getAllAccounts = function () {
         var _this = this;
-        var currentAccounts = this.getAccountsFilteredBy();
-        var accountValues = Object.keys(currentAccounts).map(function (accountKey) { return currentAccounts[accountKey]; });
-        var numAccounts = accountValues.length;
-        if (numAccounts < 1) {
+        var allAccountKeys = this.getAccountKeys();
+        if (allAccountKeys.length < 1) {
+            return [];
+        }
+        var accountEntities = allAccountKeys.reduce(function (accounts, key) {
+            var entity = _this.getAccount(key);
+            if (!entity) {
+                return accounts;
+            }
+            accounts.push(entity);
+            return accounts;
+        }, []);
+        if (accountEntities.length < 1) {
             return [];
         }
         else {
-            var allAccounts = accountValues.map(function (value) {
-                var accountEntity = CacheManager.toObject(new AccountEntity(), value);
-                var accountInfo = accountEntity.getAccountInfo();
-                var idToken = _this.readIdTokenFromCache(_this.clientId, accountInfo);
-                if (idToken && !accountInfo.idTokenClaims) {
-                    accountInfo.idToken = idToken.secret;
-                    accountInfo.idTokenClaims = new AuthToken(idToken.secret, _this.cryptoImpl).claims;
-                }
-                return accountInfo;
+            var allAccounts = accountEntities.map(function (accountEntity) {
+                return _this.getAccountInfoFromEntity(accountEntity);
             });
             return allAccounts;
         }
     };
+    /**
+     * Gets accountInfo object based on provided filters
+     */
+    CacheManager.prototype.getAccountInfoFilteredBy = function (accountFilter) {
+        var allAccounts = this.getAccountsFilteredBy(accountFilter);
+        if (allAccounts.length > 0) {
+            return this.getAccountInfoFromEntity(allAccounts[0]);
+        }
+        else {
+            return null;
+        }
+    };
+    CacheManager.prototype.getAccountInfoFromEntity = function (accountEntity) {
+        var accountInfo = accountEntity.getAccountInfo();
+        var idToken = this.getIdToken(accountInfo);
+        if (idToken) {
+            accountInfo.idToken = idToken.secret;
+            accountInfo.idTokenClaims = new AuthToken(idToken.secret, this.cryptoImpl).claims;
+        }
+        return accountInfo;
+    };
     /**
      * saves a cache record
      * @param cacheRecord
@@ -2490,12 +2338,12 @@ var CacheManager = /** @class */ (function () {
      */
     CacheManager.prototype.saveAccessToken = function (credential) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentTokenCache, currentScopes, currentAccessTokens, removedAccessTokens_1;
+            var accessTokenFilter, tokenKeys, currentScopes, removedAccessTokens;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        currentTokenCache = this.getCredentialsFilteredBy({
+                        accessTokenFilter = {
                             clientId: credential.clientId,
                             credentialType: credential.credentialType,
                             environment: credential.environment,
@@ -2503,22 +2351,25 @@ var CacheManager = /** @class */ (function () {
                             realm: credential.realm,
                             tokenType: credential.tokenType,
                             requestedClaimsHash: credential.requestedClaimsHash
-                        });
+                        };
+                        tokenKeys = this.getTokenKeys();
                         currentScopes = ScopeSet.fromString(credential.target);
-                        currentAccessTokens = Object.keys(currentTokenCache.accessTokens).map(function (key) { return currentTokenCache.accessTokens[key]; });
-                        if (!currentAccessTokens) return [3 /*break*/, 2];
-                        removedAccessTokens_1 = [];
-                        currentAccessTokens.forEach(function (tokenEntity) {
-                            var tokenScopeSet = ScopeSet.fromString(tokenEntity.target);
-                            if (tokenScopeSet.intersectingScopeSets(currentScopes)) {
-                                removedAccessTokens_1.push(_this.removeCredential(tokenEntity));
+                        removedAccessTokens = [];
+                        tokenKeys.accessToken.forEach(function (key) {
+                            if (!_this.accessTokenKeyMatchesFilter(key, accessTokenFilter, false)) {
+                                return;
+                            }
+                            var tokenEntity = _this.getAccessTokenCredential(key);
+                            if (tokenEntity && _this.credentialMatchesFilter(tokenEntity, accessTokenFilter)) {
+                                var tokenScopeSet = ScopeSet.fromString(tokenEntity.target);
+                                if (tokenScopeSet.intersectingScopeSets(currentScopes)) {
+                                    removedAccessTokens.push(_this.removeAccessToken(key));
+                                }
                             }
                         });
-                        return [4 /*yield*/, Promise.all(removedAccessTokens_1)];
+                        return [4 /*yield*/, Promise.all(removedAccessTokens)];
                     case 1:
                         _a.sent();
-                        _a.label = 2;
-                    case 2:
                         this.setAccessTokenCredential(credential);
                         return [2 /*return*/];
                 }
@@ -2533,149 +2384,151 @@ var CacheManager = /** @class */ (function () {
      * @param realm
      */
     CacheManager.prototype.getAccountsFilteredBy = function (accountFilter) {
-        return this.getAccountsFilteredByInternal(accountFilter ? accountFilter.homeAccountId : Constants.EMPTY_STRING, accountFilter ? accountFilter.environment : Constants.EMPTY_STRING, accountFilter ? accountFilter.realm : Constants.EMPTY_STRING, accountFilter ? accountFilter.nativeAccountId : Constants.EMPTY_STRING);
-    };
-    /**
-     * retrieve accounts matching all provided filters; if no filter is set, get all accounts
-     * not checking for casing as keys are all generated in lower case, remember to convert to lower case if object properties are compared
-     * @param homeAccountId
-     * @param environment
-     * @param realm
-     */
-    CacheManager.prototype.getAccountsFilteredByInternal = function (homeAccountId, environment, realm, nativeAccountId) {
         var _this = this;
-        var allCacheKeys = this.getKeys();
-        var matchingAccounts = {};
-        allCacheKeys.forEach(function (cacheKey) {
+        var allAccountKeys = this.getAccountKeys();
+        var matchingAccounts = [];
+        allAccountKeys.forEach(function (cacheKey) {
+            if (!_this.isAccountKey(cacheKey, accountFilter.homeAccountId, accountFilter.realm)) {
+                // Don't parse value if the key doesn't match the account filters
+                return;
+            }
             var entity = _this.getAccount(cacheKey);
             if (!entity) {
                 return;
             }
-            if (!!homeAccountId && !_this.matchHomeAccountId(entity, homeAccountId)) {
+            if (!!accountFilter.homeAccountId && !_this.matchHomeAccountId(entity, accountFilter.homeAccountId)) {
                 return;
             }
-            if (!!environment && !_this.matchEnvironment(entity, environment)) {
+            if (!!accountFilter.localAccountId && !_this.matchLocalAccountId(entity, accountFilter.localAccountId)) {
+                return;
+            }
+            if (!!accountFilter.username && !_this.matchUsername(entity, accountFilter.username)) {
                 return;
             }
-            if (!!realm && !_this.matchRealm(entity, realm)) {
+            if (!!accountFilter.environment && !_this.matchEnvironment(entity, accountFilter.environment)) {
                 return;
             }
-            if (!!nativeAccountId && !_this.matchNativeAccountId(entity, nativeAccountId)) {
+            if (!!accountFilter.realm && !_this.matchRealm(entity, accountFilter.realm)) {
                 return;
             }
-            matchingAccounts[cacheKey] = entity;
+            if (!!accountFilter.nativeAccountId && !_this.matchNativeAccountId(entity, accountFilter.nativeAccountId)) {
+                return;
+            }
+            matchingAccounts.push(entity);
         });
         return matchingAccounts;
     };
     /**
-     * retrieve credentails matching all provided filters; if no filter is set, get all credentials
+     * Returns true if the given key matches our account key schema. Also matches homeAccountId and/or tenantId if provided
+     * @param key
      * @param homeAccountId
-     * @param environment
-     * @param credentialType
-     * @param clientId
-     * @param realm
-     * @param target
+     * @param tenantId
+     * @returns
      */
-    CacheManager.prototype.getCredentialsFilteredBy = function (filter) {
-        return this.getCredentialsFilteredByInternal(filter.homeAccountId, filter.environment, filter.credentialType, filter.clientId, filter.familyId, filter.realm, filter.target, filter.userAssertionHash, filter.tokenType, filter.keyId, filter.requestedClaimsHash);
+    CacheManager.prototype.isAccountKey = function (key, homeAccountId, tenantId) {
+        if (key.split(Separators.CACHE_KEY_SEPARATOR).length < 3) {
+            // Account cache keys contain 3 items separated by '-' (each item may also contain '-')
+            return false;
+        }
+        if (homeAccountId && !key.toLowerCase().includes(homeAccountId.toLowerCase())) {
+            return false;
+        }
+        if (tenantId && !key.toLowerCase().includes(tenantId.toLowerCase())) {
+            return false;
+        }
+        // Do not check environment as aliasing can cause false negatives
+        return true;
     };
     /**
-     * Support function to help match credentials
-     * @param homeAccountId
-     * @param environment
-     * @param credentialType
-     * @param clientId
-     * @param realm
-     * @param target
-     * @param userAssertionHash
-     * @param tokenType
+     * Returns true if the given key matches our credential key schema.
+     * @param key
      */
-    CacheManager.prototype.getCredentialsFilteredByInternal = function (homeAccountId, environment, credentialType, clientId, familyId, realm, target, userAssertionHash, tokenType, keyId, requestedClaimsHash) {
-        var _this = this;
-        var allCacheKeys = this.getKeys();
-        var matchingCredentials = {
-            idTokens: {},
-            accessTokens: {},
-            refreshTokens: {},
-        };
-        allCacheKeys.forEach(function (cacheKey) {
-            // don't parse any non-credential type cache entities
-            var credType = CredentialEntity.getCredentialType(cacheKey);
-            if (credType === Constants.NOT_DEFINED) {
-                return;
-            }
-            // Attempt retrieval
-            var entity = _this.getSpecificCredential(cacheKey, credType);
-            if (!entity) {
-                return;
-            }
-            if (!!userAssertionHash && !_this.matchUserAssertionHash(entity, userAssertionHash)) {
-                return;
-            }
-            /*
-             * homeAccountId can undefined, and we want to filter out cached items that have a homeAccountId of ""
-             * because we don't want a client_credential request to return a cached token that has a homeAccountId
-             */
-            if ((typeof homeAccountId === "string") && !_this.matchHomeAccountId(entity, homeAccountId)) {
-                return;
-            }
-            if (!!environment && !_this.matchEnvironment(entity, environment)) {
-                return;
-            }
-            if (!!realm && !_this.matchRealm(entity, realm)) {
-                return;
-            }
-            if (!!credentialType && !_this.matchCredentialType(entity, credentialType)) {
-                return;
-            }
-            if (!!clientId && !_this.matchClientId(entity, clientId)) {
-                return;
+    CacheManager.prototype.isCredentialKey = function (key) {
+        if (key.split(Separators.CACHE_KEY_SEPARATOR).length < 6) {
+            // Credential cache keys contain 6 items separated by '-' (each item may also contain '-')
+            return false;
+        }
+        var lowerCaseKey = key.toLowerCase();
+        // Credential keys must indicate what credential type they represent
+        if (lowerCaseKey.indexOf(exports.CredentialType.ID_TOKEN.toLowerCase()) === -1 &&
+            lowerCaseKey.indexOf(exports.CredentialType.ACCESS_TOKEN.toLowerCase()) === -1 &&
+            lowerCaseKey.indexOf(exports.CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME.toLowerCase()) === -1 &&
+            lowerCaseKey.indexOf(exports.CredentialType.REFRESH_TOKEN.toLowerCase()) === -1) {
+            return false;
+        }
+        if (lowerCaseKey.indexOf(exports.CredentialType.REFRESH_TOKEN.toLowerCase()) > -1) {
+            // Refresh tokens must contain the client id or family id
+            var clientIdValidation = "" + exports.CredentialType.REFRESH_TOKEN + Separators.CACHE_KEY_SEPARATOR + this.clientId + Separators.CACHE_KEY_SEPARATOR;
+            var familyIdValidation = "" + exports.CredentialType.REFRESH_TOKEN + Separators.CACHE_KEY_SEPARATOR + THE_FAMILY_ID + Separators.CACHE_KEY_SEPARATOR;
+            if (lowerCaseKey.indexOf(clientIdValidation.toLowerCase()) === -1 && lowerCaseKey.indexOf(familyIdValidation.toLowerCase()) === -1) {
+                return false;
             }
-            if (!!familyId && !_this.matchFamilyId(entity, familyId)) {
-                return;
-            }
-            /*
-             * idTokens do not have "target", target specific refreshTokens do exist for some types of authentication
-             * Resource specific refresh tokens case will be added when the support is deemed necessary
-             */
-            if (!!target && !_this.matchTarget(entity, target)) {
-                return;
+        }
+        else if (lowerCaseKey.indexOf(this.clientId.toLowerCase()) === -1) {
+            // Tokens must contain the clientId
+            return false;
+        }
+        return true;
+    };
+    /**
+     * Returns whether or not the given credential entity matches the filter
+     * @param entity
+     * @param filter
+     * @returns
+     */
+    CacheManager.prototype.credentialMatchesFilter = function (entity, filter) {
+        if (!!filter.clientId && !this.matchClientId(entity, filter.clientId)) {
+            return false;
+        }
+        if (!!filter.userAssertionHash && !this.matchUserAssertionHash(entity, filter.userAssertionHash)) {
+            return false;
+        }
+        /*
+         * homeAccountId can be undefined, and we want to filter out cached items that have a homeAccountId of ""
+         * because we don't want a client_credential request to return a cached token that has a homeAccountId
+         */
+        if ((typeof filter.homeAccountId === "string") && !this.matchHomeAccountId(entity, filter.homeAccountId)) {
+            return false;
+        }
+        if (!!filter.environment && !this.matchEnvironment(entity, filter.environment)) {
+            return false;
+        }
+        if (!!filter.realm && !this.matchRealm(entity, filter.realm)) {
+            return false;
+        }
+        if (!!filter.credentialType && !this.matchCredentialType(entity, filter.credentialType)) {
+            return false;
+        }
+        if (!!filter.familyId && !this.matchFamilyId(entity, filter.familyId)) {
+            return false;
+        }
+        /*
+         * idTokens do not have "target", target specific refreshTokens do exist for some types of authentication
+         * Resource specific refresh tokens case will be added when the support is deemed necessary
+         */
+        if (!!filter.target && !this.matchTarget(entity, filter.target)) {
+            return false;
+        }
+        // If request OR cached entity has requested Claims Hash, check if they match
+        if (filter.requestedClaimsHash || entity.requestedClaimsHash) {
+            // Don't match if either is undefined or they are different
+            if (entity.requestedClaimsHash !== filter.requestedClaimsHash) {
+                return false;
             }
-            // If request OR cached entity has requested Claims Hash, check if they match
-            if (requestedClaimsHash || entity.requestedClaimsHash) {
-                // Don't match if either is undefined or they are different
-                if (entity.requestedClaimsHash !== requestedClaimsHash) {
-                    return;
-                }
+        }
+        // Access Token with Auth Scheme specific matching
+        if (entity.credentialType === exports.CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME) {
+            if (!!filter.tokenType && !this.matchTokenType(entity, filter.tokenType)) {
+                return false;
             }
-            // Access Token with Auth Scheme specific matching
-            if (credentialType === exports.CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME) {
-                if (!!tokenType && !_this.matchTokenType(entity, tokenType)) {
-                    return;
-                }
-                // KeyId (sshKid) in request must match cached SSH certificate keyId because SSH cert is bound to a specific key
-                if (tokenType === exports.AuthenticationScheme.SSH) {
-                    if (keyId && !_this.matchKeyId(entity, keyId)) {
-                        return;
-                    }
+            // KeyId (sshKid) in request must match cached SSH certificate keyId because SSH cert is bound to a specific key
+            if (filter.tokenType === exports.AuthenticationScheme.SSH) {
+                if (filter.keyId && !this.matchKeyId(entity, filter.keyId)) {
+                    return false;
                 }
             }
-            // At this point, the entity matches the request, update cache key if key schema has changed
-            var updatedCacheKey = _this.updateCredentialCacheKey(cacheKey, entity);
-            switch (credType) {
-                case exports.CredentialType.ID_TOKEN:
-                    matchingCredentials.idTokens[updatedCacheKey] = entity;
-                    break;
-                case exports.CredentialType.ACCESS_TOKEN:
-                case exports.CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME:
-                    matchingCredentials.accessTokens[updatedCacheKey] = entity;
-                    break;
-                case exports.CredentialType.REFRESH_TOKEN:
-                    matchingCredentials.refreshTokens[updatedCacheKey] = entity;
-                    break;
-            }
-        });
-        return matchingCredentials;
+        }
+        return true;
     };
     /**
      * retrieve appMetadata matching all provided filters; if no filter is set, get all appMetadata
@@ -2743,30 +2596,26 @@ var CacheManager = /** @class */ (function () {
      */
     CacheManager.prototype.removeAllAccounts = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var allCacheKeys, removedAccounts;
+            var allAccountKeys, removedAccounts;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        allCacheKeys = this.getKeys();
+                        allAccountKeys = this.getAccountKeys();
                         removedAccounts = [];
-                        allCacheKeys.forEach(function (cacheKey) {
-                            var entity = _this.getAccount(cacheKey);
-                            if (!entity) {
-                                return;
-                            }
+                        allAccountKeys.forEach(function (cacheKey) {
                             removedAccounts.push(_this.removeAccount(cacheKey));
                         });
                         return [4 /*yield*/, Promise.all(removedAccounts)];
                     case 1:
                         _a.sent();
-                        return [2 /*return*/, true];
+                        return [2 /*return*/];
                 }
             });
         });
     };
     /**
-     * returns a boolean if the given account is removed
+     * Removes the account and related tokens for a given account key
      * @param account
      */
     CacheManager.prototype.removeAccount = function (accountKey) {
@@ -2780,7 +2629,10 @@ var CacheManager = /** @class */ (function () {
                             throw ClientAuthError.createNoAccountFoundError();
                         }
                         return [4 /*yield*/, this.removeAccountContext(account)];
-                    case 1: return [2 /*return*/, ((_a.sent()) && this.removeItem(accountKey, exports.CacheSchemaType.ACCOUNT))];
+                    case 1:
+                        _a.sent();
+                        this.removeItem(accountKey);
+                        return [2 /*return*/];
                 }
             });
         });
@@ -2791,29 +2643,33 @@ var CacheManager = /** @class */ (function () {
      */
     CacheManager.prototype.removeAccountContext = function (account) {
         return __awaiter(this, void 0, void 0, function () {
-            var allCacheKeys, accountId, removedCredentials;
+            var allTokenKeys, accountId, removedCredentials;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        allCacheKeys = this.getKeys();
+                        allTokenKeys = this.getTokenKeys();
                         accountId = account.generateAccountId();
                         removedCredentials = [];
-                        allCacheKeys.forEach(function (cacheKey) {
-                            // don't parse any non-credential type cache entities
-                            var credType = CredentialEntity.getCredentialType(cacheKey);
-                            if (credType === Constants.NOT_DEFINED) {
-                                return;
+                        allTokenKeys.idToken.forEach(function (key) {
+                            if (key.indexOf(accountId) === 0) {
+                                _this.removeIdToken(key);
                             }
-                            var cacheEntity = _this.getSpecificCredential(cacheKey, credType);
-                            if (!!cacheEntity && accountId === cacheEntity.generateAccountId()) {
-                                removedCredentials.push(_this.removeCredential(cacheEntity));
+                        });
+                        allTokenKeys.accessToken.forEach(function (key) {
+                            if (key.indexOf(accountId) === 0) {
+                                removedCredentials.push(_this.removeAccessToken(key));
+                            }
+                        });
+                        allTokenKeys.refreshToken.forEach(function (key) {
+                            if (key.indexOf(accountId) === 0) {
+                                _this.removeRefreshToken(key);
                             }
                         });
                         return [4 /*yield*/, Promise.all(removedCredentials)];
                     case 1:
                         _a.sent();
-                        return [2 /*return*/, true];
+                        return [2 /*return*/];
                 }
             });
         });
@@ -2822,13 +2678,16 @@ var CacheManager = /** @class */ (function () {
      * returns a boolean if the given credential is removed
      * @param credential
      */
-    CacheManager.prototype.removeCredential = function (credential) {
+    CacheManager.prototype.removeAccessToken = function (key) {
         return __awaiter(this, void 0, void 0, function () {
-            var key, accessTokenWithAuthSchemeEntity, kid;
+            var credential, accessTokenWithAuthSchemeEntity, kid;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        key = credential.generateCredentialKey();
+                        credential = this.getAccessTokenCredential(key);
+                        if (!credential) {
+                            return [2 /*return*/];
+                        }
                         if (!(credential.credentialType.toLowerCase() === exports.CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME.toLowerCase())) return [3 /*break*/, 4];
                         if (!(credential.tokenType === exports.AuthenticationScheme.POP)) return [3 /*break*/, 4];
                         accessTokenWithAuthSchemeEntity = credential;
@@ -2844,7 +2703,7 @@ var CacheManager = /** @class */ (function () {
                     case 3:
                         _a.sent();
                         throw ClientAuthError.createBindingKeyNotRemovedError();
-                    case 4: return [2 /*return*/, this.removeItem(key, exports.CacheSchemaType.CREDENTIAL)];
+                    case 4: return [2 /*return*/, this.removeItem(key)];
                 }
             });
         });
@@ -2857,7 +2716,7 @@ var CacheManager = /** @class */ (function () {
         var allCacheKeys = this.getKeys();
         allCacheKeys.forEach(function (cacheKey) {
             if (_this.isAppMetadata(cacheKey)) {
-                _this.removeItem(cacheKey, exports.CacheSchemaType.APP_METADATA);
+                _this.removeItem(cacheKey);
             }
         });
         return true;
@@ -2870,12 +2729,13 @@ var CacheManager = /** @class */ (function () {
      * @param environment
      * @param authScheme
      */
-    CacheManager.prototype.readCacheRecord = function (account, clientId, request, environment) {
+    CacheManager.prototype.readCacheRecord = function (account, request, environment) {
+        var tokenKeys = this.getTokenKeys();
         var cachedAccount = this.readAccountFromCache(account);
-        var cachedIdToken = this.readIdTokenFromCache(clientId, account);
-        var cachedAccessToken = this.readAccessTokenFromCache(clientId, account, request);
-        var cachedRefreshToken = this.readRefreshTokenFromCache(clientId, account, false);
-        var cachedAppMetadata = this.readAppMetadataFromCache(environment, clientId);
+        var cachedIdToken = this.getIdToken(account, tokenKeys);
+        var cachedAccessToken = this.getAccessToken(account, request, tokenKeys);
+        var cachedRefreshToken = this.getRefreshToken(account, false, tokenKeys);
+        var cachedAppMetadata = this.readAppMetadataFromCache(environment);
         if (cachedAccount && cachedIdToken) {
             cachedAccount.idTokenClaims = new AuthToken(cachedIdToken.secret, this.cryptoImpl).claims;
         }
@@ -2895,51 +2755,83 @@ var CacheManager = /** @class */ (function () {
         var accountKey = AccountEntity.generateAccountCacheKey(account);
         return this.getAccount(accountKey);
     };
-    /**
-     * Retrieve AccountEntity from cache
-     * @param nativeAccountId
-     * @returns AccountEntity or Null
-     */
-    CacheManager.prototype.readAccountFromCacheWithNativeAccountId = function (nativeAccountId) {
-        // fetch account from memory
-        var accountFilter = {
-            nativeAccountId: nativeAccountId
-        };
-        var accountCache = this.getAccountsFilteredBy(accountFilter);
-        var accounts = Object.keys(accountCache).map(function (key) { return accountCache[key]; });
-        if (accounts.length < 1) {
-            return null;
-        }
-        else if (accounts.length > 1) {
-            throw ClientAuthError.createMultipleMatchingAccountsInCacheError();
-        }
-        return accounts[0];
-    };
     /**
      * Retrieve IdTokenEntity from cache
      * @param clientId
      * @param account
      * @param inputRealm
      */
-    CacheManager.prototype.readIdTokenFromCache = function (clientId, account) {
+    CacheManager.prototype.getIdToken = function (account, tokenKeys) {
+        this.commonLogger.trace("CacheManager - getIdToken called");
         var idTokenFilter = {
             homeAccountId: account.homeAccountId,
             environment: account.environment,
             credentialType: exports.CredentialType.ID_TOKEN,
-            clientId: clientId,
+            clientId: this.clientId,
             realm: account.tenantId,
         };
-        var credentialCache = this.getCredentialsFilteredBy(idTokenFilter);
-        var idTokens = Object.keys(credentialCache.idTokens).map(function (key) { return credentialCache.idTokens[key]; });
+        var idTokens = this.getIdTokensByFilter(idTokenFilter, tokenKeys);
         var numIdTokens = idTokens.length;
         if (numIdTokens < 1) {
+            this.commonLogger.info("CacheManager:getIdToken - No token found");
             return null;
         }
         else if (numIdTokens > 1) {
             throw ClientAuthError.createMultipleMatchingTokensInCacheError();
         }
+        this.commonLogger.info("CacheManager:getIdToken - Returning id token");
         return idTokens[0];
     };
+    /**
+     * Gets all idTokens matching the given filter
+     * @param filter
+     * @returns
+     */
+    CacheManager.prototype.getIdTokensByFilter = function (filter, tokenKeys) {
+        var _this = this;
+        var idTokenKeys = tokenKeys && tokenKeys.idToken || this.getTokenKeys().idToken;
+        var idTokens = [];
+        idTokenKeys.forEach(function (key) {
+            if (!_this.idTokenKeyMatchesFilter(key, __assign({ clientId: _this.clientId }, filter))) {
+                return;
+            }
+            var idToken = _this.getIdTokenCredential(key);
+            if (idToken && _this.credentialMatchesFilter(idToken, filter)) {
+                idTokens.push(idToken);
+            }
+        });
+        return idTokens;
+    };
+    /**
+     * Validate the cache key against filter before retrieving and parsing cache value
+     * @param key
+     * @param filter
+     * @returns
+     */
+    CacheManager.prototype.idTokenKeyMatchesFilter = function (inputKey, filter) {
+        var key = inputKey.toLowerCase();
+        if (filter.clientId && key.indexOf(filter.clientId.toLowerCase()) === -1) {
+            return false;
+        }
+        if (filter.homeAccountId && key.indexOf(filter.homeAccountId.toLowerCase()) === -1) {
+            return false;
+        }
+        return true;
+    };
+    /**
+     * Removes idToken from the cache
+     * @param key
+     */
+    CacheManager.prototype.removeIdToken = function (key) {
+        this.removeItem(key);
+    };
+    /**
+     * Removes refresh token from the cache
+     * @param key
+     */
+    CacheManager.prototype.removeRefreshToken = function (key) {
+        this.removeItem(key);
+    };
     /**
      * Retrieve AccessTokenEntity from cache
      * @param clientId
@@ -2947,8 +2839,10 @@ var CacheManager = /** @class */ (function () {
      * @param scopes
      * @param authScheme
      */
-    CacheManager.prototype.readAccessTokenFromCache = function (clientId, account, request) {
-        var scopes = new ScopeSet(request.scopes || []);
+    CacheManager.prototype.getAccessToken = function (account, request, tokenKeys) {
+        var _this = this;
+        this.commonLogger.trace("CacheManager - getAccessToken called");
+        var scopes = ScopeSet.createSearchScopes(request.scopes);
         var authScheme = request.authenticationScheme || exports.AuthenticationScheme.BEARER;
         /*
          * Distinguish between Bearer and PoP/SSH token cache types
@@ -2959,55 +2853,156 @@ var CacheManager = /** @class */ (function () {
             homeAccountId: account.homeAccountId,
             environment: account.environment,
             credentialType: credentialType,
-            clientId: clientId,
+            clientId: this.clientId,
             realm: account.tenantId,
-            target: scopes.printScopesLowerCase(),
+            target: scopes,
             tokenType: authScheme,
             keyId: request.sshKid,
             requestedClaimsHash: request.requestedClaimsHash,
         };
-        var credentialCache = this.getCredentialsFilteredBy(accessTokenFilter);
-        var accessTokens = Object.keys(credentialCache.accessTokens).map(function (key) { return credentialCache.accessTokens[key]; });
+        var accessTokenKeys = tokenKeys && tokenKeys.accessToken || this.getTokenKeys().accessToken;
+        var accessTokens = [];
+        accessTokenKeys.forEach(function (key) {
+            // Validate key
+            if (_this.accessTokenKeyMatchesFilter(key, accessTokenFilter, true)) {
+                var accessToken = _this.getAccessTokenCredential(key);
+                // Validate value
+                if (accessToken && _this.credentialMatchesFilter(accessToken, accessTokenFilter)) {
+                    accessTokens.push(accessToken);
+                }
+            }
+        });
         var numAccessTokens = accessTokens.length;
         if (numAccessTokens < 1) {
+            this.commonLogger.info("CacheManager:getAccessToken - No token found");
             return null;
         }
         else if (numAccessTokens > 1) {
             throw ClientAuthError.createMultipleMatchingTokensInCacheError();
         }
+        this.commonLogger.info("CacheManager:getAccessToken - Returning access token");
         return accessTokens[0];
     };
+    /**
+     * Validate the cache key against filter before retrieving and parsing cache value
+     * @param key
+     * @param filter
+     * @param keyMustContainAllScopes
+     * @returns
+     */
+    CacheManager.prototype.accessTokenKeyMatchesFilter = function (inputKey, filter, keyMustContainAllScopes) {
+        var key = inputKey.toLowerCase();
+        if (filter.clientId && key.indexOf(filter.clientId.toLowerCase()) === -1) {
+            return false;
+        }
+        if (filter.homeAccountId && key.indexOf(filter.homeAccountId.toLowerCase()) === -1) {
+            return false;
+        }
+        if (filter.realm && key.indexOf(filter.realm.toLowerCase()) === -1) {
+            return false;
+        }
+        if (filter.requestedClaimsHash && key.indexOf(filter.requestedClaimsHash.toLowerCase()) === -1) {
+            return false;
+        }
+        if (filter.target) {
+            var scopes = filter.target.asArray();
+            for (var i = 0; i < scopes.length; i++) {
+                if (keyMustContainAllScopes && !key.includes(scopes[i].toLowerCase())) {
+                    // When performing a cache lookup a missing scope would be a cache miss
+                    return false;
+                }
+                else if (!keyMustContainAllScopes && key.includes(scopes[i].toLowerCase())) {
+                    // When performing a cache write, any token with a subset of requested scopes should be replaced
+                    return true;
+                }
+            }
+        }
+        return true;
+    };
+    /**
+     * Gets all access tokens matching the filter
+     * @param filter
+     * @returns
+     */
+    CacheManager.prototype.getAccessTokensByFilter = function (filter) {
+        var _this = this;
+        var tokenKeys = this.getTokenKeys();
+        var accessTokens = [];
+        tokenKeys.accessToken.forEach(function (key) {
+            if (!_this.accessTokenKeyMatchesFilter(key, filter, true)) {
+                return;
+            }
+            var accessToken = _this.getAccessTokenCredential(key);
+            if (accessToken && _this.credentialMatchesFilter(accessToken, filter)) {
+                accessTokens.push(accessToken);
+            }
+        });
+        return accessTokens;
+    };
     /**
      * Helper to retrieve the appropriate refresh token from cache
      * @param clientId
      * @param account
      * @param familyRT
      */
-    CacheManager.prototype.readRefreshTokenFromCache = function (clientId, account, familyRT) {
+    CacheManager.prototype.getRefreshToken = function (account, familyRT, tokenKeys) {
+        var _this = this;
+        this.commonLogger.trace("CacheManager - getRefreshToken called");
         var id = familyRT ? THE_FAMILY_ID : undefined;
         var refreshTokenFilter = {
             homeAccountId: account.homeAccountId,
             environment: account.environment,
             credentialType: exports.CredentialType.REFRESH_TOKEN,
-            clientId: clientId,
+            clientId: this.clientId,
             familyId: id,
         };
-        var credentialCache = this.getCredentialsFilteredBy(refreshTokenFilter);
-        var refreshTokens = Object.keys(credentialCache.refreshTokens).map(function (key) { return credentialCache.refreshTokens[key]; });
+        var refreshTokenKeys = tokenKeys && tokenKeys.refreshToken || this.getTokenKeys().refreshToken;
+        var refreshTokens = [];
+        refreshTokenKeys.forEach(function (key) {
+            // Validate key
+            if (_this.refreshTokenKeyMatchesFilter(key, refreshTokenFilter)) {
+                var refreshToken = _this.getRefreshTokenCredential(key);
+                // Validate value
+                if (refreshToken && _this.credentialMatchesFilter(refreshToken, refreshTokenFilter)) {
+                    refreshTokens.push(refreshToken);
+                }
+            }
+        });
         var numRefreshTokens = refreshTokens.length;
         if (numRefreshTokens < 1) {
+            this.commonLogger.info("CacheManager:getRefreshToken - No refresh token found.");
             return null;
         }
         // address the else case after remove functions address environment aliases
+        this.commonLogger.info("CacheManager:getRefreshToken - returning refresh token");
         return refreshTokens[0];
     };
+    /**
+     * Validate the cache key against filter before retrieving and parsing cache value
+     * @param key
+     * @param filter
+     */
+    CacheManager.prototype.refreshTokenKeyMatchesFilter = function (inputKey, filter) {
+        var key = inputKey.toLowerCase();
+        if (filter.familyId && key.indexOf(filter.familyId.toLowerCase()) === -1) {
+            return false;
+        }
+        // If familyId is used, clientId is not in the key
+        if (!filter.familyId && filter.clientId && key.indexOf(filter.clientId.toLowerCase()) === -1) {
+            return false;
+        }
+        if (filter.homeAccountId && key.indexOf(filter.homeAccountId.toLowerCase()) === -1) {
+            return false;
+        }
+        return true;
+    };
     /**
      * Retrieve AppMetadataEntity from cache
      */
-    CacheManager.prototype.readAppMetadataFromCache = function (environment, clientId) {
+    CacheManager.prototype.readAppMetadataFromCache = function (environment) {
         var appMetadataFilter = {
             environment: environment,
-            clientId: clientId,
+            clientId: this.clientId,
         };
         var appMetadata = this.getAppMetadataFilteredBy(appMetadataFilter);
         var appMetadataEntries = Object.keys(appMetadata).map(function (key) { return appMetadata[key]; });
@@ -3025,8 +3020,8 @@ var CacheManager = /** @class */ (function () {
      * @param environment
      * @param clientId
      */
-    CacheManager.prototype.isAppMetadataFOCI = function (environment, clientId) {
-        var appMetadata = this.readAppMetadataFromCache(environment, clientId);
+    CacheManager.prototype.isAppMetadataFOCI = function (environment) {
+        var appMetadata = this.readAppMetadataFromCache(environment);
         return !!(appMetadata && appMetadata.familyId === THE_FAMILY_ID);
     };
     /**
@@ -3037,6 +3032,24 @@ var CacheManager = /** @class */ (function () {
     CacheManager.prototype.matchHomeAccountId = function (entity, homeAccountId) {
         return !!((typeof entity.homeAccountId === "string") && (homeAccountId === entity.homeAccountId));
     };
+    /**
+     * helper to match account ids
+     * @param entity
+     * @param localAccountId
+     * @returns
+     */
+    CacheManager.prototype.matchLocalAccountId = function (entity, localAccountId) {
+        return !!((typeof entity.localAccountId === "string") && (localAccountId === entity.localAccountId));
+    };
+    /**
+     * helper to match usernames
+     * @param entity
+     * @param username
+     * @returns
+     */
+    CacheManager.prototype.matchUsername = function (entity, username) {
+        return !!((typeof entity.username === "string") && (username.toLowerCase() === entity.username.toLowerCase()));
+    };
     /**
      * helper to match assertion
      * @param value
@@ -3109,14 +3122,7 @@ var CacheManager = /** @class */ (function () {
             return false;
         }
         var entityScopeSet = ScopeSet.fromString(entity.target);
-        var requestTargetScopeSet = ScopeSet.fromString(target);
-        if (!requestTargetScopeSet.containsOnlyOIDCScopes()) {
-            requestTargetScopeSet.removeOIDCScopes(); // ignore OIDC scopes
-        }
-        else {
-            requestTargetScopeSet.removeScope(Constants.OFFLINE_ACCESS_SCOPE);
-        }
-        return entityScopeSet.containsScopeSet(requestTargetScopeSet);
+        return entityScopeSet.containsScopeSet(target);
     };
     /**
      * Returns true if the credential's tokenType or Authentication Scheme matches the one in the request, false otherwise
@@ -3154,27 +3160,6 @@ var CacheManager = /** @class */ (function () {
     CacheManager.prototype.generateAuthorityMetadataCacheKey = function (authority) {
         return AUTHORITY_METADATA_CONSTANTS.CACHE_KEY + "-" + this.clientId + "-" + authority;
     };
-    /**
-     * Returns the specific credential (IdToken/AccessToken/RefreshToken) from the cache
-     * @param key
-     * @param credType
-     */
-    CacheManager.prototype.getSpecificCredential = function (key, credType) {
-        switch (credType) {
-            case exports.CredentialType.ID_TOKEN: {
-                return this.getIdTokenCredential(key);
-            }
-            case exports.CredentialType.ACCESS_TOKEN:
-            case exports.CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME: {
-                return this.getAccessTokenCredential(key);
-            }
-            case exports.CredentialType.REFRESH_TOKEN: {
-                return this.getRefreshTokenCredential(key);
-            }
-            default:
-                return null;
-        }
-    };
     /**
      * Helper to convert serialized data to object
      * @param obj
@@ -3273,6 +3258,14 @@ var DefaultStorageClass = /** @class */ (function (_super) {
         var notImplErr = "Storage interface - getKeys() has not been implemented for the cacheStorage interface.";
         throw AuthError.createUnexpectedError(notImplErr);
     };
+    DefaultStorageClass.prototype.getAccountKeys = function () {
+        var notImplErr = "Storage interface - getAccountKeys() has not been implemented for the cacheStorage interface.";
+        throw AuthError.createUnexpectedError(notImplErr);
+    };
+    DefaultStorageClass.prototype.getTokenKeys = function () {
+        var notImplErr = "Storage interface - getTokenKeys() has not been implemented for the cacheStorage interface.";
+        throw AuthError.createUnexpectedError(notImplErr);
+    };
     DefaultStorageClass.prototype.clear = function () {
         return __awaiter(this, void 0, void 0, function () {
             var notImplErr;
@@ -3361,7 +3354,7 @@ function buildClientConfiguration(_a) {
         authOptions: buildAuthOptions(userAuthOptions),
         systemOptions: __assign(__assign({}, DEFAULT_SYSTEM_OPTIONS), userSystemOptions),
         loggerOptions: loggerOptions,
-        storageInterface: storageImplementation || new DefaultStorageClass(userAuthOptions.clientId, DEFAULT_CRYPTO_IMPLEMENTATION),
+        storageInterface: storageImplementation || new DefaultStorageClass(userAuthOptions.clientId, DEFAULT_CRYPTO_IMPLEMENTATION, new Logger(loggerOptions)),
         networkInterface: networkImplementation || DEFAULT_NETWORK_IMPLEMENTATION,
         cryptoInterface: cryptoImplementation || DEFAULT_CRYPTO_IMPLEMENTATION,
         clientCredentials: clientCredentials || DEFAULT_CLIENT_CREDENTIALS,
@@ -3423,7 +3416,7 @@ var ThrottlingUtils = /** @class */ (function () {
         var value = cacheManager.getThrottlingCache(key);
         if (value) {
             if (value.throttleTime < Date.now()) {
-                cacheManager.removeItem(key, exports.CacheSchemaType.THROTTLING);
+                cacheManager.removeItem(key);
                 return;
             }
             throw new ServerError(((_a = value.errorCodes) === null || _a === void 0 ? void 0 : _a.join(" ")) || Constants.EMPTY_STRING, value.errorMessage, value.subError);
@@ -3487,7 +3480,7 @@ var ThrottlingUtils = /** @class */ (function () {
             sshKid: request.sshKid
         };
         var key = this.generateThrottlingStorageKey(thumbprint);
-        return cacheManager.removeItem(key, exports.CacheSchemaType.THROTTLING);
+        cacheManager.removeItem(key);
     };
     return ThrottlingUtils;
 }());
@@ -4114,6 +4107,142 @@ var BaseClient = /** @class */ (function () {
     return BaseClient;
 }());
 
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+/**
+ * Base type for credentials to be stored in the cache: eg: ACCESS_TOKEN, ID_TOKEN etc
+ *
+ * Key:Value Schema:
+ *
+ * Key: <home_account_id*>-<environment>-<credential_type>-<client_id>-<realm*>-<target*>-<requestedClaims*>-<scheme*>
+ *
+ * Value Schema:
+ * {
+ *      homeAccountId: home account identifier for the auth scheme,
+ *      environment: entity that issued the token, represented as a full host
+ *      credentialType: Type of credential as a string, can be one of the following: RefreshToken, AccessToken, IdToken, Password, Cookie, Certificate, Other
+ *      clientId: client ID of the application
+ *      secret: Actual credential as a string
+ *      familyId: Family ID identifier, usually only used for refresh tokens
+ *      realm: Full tenant or organizational identifier that the account belongs to
+ *      target: Permissions that are included in the token, or for refresh tokens, the resource identifier.
+ *      tokenType: Matches the authentication scheme for which the token was issued (i.e. Bearer or pop)
+ *      requestedClaimsHash: Matches the SHA 256 hash of the claims object included in the token request
+ *      userAssertionHash: Matches the SHA 256 hash of the obo_assertion for the OBO flow
+ * }
+ */
+var CredentialEntity = /** @class */ (function () {
+    function CredentialEntity() {
+    }
+    /**
+     * Generate Account Id key component as per the schema: <home_account_id>-<environment>
+     */
+    CredentialEntity.prototype.generateAccountId = function () {
+        return CredentialEntity.generateAccountIdForCacheKey(this.homeAccountId, this.environment);
+    };
+    /**
+     * Generate Credential Id key component as per the schema: <credential_type>-<client_id>-<realm>
+     */
+    CredentialEntity.prototype.generateCredentialId = function () {
+        return CredentialEntity.generateCredentialIdForCacheKey(this.credentialType, this.clientId, this.realm, this.familyId);
+    };
+    /**
+     * Generate target key component as per schema: <target>
+     */
+    CredentialEntity.prototype.generateTarget = function () {
+        return CredentialEntity.generateTargetForCacheKey(this.target);
+    };
+    /**
+     * generates credential key
+     */
+    CredentialEntity.prototype.generateCredentialKey = function () {
+        return CredentialEntity.generateCredentialCacheKey(this.homeAccountId, this.environment, this.credentialType, this.clientId, this.realm, this.target, this.familyId, this.tokenType, this.requestedClaimsHash);
+    };
+    /**
+     * returns the type of the cache (in this case credential)
+     */
+    CredentialEntity.prototype.generateType = function () {
+        switch (this.credentialType) {
+            case exports.CredentialType.ID_TOKEN:
+                return exports.CacheType.ID_TOKEN;
+            case exports.CredentialType.ACCESS_TOKEN:
+            case exports.CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME:
+                return exports.CacheType.ACCESS_TOKEN;
+            case exports.CredentialType.REFRESH_TOKEN:
+                return exports.CacheType.REFRESH_TOKEN;
+            default: {
+                throw ClientAuthError.createUnexpectedCredentialTypeError();
+            }
+        }
+    };
+    /**
+     * generates credential key
+     * <home_account_id*>-\<environment>-<credential_type>-<client_id>-<realm\*>-<target\*>-<scheme\*>
+     */
+    CredentialEntity.generateCredentialCacheKey = function (homeAccountId, environment, credentialType, clientId, realm, target, familyId, tokenType, requestedClaimsHash) {
+        var credentialKey = [
+            this.generateAccountIdForCacheKey(homeAccountId, environment),
+            this.generateCredentialIdForCacheKey(credentialType, clientId, realm, familyId),
+            this.generateTargetForCacheKey(target),
+            this.generateClaimsHashForCacheKey(requestedClaimsHash),
+            this.generateSchemeForCacheKey(tokenType)
+        ];
+        return credentialKey.join(Separators.CACHE_KEY_SEPARATOR).toLowerCase();
+    };
+    /**
+     * generates Account Id for keys
+     * @param homeAccountId
+     * @param environment
+     */
+    CredentialEntity.generateAccountIdForCacheKey = function (homeAccountId, environment) {
+        var accountId = [homeAccountId, environment];
+        return accountId.join(Separators.CACHE_KEY_SEPARATOR).toLowerCase();
+    };
+    /**
+     * Generates Credential Id for keys
+     * @param credentialType
+     * @param realm
+     * @param clientId
+     * @param familyId
+     */
+    CredentialEntity.generateCredentialIdForCacheKey = function (credentialType, clientId, realm, familyId) {
+        var clientOrFamilyId = credentialType === exports.CredentialType.REFRESH_TOKEN
+            ? familyId || clientId
+            : clientId;
+        var credentialId = [
+            credentialType,
+            clientOrFamilyId,
+            realm || Constants.EMPTY_STRING,
+        ];
+        return credentialId.join(Separators.CACHE_KEY_SEPARATOR).toLowerCase();
+    };
+    /**
+     * Generate target key component as per schema: <target>
+     */
+    CredentialEntity.generateTargetForCacheKey = function (scopes) {
+        return (scopes || Constants.EMPTY_STRING).toLowerCase();
+    };
+    /**
+     * Generate requested claims key component as per schema: <requestedClaims>
+     */
+    CredentialEntity.generateClaimsHashForCacheKey = function (requestedClaimsHash) {
+        return (requestedClaimsHash || Constants.EMPTY_STRING).toLowerCase();
+    };
+    /**
+     * Generate scheme key componenet as per schema: <scheme>
+     */
+    CredentialEntity.generateSchemeForCacheKey = function (tokenType) {
+        /*
+         * PoP Tokens and SSH certs include scheme in cache key
+         * Cast to lowercase to handle "bearer" from ADFS
+         */
+        return (tokenType && tokenType.toLowerCase() !== exports.AuthenticationScheme.BEARER.toLowerCase()) ? tokenType.toLowerCase() : Constants.EMPTY_STRING;
+    };
+    return CredentialEntity;
+}());
+
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6307,7 +6436,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                 if (!request.account) {
                     throw ClientAuthError.createNoAccountInSilentRequestError();
                 }
-                isFOCI = this.cacheManager.isAppMetadataFOCI(request.account.environment, this.config.authOptions.clientId);
+                isFOCI = this.cacheManager.isAppMetadataFOCI(request.account.environment);
                 // if the app is part of the family, retrive a Family refresh token if present and make a refreshTokenRequest
                 if (isFOCI) {
                     try {
@@ -6346,7 +6475,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                 (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
                 atsMeasurement = (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.startMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
                 this.logger.verbose("RefreshTokenClientAcquireTokenWithCachedRefreshToken called", request.correlationId);
-                refreshToken = this.cacheManager.readRefreshTokenFromCache(this.config.authOptions.clientId, request.account, foci);
+                refreshToken = this.cacheManager.getRefreshToken(request.account, foci);
                 if (!refreshToken) {
                     atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.discardMeasurement();
                     throw InteractionRequiredAuthError.createNoTokensFoundError();
@@ -6573,7 +6702,6 @@ var ClientCredentialClient = /** @class */ (function (_super) {
     };
     /**
      * Reads access token from the cache
-     * TODO: Move this call to cacheManager instead
      */
     ClientCredentialClient.prototype.readAccessTokenFromCache = function () {
         var accessTokenFilter = {
@@ -6582,10 +6710,9 @@ var ClientCredentialClient = /** @class */ (function (_super) {
             credentialType: exports.CredentialType.ACCESS_TOKEN,
             clientId: this.config.authOptions.clientId,
             realm: this.authority.tenant,
-            target: this.scopeSet.printScopesLowerCase()
+            target: ScopeSet.createSearchScopes(this.scopeSet.asArray())
         };
-        var credentialCache = this.cacheManager.getCredentialsFilteredBy(accessTokenFilter);
-        var accessTokens = Object.keys(credentialCache.accessTokens).map(function (key) { return credentialCache.accessTokens[key]; });
+        var accessTokens = this.cacheManager.getAccessTokensByFilter(accessTokenFilter);
         if (accessTokens.length < 1) {
             return null;
         }
@@ -6766,7 +6893,7 @@ var OnBehalfOfClient = /** @class */ (function (_super) {
                             this.logger.info("OnbehalfofFlow:getCachedAuthenticationResult - Cached access token is expired or will expire within " + this.config.systemOptions.tokenRenewalOffsetSeconds + " seconds.");
                             throw ClientAuthError.createRefreshRequiredError();
                         }
-                        cachedIdToken = this.readIdTokenFromCacheForOBO(request, cachedAccessToken.homeAccountId);
+                        cachedIdToken = this.readIdTokenFromCacheForOBO(cachedAccessToken.homeAccountId);
                         cachedAccount = null;
                         if (cachedIdToken) {
                             idTokenObject = new AuthToken(cachedIdToken.secret, this.config.cryptoInterface);
@@ -6801,7 +6928,7 @@ var OnBehalfOfClient = /** @class */ (function (_super) {
      * Certain use cases of OBO flow do not expect an idToken in the cache/or from the service
      * @param request
      */
-    OnBehalfOfClient.prototype.readIdTokenFromCacheForOBO = function (request, atHomeAccountId) {
+    OnBehalfOfClient.prototype.readIdTokenFromCacheForOBO = function (atHomeAccountId) {
         var idTokenFilter = {
             homeAccountId: atHomeAccountId,
             environment: this.authority.canonicalAuthorityUrlComponents.HostNameAndPort,
@@ -6809,8 +6936,7 @@ var OnBehalfOfClient = /** @class */ (function (_super) {
             clientId: this.config.authOptions.clientId,
             realm: this.authority.tenant
         };
-        var credentialCache = this.cacheManager.getCredentialsFilteredBy(idTokenFilter);
-        var idTokens = Object.keys(credentialCache.idTokens).map(function (key) { return credentialCache.idTokens[key]; });
+        var idTokens = this.cacheManager.getIdTokensByFilter(idTokenFilter);
         // When acquiring a token on behalf of an application, there might not be an id token in the cache
         if (idTokens.length < 1) {
             return null;
@@ -6833,14 +6959,13 @@ var OnBehalfOfClient = /** @class */ (function (_super) {
         var accessTokenFilter = {
             credentialType: credentialType,
             clientId: clientId,
-            target: this.scopeSet.printScopesLowerCase(),
+            target: ScopeSet.createSearchScopes(this.scopeSet.asArray()),
             tokenType: authScheme,
             keyId: request.sshKid,
             requestedClaimsHash: request.requestedClaimsHash,
             userAssertionHash: this.userAssertionHash
         };
-        var credentialCache = this.cacheManager.getCredentialsFilteredBy(accessTokenFilter);
-        var accessTokens = Object.keys(credentialCache.accessTokens).map(function (key) { return credentialCache.accessTokens[key]; });
+        var accessTokens = this.cacheManager.getAccessTokensByFilter(accessTokenFilter);
         var numAccessTokens = accessTokens.length;
         if (numAccessTokens < 1) {
             return null;
@@ -6989,7 +7114,7 @@ var SilentFlowClient = /** @class */ (function (_super) {
                             throw ClientAuthError.createNoAccountInSilentRequestError();
                         }
                         environment = request.authority || this.authority.getPreferredCache();
-                        cacheRecord = this.cacheManager.readCacheRecord(request.account, this.config.authOptions.clientId, request, environment);
+                        cacheRecord = this.cacheManager.readCacheRecord(request.account, request, environment);
                         if (!cacheRecord.accessToken) {
                             // Must refresh due to non-existent access_token.
                             (_b = this.serverTelemetryManager) === null || _b === void 0 ? void 0 : _b.setCacheOutcome(CacheOutcome.NO_CACHED_ACCESS_TOKEN);