@azure/msal-common 7.1.0 → 7.4.0

package/dist/index.cjs.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 'use strict';
 'use strict';
 
@@ -138,7 +138,8 @@ var Constants = {
     REGIONAL_AUTH_PUBLIC_CLOUD_SUFFIX: "login.microsoft.com",
     KNOWN_PUBLIC_CLOUDS: ["login.microsoftonline.com", "login.windows.net", "login.microsoft.com", "sts.windows.net"],
     TOKEN_RESPONSE_TYPE: "token",
-    ID_TOKEN_RESPONSE_TYPE: "id_token"
+    ID_TOKEN_RESPONSE_TYPE: "id_token",
+    SHR_NONCE_VALIDITY: 240
 };
 var OIDC_DEFAULT_SCOPES = [
     Constants.OPENID_SCOPE,
@@ -170,6 +171,7 @@ exports.PersistentCacheKeys = void 0;
     PersistentCacheKeys["ERROR"] = "error";
     PersistentCacheKeys["ERROR_DESC"] = "error.description";
     PersistentCacheKeys["ACTIVE_ACCOUNT"] = "active-account";
+    PersistentCacheKeys["ACTIVE_ACCOUNT_FILTERS"] = "active-account-filters"; // new cache entry for active_account for a more robust version for browser
 })(exports.PersistentCacheKeys || (exports.PersistentCacheKeys = {}));
 /**
  * String constants related to AAD Authority
@@ -283,6 +285,15 @@ var CodeChallengeMethodValues = {
     PLAIN: "plain",
     S256: "S256"
 };
+/**
+ * The method used to encode the code verifier for the code challenge parameter. can be one
+ * of plain or s256. if excluded, code challenge is assumed to be plaintext. for more
+ * information, see the pkce rcf: https://tools.ietf.org/html/rfc7636
+ */
+[
+    CodeChallengeMethodValues.PLAIN,
+    CodeChallengeMethodValues.S256
+];
 /**
  * allowed values for response_mode
  */
@@ -481,6 +492,10 @@ var AuthErrorMessage = {
     unexpectedError: {
         code: "unexpected_error",
         desc: "Unexpected error in authentication."
+    },
+    postRequestFailed: {
+        code: "post_request_failed",
+        desc: "Post request failed from the network, could be a 4xx/5xx or a network unavailability. Please check the exact error code for details."
     }
 };
 /**
@@ -509,6 +524,14 @@ var AuthError = /** @class */ (function (_super) {
     AuthError.createUnexpectedError = function (errDesc) {
         return new AuthError(AuthErrorMessage.unexpectedError.code, AuthErrorMessage.unexpectedError.desc + ": " + errDesc);
     };
+    /**
+     * Creates an error for post request failures.
+     * @param errDesc
+     * @returns
+     */
+    AuthError.createPostRequestFailed = function (errDesc) {
+        return new AuthError(AuthErrorMessage.postRequestFailed.code, AuthErrorMessage.postRequestFailed.desc + ": " + errDesc);
+    };
     return AuthError;
 }(Error));
 
@@ -1358,7 +1381,7 @@ var Logger = /** @class */ (function () {
 
 /* eslint-disable header/header */
 var name = "@azure/msal-common";
-var version = "7.1.0";
+var version = "7.4.0";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1990,7 +2013,7 @@ function buildClientInfo(rawClientInfo, crypto) {
         return JSON.parse(decodedClientInfo);
     }
     catch (e) {
-        throw ClientAuthError.createClientInfoDecodingError(e);
+        throw ClientAuthError.createClientInfoDecodingError(e.message);
     }
 }
 /**
@@ -2319,6 +2342,7 @@ var CacheManager = /** @class */ (function () {
                 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;
@@ -2410,7 +2434,7 @@ 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);
+        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
@@ -2419,7 +2443,7 @@ var CacheManager = /** @class */ (function () {
      * @param environment
      * @param realm
      */
-    CacheManager.prototype.getAccountsFilteredByInternal = function (homeAccountId, environment, realm) {
+    CacheManager.prototype.getAccountsFilteredByInternal = function (homeAccountId, environment, realm, nativeAccountId) {
         var _this = this;
         var allCacheKeys = this.getKeys();
         var matchingAccounts = {};
@@ -2437,6 +2461,9 @@ var CacheManager = /** @class */ (function () {
             if (!!realm && !_this.matchRealm(entity, realm)) {
                 return;
             }
+            if (!!nativeAccountId && !_this.matchNativeAccountId(entity, nativeAccountId)) {
+                return;
+            }
             matchingAccounts[cacheKey] = entity;
         });
         return matchingAccounts;
@@ -2765,6 +2792,26 @@ 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 accountCache[0];
+    };
     /**
      * Retrieve IdTokenEntity from cache
      * @param clientId
@@ -2939,6 +2986,15 @@ var CacheManager = /** @class */ (function () {
     CacheManager.prototype.matchRealm = function (entity, realm) {
         return !!(entity.realm && realm === entity.realm);
     };
+    /**
+     * helper to match nativeAccountId
+     * @param entity
+     * @param nativeAccountId
+     * @returns boolean indicating the match result
+     */
+    CacheManager.prototype.matchNativeAccountId = function (entity, nativeAccountId) {
+        return !!(entity.nativeAccountId && nativeAccountId === entity.nativeAccountId);
+    };
     /**
      * Returns true if the target scopes are a subset of the current entity's scopes, false otherwise.
      * @param entity
@@ -3211,7 +3267,7 @@ function buildClientConfiguration(_a) {
         telemetry: __assign(__assign({}, DEFAULT_TELEMETRY_OPTIONS), telemetry),
         serverTelemetryManager: serverTelemetryManager || null,
         persistencePlugin: persistencePlugin || null,
-        serializableCache: serializableCache || null
+        serializableCache: serializableCache || null,
     };
 }
 /**
@@ -3399,7 +3455,7 @@ exports.CcsCredentialType = void 0;
  * Base application class which will construct requests to send to and handle responses from the Microsoft STS using the authorization code flow.
  */
 var BaseClient = /** @class */ (function () {
-    function BaseClient(configuration) {
+    function BaseClient(configuration, performanceClient) {
         // Set the configuration
         this.config = buildClientConfiguration(configuration);
         // Initialize the logger
@@ -3416,6 +3472,8 @@ var BaseClient = /** @class */ (function () {
         this.serverTelemetryManager = this.config.serverTelemetryManager;
         // set Authority
         this.authority = this.config.authOptions.authority;
+        // set performance telemetry client
+        this.performanceClient = performanceClient;
     }
     /**
      * Creates default headers for requests to token endpoint
@@ -4544,6 +4602,21 @@ var UrlString = /** @class */ (function () {
         }
         return Constants.EMPTY_STRING;
     };
+    /**
+     * Parses query string from given string. Returns empty string if no query symbol is found.
+     * @param queryString
+     */
+    UrlString.parseQueryString = function (queryString) {
+        var queryIndex1 = queryString.indexOf("?");
+        var queryIndex2 = queryString.indexOf("/?");
+        if (queryIndex2 > -1) {
+            return queryString.substring(queryIndex2 + 2);
+        }
+        else if (queryIndex1 > -1) {
+            return queryString.substring(queryIndex1 + 1);
+        }
+        return Constants.EMPTY_STRING;
+    };
     UrlString.constructAuthorityUriFromObject = function (urlObject) {
         return new UrlString(urlObject.Protocol + "//" + urlObject.HostNameAndPort + "/" + urlObject.PathSegments.join("/"));
     };
@@ -4565,6 +4638,24 @@ var UrlString = /** @class */ (function () {
         }
         return deserializedHash;
     };
+    /**
+     * Returns URL query string as server auth code response object.
+     */
+    UrlString.getDeserializedQueryString = function (query) {
+        // Check if given query is empty
+        if (StringUtils.isEmpty(query)) {
+            return {};
+        }
+        // Strip the ? symbol if present
+        var parsedQueryString = UrlString.parseQueryString(query);
+        // If ? symbol was not present, above will return empty string, so give original query value
+        var deserializedQueryString = StringUtils.queryStringToObject(StringUtils.isEmpty(parsedQueryString) ? query : parsedQueryString);
+        // Check if deserialization didn't work
+        if (!deserializedQueryString) {
+            throw ClientAuthError.createHashNotDeserializedError(JSON.stringify(deserializedQueryString));
+        }
+        return deserializedQueryString;
+    };
     /**
      * Check if the hash of the URL string contains known properties
      */
@@ -4843,7 +4934,7 @@ var ResponseHandler = /** @class */ (function () {
      * @param serverTokenResponse
      * @param authority
      */
-    ResponseHandler.prototype.handleServerTokenResponse = function (serverTokenResponse, authority, reqTimestamp, request, authCodePayload, userAssertionHash, handlingRefreshTokenResponse) {
+    ResponseHandler.prototype.handleServerTokenResponse = function (serverTokenResponse, authority, reqTimestamp, request, authCodePayload, userAssertionHash, handlingRefreshTokenResponse, forceCacheRefreshTokenResponse) {
         return __awaiter(this, void 0, void 0, function () {
             var idTokenObj, requestStateObj, cacheRecord, cacheContext, key, account;
             return __generator(this, function (_a) {
@@ -4880,14 +4971,15 @@ var ResponseHandler = /** @class */ (function () {
                         /*
                          * When saving a refreshed tokens to the cache, it is expected that the account that was used is present in the cache.
                          * If not present, we should return null, as it's the case that another application called removeAccount in between
-                         * the calls to getAllAccounts and acquireTokenSilent. We should not overwrite that removal.
+                         * the calls to getAllAccounts and acquireTokenSilent. We should not overwrite that removal, unless explicitly flagged by
+                         * the developer, as in the case of refresh token flow used in ADAL Node to MSAL Node migration.
                          */
-                        if (handlingRefreshTokenResponse && cacheRecord.account) {
+                        if (handlingRefreshTokenResponse && !forceCacheRefreshTokenResponse && cacheRecord.account) {
                             key = cacheRecord.account.generateAccountKey();
                             account = this.cacheStorage.getAccount(key);
                             if (!account) {
                                 this.logger.warning("Account used to refresh tokens not in persistence, refreshed tokens will not be stored in the cache");
-                                return [2 /*return*/, ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenObj, requestStateObj)];
+                                return [2 /*return*/, ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenObj, requestStateObj, undefined)];
                             }
                         }
                         return [4 /*yield*/, this.cacheStorage.saveCacheRecord(cacheRecord)];
@@ -5151,7 +5243,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
             throw ClientConfigurationError.createEmptyLogoutRequestError();
         }
         var queryString = this.createLogoutUrlQueryString(logoutRequest);
-        // Construct logout URI.
+        // Construct logout URI
         return UrlString.appendQueryString(this.authority.endSessionEndpoint, queryString);
     };
     /**
@@ -5338,7 +5430,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
      */
     AuthorizationCodeClient.prototype.createAuthCodeUrlQueryString = function (request) {
         return __awaiter(this, void 0, void 0, function () {
-            var parameterBuilder, requestScopes, correlationId, accountSid, clientInfo, clientInfo, popTokenGenerator, reqCnfData;
+            var parameterBuilder, requestScopes, correlationId, accountSid, accountLoginHintClaim, clientInfo, clientInfo, clientInfo, popTokenGenerator, reqCnfData;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5368,7 +5460,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                         if (request.domainHint) {
                             parameterBuilder.addDomainHint(request.domainHint);
                         }
-                        // Add sid or loginHint with preference for sid -> loginHint -> username of AccountInfo object
+                        // Add sid or loginHint with preference for login_hint claim (in request) -> sid -> loginHint (upn/email) -> username of AccountInfo object
                         if (request.prompt !== PromptValue.SELECT_ACCOUNT) {
                             // AAD will throw if prompt=select_account is passed with an account hint
                             if (request.sid && request.prompt === PromptValue.NONE) {
@@ -5378,9 +5470,24 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                             }
                             else if (request.account) {
                                 accountSid = this.extractAccountSid(request.account);
-                                // If account and loginHint are provided, we will check account first for sid before adding loginHint
-                                if (accountSid && request.prompt === PromptValue.NONE) {
-                                    // SessionId is only used in silent calls
+                                accountLoginHintClaim = this.extractLoginHint(request.account);
+                                // If login_hint claim is present, use it over sid/username
+                                if (accountLoginHintClaim) {
+                                    this.logger.verbose("createAuthCodeUrlQueryString: login_hint claim present on account");
+                                    parameterBuilder.addLoginHint(accountLoginHintClaim);
+                                    try {
+                                        clientInfo = buildClientInfoFromHomeAccountId(request.account.homeAccountId);
+                                        parameterBuilder.addCcsOid(clientInfo);
+                                    }
+                                    catch (e) {
+                                        this.logger.verbose("createAuthCodeUrlQueryString: Could not parse home account ID for CCS Header");
+                                    }
+                                }
+                                else if (accountSid && request.prompt === PromptValue.NONE) {
+                                    /*
+                                     * If account and loginHint are provided, we will check account first for sid before adding loginHint
+                                     * SessionId is only used in silent calls
+                                     */
                                     this.logger.verbose("createAuthCodeUrlQueryString: Prompt is none, adding sid from account");
                                     parameterBuilder.addSid(accountSid);
                                     try {
@@ -5388,7 +5495,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                                         parameterBuilder.addCcsOid(clientInfo);
                                     }
                                     catch (e) {
-                                        this.logger.verbose("Could not parse home account ID for CCS Header: " + e);
+                                        this.logger.verbose("createAuthCodeUrlQueryString: Could not parse home account ID for CCS Header");
                                     }
                                 }
                                 else if (request.loginHint) {
@@ -5405,7 +5512,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                                         parameterBuilder.addCcsOid(clientInfo);
                                     }
                                     catch (e) {
-                                        this.logger.verbose("Could not parse home account ID for CCS Header: " + e);
+                                        this.logger.verbose("createAuthCodeUrlQueryString: Could not parse home account ID for CCS Header");
                                     }
                                 }
                             }
@@ -5476,11 +5583,12 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
      * @param account
      */
     AuthorizationCodeClient.prototype.extractAccountSid = function (account) {
-        if (account.idTokenClaims) {
-            var tokenClaims = account.idTokenClaims;
-            return tokenClaims.sid || null;
-        }
-        return null;
+        var _a;
+        return ((_a = account.idTokenClaims) === null || _a === void 0 ? void 0 : _a.sid) || null;
+    };
+    AuthorizationCodeClient.prototype.extractLoginHint = function (account) {
+        var _a;
+        return ((_a = account.idTokenClaims) === null || _a === void 0 ? void 0 : _a.login_hint) || null;
     };
     return AuthorizationCodeClient;
 }(BaseClient));
@@ -5633,7 +5741,7 @@ var DeviceCodeClient = /** @class */ (function (_super) {
                         pollingIntervalMilli = deviceCodeResponse.interval * 1000;
                         _a.label = 1;
                     case 1:
-                        if (!this.continuePolling(deviceCodeExpirationTime, userSpecifiedTimeout, request.cancel)) return [3 /*break*/, 6];
+                        if (!this.continuePolling(deviceCodeExpirationTime, userSpecifiedTimeout, request.cancel)) return [3 /*break*/, 8];
                         thumbprint = {
                             clientId: this.config.authOptions.clientId,
                             authority: request.authority,
@@ -5648,18 +5756,23 @@ var DeviceCodeClient = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.executePostToTokenEndpoint(this.authority.tokenEndpoint, requestBody, headers, thumbprint)];
                     case 2:
                         response = _a.sent();
-                        if (!(response.body && response.body.error === Constants.AUTHORIZATION_PENDING)) return [3 /*break*/, 4];
-                        // user authorization is pending. Sleep for polling interval and try again
-                        this.logger.info(response.body.error_description || "Authorization pending. Continue polling.");
+                        if (!(response.body && response.body.error)) return [3 /*break*/, 6];
+                        if (!(response.body.error === Constants.AUTHORIZATION_PENDING)) return [3 /*break*/, 4];
+                        this.logger.info("Authorization pending. Continue polling.");
                         return [4 /*yield*/, TimeUtils.delay(pollingIntervalMilli)];
                     case 3:
                         _a.sent();
                         return [3 /*break*/, 5];
                     case 4:
+                        // for any other error, throw
+                        this.logger.info("Unexpected error in polling from the server");
+                        throw ServerError.createPostRequestFailed(response.body.error);
+                    case 5: return [3 /*break*/, 7];
+                    case 6:
                         this.logger.verbose("Authorization completed successfully. Polling stopped.");
                         return [2 /*return*/, response.body];
-                    case 5: return [3 /*break*/, 1];
-                    case 6:
+                    case 7: return [3 /*break*/, 1];
+                    case 8:
                         /*
                          * The above code should've thrown by this point, but to satisfy TypeScript,
                          * and in the rare case the conditionals in continuePolling() may not catch everything...
@@ -5698,6 +5811,123 @@ var DeviceCodeClient = /** @class */ (function (_super) {
     return DeviceCodeClient;
 }(BaseClient));
 
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+/**
+ * Enumeration of operations that are instrumented by have their performance measured by the PerformanceClient.
+ *
+ * @export
+ * @enum {number}
+ */
+exports.PerformanceEvents = void 0;
+(function (PerformanceEvents) {
+    /**
+     * acquireTokenByCode API (msal-browser and msal-node).
+     * Used to acquire tokens by trading an authorization code against the token endpoint.
+     */
+    PerformanceEvents["AcquireTokenByCode"] = "acquireTokenByCode";
+    /**
+     * acquireTokenByRefreshToken API (msal-browser and msal-node).
+     * Used to renew an access token using a refresh token against the token endpoint.
+     */
+    PerformanceEvents["AcquireTokenByRefreshToken"] = "acquireTokenByRefreshToken";
+    /**
+     * acquireTokenSilent API (msal-browser and msal-node).
+     * Used to silently acquire a new access token (from the cache or the network).
+     */
+    PerformanceEvents["AcquireTokenSilent"] = "acquireTokenSilent";
+    /**
+     * acquireTokenSilentAsync (msal-browser).
+     * Internal API for acquireTokenSilent.
+     */
+    PerformanceEvents["AcquireTokenSilentAsync"] = "acquireTokenSilentAsync";
+    /**
+     * acquireTokenPopup (msal-browser).
+     * Used to acquire a new access token interactively through pop ups
+     */
+    PerformanceEvents["AcquireTokenPopup"] = "acquireTokenPopup";
+    /**
+     * getPublicKeyThumbprint API in CryptoOpts class (msal-browser).
+     * Used to generate a public/private keypair and generate a public key thumbprint for pop requests.
+     */
+    PerformanceEvents["CryptoOptsGetPublicKeyThumbprint"] = "cryptoOptsGetPublicKeyThumbprint";
+    /**
+     * signJwt API in CryptoOpts class (msal-browser).
+     * Used to signed a pop token.
+     */
+    PerformanceEvents["CryptoOptsSignJwt"] = "cryptoOptsSignJwt";
+    /**
+     * acquireToken API in the SilentCacheClient class (msal-browser).
+     * Used to read access tokens from the cache.
+     */
+    PerformanceEvents["SilentCacheClientAcquireToken"] = "silentCacheClientAcquireToken";
+    /**
+     * acquireToken API in the SilentIframeClient class (msal-browser).
+     * Used to acquire a new set of tokens from the authorize endpoint in a hidden iframe.
+     */
+    PerformanceEvents["SilentIframeClientAcquireToken"] = "silentIframeClientAcquireToken";
+    /**
+     * acquireToken API in SilentRereshClient (msal-browser).
+     * Used to acquire a new set of tokens from the token endpoint using a refresh token.
+     */
+    PerformanceEvents["SilentRefreshClientAcquireToken"] = "silentRefreshClientAcquireToken";
+    /**
+     * ssoSilent API (msal-browser).
+     * Used to silently acquire an authorization code and set of tokens using a hidden iframe.
+     */
+    PerformanceEvents["SsoSilent"] = "ssoSilent";
+    /**
+     * getDiscoveredAuthority API in StandardInteractionClient class (msal-browser).
+     * Used to load authority metadata for a request.
+     */
+    PerformanceEvents["StandardInteractionClientGetDiscoveredAuthority"] = "standardInteractionClientGetDiscoveredAuthority";
+    /**
+     * acquireToken APIs in msal-browser.
+     * Used to make an /authorize endpoint call with native brokering enabled.
+     */
+    PerformanceEvents["FetchAccountIdWithNativeBroker"] = "fetchAccountIdWithNativeBroker";
+    /**
+     * acquireToken API in NativeInteractionClient class (msal-browser).
+     * Used to acquire a token from Native component when native brokering is enabled.
+     */
+    PerformanceEvents["NativeInteractionClientAcquireToken"] = "nativeInteractionClientAcquireToken";
+    /**
+     * Time spent on the network for refresh token acquisition
+     */
+    PerformanceEvents["RefreshTokenClientExecuteTokenRequest"] = "refreshTokenClientExecuteTokenRequest";
+    /**
+     * Time spent creating default headers for requests to token endpoint
+     */
+    PerformanceEvents["BaseClientCreateTokenRequestHeaders"] = "baseClientCreateTokenRequestHeaders";
+    /**
+     * Used to measure the time taken for completing embedded-broker handshake (PW-Broker).
+     */
+    PerformanceEvents["BrokerHandhshake"] = "brokerHandshake";
+    /**
+     * acquireTokenByRefreshToken API in BrokerClientApplication (PW-Broker) .
+     */
+    PerformanceEvents["AcquireTokenByRefreshTokenInBroker"] = "acquireTokenByRefreshTokenInBroker";
+    /**
+     * acquireToken API in BrokerClientApplication.
+     * Used to acquire a token on behalf of the embedded application (PW-Broker).
+     */
+    PerformanceEvents["AcquireTokenByBroker"] = "acquireTokenByBroker";
+})(exports.PerformanceEvents || (exports.PerformanceEvents = {}));
+/**
+ * State of the performance event.
+ *
+ * @export
+ * @enum {number}
+ */
+exports.PerformanceEventStatus = void 0;
+(function (PerformanceEventStatus) {
+    PerformanceEventStatus[PerformanceEventStatus["NotStarted"] = 0] = "NotStarted";
+    PerformanceEventStatus[PerformanceEventStatus["InProgress"] = 1] = "InProgress";
+    PerformanceEventStatus[PerformanceEventStatus["Completed"] = 2] = "Completed";
+})(exports.PerformanceEventStatus || (exports.PerformanceEventStatus = {}));
+
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5707,8 +5937,8 @@ var DeviceCodeClient = /** @class */ (function (_super) {
  */
 var RefreshTokenClient = /** @class */ (function (_super) {
     __extends(RefreshTokenClient, _super);
-    function RefreshTokenClient(configuration) {
-        return _super.call(this, configuration) || this;
+    function RefreshTokenClient(configuration, performanceClient) {
+        return _super.call(this, configuration, performanceClient) || this;
     }
     RefreshTokenClient.prototype.acquireToken = function (request) {
         return __awaiter(this, void 0, void 0, function () {
@@ -5722,7 +5952,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                         response = _a.sent();
                         responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin);
                         responseHandler.validateTokenResponse(response.body);
-                        return [2 /*return*/, responseHandler.handleServerTokenResponse(response.body, this.authority, reqTimestamp, request, undefined, undefined, true)];
+                        return [2 /*return*/, responseHandler.handleServerTokenResponse(response.body, this.authority, reqTimestamp, request, undefined, undefined, true, request.forceCache)];
                 }
             });
         });
@@ -5794,13 +6024,16 @@ var RefreshTokenClient = /** @class */ (function (_super) {
      * @param authority
      */
     RefreshTokenClient.prototype.executeTokenRequest = function (request, authority) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var requestBody, queryParameters, headers, thumbprint, endpoint;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.createTokenRequestBody(request)];
+            var acquireTokenMeasurement, requestBody, queryParameters, headers, thumbprint, endpoint;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        acquireTokenMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
+                        return [4 /*yield*/, this.createTokenRequestBody(request)];
                     case 1:
-                        requestBody = _a.sent();
+                        requestBody = _b.sent();
                         queryParameters = this.createTokenQueryParameters(request);
                         headers = this.createTokenRequestHeaders(request.ccsCredential);
                         thumbprint = {
@@ -5815,7 +6048,19 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                             sshKid: request.sshKid
                         };
                         endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParameters);
-                        return [2 /*return*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)];
+                        return [2 /*return*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)
+                                .then(function (result) {
+                                acquireTokenMeasurement === null || acquireTokenMeasurement === void 0 ? void 0 : acquireTokenMeasurement.endMeasurement({
+                                    success: true
+                                });
+                                return result;
+                            })
+                                .catch(function (error) {
+                                acquireTokenMeasurement === null || acquireTokenMeasurement === void 0 ? void 0 : acquireTokenMeasurement.endMeasurement({
+                                    success: false
+                                });
+                                throw error;
+                            })];
                 }
             });
         });
@@ -5836,11 +6081,14 @@ var RefreshTokenClient = /** @class */ (function (_super) {
      * @param request
      */
     RefreshTokenClient.prototype.createTokenRequestBody = function (request) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var parameterBuilder, correlationId, clientAssertion, popTokenGenerator, reqCnfData, clientInfo;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var correlationId, acquireTokenMeasurement, parameterBuilder, clientAssertion, popTokenGenerator, reqCnfData, clientInfo;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
+                        correlationId = request.correlationId;
+                        acquireTokenMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.BaseClientCreateTokenRequestHeaders, correlationId);
                         parameterBuilder = new RequestParameterBuilder();
                         parameterBuilder.addClientId(this.config.authOptions.clientId);
                         parameterBuilder.addScopes(request.scopes);
@@ -5852,7 +6100,6 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                         if (this.serverTelemetryManager) {
                             parameterBuilder.addServerTelemetry(this.serverTelemetryManager);
                         }
-                        correlationId = request.correlationId || this.config.cryptoInterface.createNewGuid();
                         parameterBuilder.addCorrelationId(correlationId);
                         parameterBuilder.addRefreshToken(request.refreshToken);
                         if (this.config.clientCredentials.clientSecret) {
@@ -5867,7 +6114,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                         popTokenGenerator = new PopTokenGenerator(this.cryptoUtils);
                         return [4 /*yield*/, popTokenGenerator.generateCnf(request)];
                     case 1:
-                        reqCnfData = _a.sent();
+                        reqCnfData = _b.sent();
                         // SPA PoP requires full Base64Url encoded req_cnf string (unhashed)
                         parameterBuilder.addPopToken(reqCnfData.reqCnfString);
                         return [3 /*break*/, 3];
@@ -5877,10 +6124,13 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                                 parameterBuilder.addSshJwk(request.sshJwk);
                             }
                             else {
+                                acquireTokenMeasurement === null || acquireTokenMeasurement === void 0 ? void 0 : acquireTokenMeasurement.endMeasurement({
+                                    success: false
+                                });
                                 throw ClientConfigurationError.createMissingSshJwkError();
                             }
                         }
-                        _a.label = 3;
+                        _b.label = 3;
                     case 3:
                         if (!StringUtils.isEmptyObj(request.claims) || this.config.authOptions.clientCapabilities && this.config.authOptions.clientCapabilities.length > 0) {
                             parameterBuilder.addClaims(request.claims, this.config.authOptions.clientCapabilities);
@@ -5901,6 +6151,9 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                                     break;
                             }
                         }
+                        acquireTokenMeasurement === null || acquireTokenMeasurement === void 0 ? void 0 : acquireTokenMeasurement.endMeasurement({
+                            success: true
+                        });
                         return [2 /*return*/, parameterBuilder.createQueryString()];
                 }
             });
@@ -5918,8 +6171,10 @@ var RefreshTokenClient = /** @class */ (function (_super) {
  */
 var ClientCredentialClient = /** @class */ (function (_super) {
     __extends(ClientCredentialClient, _super);
-    function ClientCredentialClient(configuration) {
-        return _super.call(this, configuration) || this;
+    function ClientCredentialClient(configuration, appTokenProvider) {
+        var _this = _super.call(this, configuration) || this;
+        _this.appTokenProvider = appTokenProvider;
+        return _this;
     }
     /**
      * Public API to acquire a token with ClientCredential Flow for Confidential clients
@@ -6007,10 +6262,30 @@ var ClientCredentialClient = /** @class */ (function (_super) {
      */
     ClientCredentialClient.prototype.executeTokenRequest = function (request, authority) {
         return __awaiter(this, void 0, void 0, function () {
-            var requestBody, headers, thumbprint, reqTimestamp, response, responseHandler, tokenResponse;
+            var serverTokenResponse, reqTimestamp, appTokenPropviderParameters, appTokenProviderResult, requestBody, headers, thumbprint, response, responseHandler, tokenResponse;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        if (!this.appTokenProvider) return [3 /*break*/, 2];
+                        this.logger.info("Using appTokenProvider extensibility.");
+                        appTokenPropviderParameters = {
+                            correlationId: request.correlationId,
+                            tenantId: this.config.authOptions.authority.tenant,
+                            scopes: request.scopes,
+                            claims: request.claims,
+                        };
+                        reqTimestamp = TimeUtils.nowSeconds();
+                        return [4 /*yield*/, this.appTokenProvider(appTokenPropviderParameters)];
+                    case 1:
+                        appTokenProviderResult = _a.sent();
+                        serverTokenResponse = {
+                            access_token: appTokenProviderResult.accessToken,
+                            expires_in: appTokenProviderResult.expiresInSeconds,
+                            refresh_in: appTokenProviderResult.refreshInSeconds,
+                            token_type: exports.AuthenticationScheme.BEARER
+                        };
+                        return [3 /*break*/, 4];
+                    case 2:
                         requestBody = this.createTokenRequestBody(request);
                         headers = this.createTokenRequestHeaders();
                         thumbprint = {
@@ -6026,12 +6301,15 @@ var ClientCredentialClient = /** @class */ (function (_super) {
                         };
                         reqTimestamp = TimeUtils.nowSeconds();
                         return [4 /*yield*/, this.executePostToTokenEndpoint(authority.tokenEndpoint, requestBody, headers, thumbprint)];
-                    case 1:
+                    case 3:
                         response = _a.sent();
+                        serverTokenResponse = response.body;
+                        _a.label = 4;
+                    case 4:
                         responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin);
-                        responseHandler.validateTokenResponse(response.body);
-                        return [4 /*yield*/, responseHandler.handleServerTokenResponse(response.body, this.authority, reqTimestamp, request)];
-                    case 2:
+                        responseHandler.validateTokenResponse(serverTokenResponse);
+                        return [4 /*yield*/, responseHandler.handleServerTokenResponse(serverTokenResponse, this.authority, reqTimestamp, request)];
+                    case 5:
                         tokenResponse = _a.sent();
                         return [2 /*return*/, tokenResponse];
                 }
@@ -6308,8 +6586,8 @@ var OnBehalfOfClient = /** @class */ (function (_super) {
  */
 var SilentFlowClient = /** @class */ (function (_super) {
     __extends(SilentFlowClient, _super);
-    function SilentFlowClient(configuration) {
-        return _super.call(this, configuration) || this;
+    function SilentFlowClient(configuration, performanceClient) {
+        return _super.call(this, configuration, performanceClient) || this;
     }
     /**
      * Retrieves a token from cache if it is still valid, or uses the cached refresh token to renew
@@ -6328,7 +6606,7 @@ var SilentFlowClient = /** @class */ (function (_super) {
                     case 2:
                         e_1 = _a.sent();
                         if (e_1 instanceof ClientAuthError && e_1.errorCode === ClientAuthErrorMessage.tokenRefreshRequired.code) {
-                            refreshTokenClient = new RefreshTokenClient(this.config);
+                            refreshTokenClient = new RefreshTokenClient(this.config, this.performanceClient);
                             return [2 /*return*/, refreshTokenClient.acquireTokenByRefreshToken(request)];
                         }
                         else {
@@ -7846,102 +8124,6 @@ var ServerTelemetryManager = /** @class */ (function () {
     return ServerTelemetryManager;
 }());
 
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-/**
- * Enumeration of operations that are instrumented by have their performance measured by the PerformanceClient.
- *
- * @export
- * @enum {number}
- */
-exports.PerformanceEvents = void 0;
-(function (PerformanceEvents) {
-    /**
-     * acquireTokenByCode API (msal-browser and msal-node).
-     * Used to acquire tokens by trading an authorization code against the token endpoint.
-     */
-    PerformanceEvents["AcquireTokenByCode"] = "acquireTokenByCode";
-    /**
-     * acquireTokenByRefreshToken API (msal-browser and msal-node).
-     * Used to renew an access token using a refresh token against the token endpoint.
-     */
-    PerformanceEvents["AcquireTokenByRefreshToken"] = "acquireTokenByRefreshToken";
-    /**
-     * acquireTokenSilent API (msal-browser and msal-node).
-     * Used to silently acquire a new access token (from the cache or the network).
-     */
-    PerformanceEvents["AcquireTokenSilent"] = "acquireTokenSilent";
-    /**
-     * acquireTokenSilentAsync (msal-browser).
-     * Internal API for acquireTokenSilent.
-     */
-    PerformanceEvents["AcquireTokenSilentAsync"] = "acquireTokenSilentAsync";
-    /**
-     * acquireTokenPopup (msal-browser).
-     * Used to acquire a new access token interactively through pop ups
-     */
-    PerformanceEvents["AcquireTokenPopup"] = "acquireTokenPopup";
-    /**
-     * getPublicKeyThumbprint API in CryptoOpts class (msal-browser).
-     * Used to generate a public/private keypair and generate a public key thumbprint for pop requests.
-     */
-    PerformanceEvents["CryptoOptsGetPublicKeyThumbprint"] = "cryptoOptsGetPublicKeyThumbprint";
-    /**
-     * signJwt API in CryptoOpts class (msal-browser).
-     * Used to signed a pop token.
-     */
-    PerformanceEvents["CryptoOptsSignJwt"] = "cryptoOptsSignJwt";
-    /**
-     * acquireToken API in the SilentCacheClient class (msal-browser).
-     * Used to read access tokens from the cache.
-     */
-    PerformanceEvents["SilentCacheClientAcquireToken"] = "silentCacheClientAcquireToken";
-    /**
-     * acquireToken API in the SilentIframeClient class (msal-browser).
-     * Used to acquire a new set of tokens from the authorize endpoint in a hidden iframe.
-     */
-    PerformanceEvents["SilentIframeClientAcquireToken"] = "silentIframeClientAcquireToken";
-    /**
-     * acquireToken API in SilentRereshClient (msal-browser).
-     * Used to acquire a new set of tokens from the token endpoint using a refresh token.
-     */
-    PerformanceEvents["SilentRefreshClientAcquireToken"] = "silentRefreshClientAcquireToken";
-    /**
-     * ssoSilent API (msal-browser).
-     * Used to silently acquire an authorization code and set of tokens using a hidden iframe.
-     */
-    PerformanceEvents["SsoSilent"] = "ssoSilent";
-    /**
-     * getDiscoveredAuthority API in StandardInteractionClient class (msal-browser).
-     * Used to load authority metadata for a request.
-     */
-    PerformanceEvents["StandardInteractionClientGetDiscoveredAuthority"] = "standardInteractionClientGetDiscoveredAuthority";
-    /**
-     * acquireToken APIs in msal-browser.
-     * Used to make an /authorize endpoint call with native brokering enabled.
-     */
-    PerformanceEvents["FetchAccountIdWithNativeBroker"] = "fetchAccountIdWithNativeBroker";
-    /**
-     * acquireToken API in NativeInteractionClient class (msal-browser).
-     * Used to acquire a token from Native component when native brokering is enabled.
-     */
-    PerformanceEvents["NativeInteractionClientAcquireToken"] = "nativeInteractionClientAcquireToken";
-})(exports.PerformanceEvents || (exports.PerformanceEvents = {}));
-/**
- * State of the performance event.
- *
- * @export
- * @enum {number}
- */
-exports.PerformanceEventStatus = void 0;
-(function (PerformanceEventStatus) {
-    PerformanceEventStatus[PerformanceEventStatus["NotStarted"] = 0] = "NotStarted";
-    PerformanceEventStatus[PerformanceEventStatus["InProgress"] = 1] = "InProgress";
-    PerformanceEventStatus[PerformanceEventStatus["Completed"] = 2] = "Completed";
-})(exports.PerformanceEventStatus || (exports.PerformanceEventStatus = {}));
-
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -7998,7 +8180,7 @@ var PerformanceClient = /** @class */ (function () {
             clientId: this.clientId,
             name: measureName,
             startTimeMs: Date.now(),
-            correlationId: eventCorrelationId
+            correlationId: eventCorrelationId,
         };
         // Store in progress events so they can be discarded if not ended properly
         this.cacheEventByCorrelationId(inProgressEvent);
@@ -8143,6 +8325,12 @@ var PerformanceClient = /** @class */ (function () {
                         else {
                             _this.logger.verbose("PerformanceClient: Submeasurement for " + measureName + " already exists for " + current.name + ", ignoring", correlationId);
                         }
+                        if (current.accessTokenSize) {
+                            previous.accessTokenSize = current.accessTokenSize;
+                        }
+                        if (current.idTokenSize) {
+                            previous.idTokenSize = current.idTokenSize;
+                        }
                     }
                     return previous;
                 }, topLevelEvent);
@@ -8257,6 +8445,7 @@ exports.ClientAuthErrorMessage = ClientAuthErrorMessage;
 exports.ClientConfigurationError = ClientConfigurationError;
 exports.ClientConfigurationErrorMessage = ClientConfigurationErrorMessage;
 exports.ClientCredentialClient = ClientCredentialClient;
+exports.CodeChallengeMethodValues = CodeChallengeMethodValues;
 exports.Constants = Constants;
 exports.CredentialEntity = CredentialEntity;
 exports.DEFAULT_CRYPTO_IMPLEMENTATION = DEFAULT_CRYPTO_IMPLEMENTATION;
@@ -8292,5 +8481,7 @@ exports.TimeUtils = TimeUtils;
 exports.TokenCacheContext = TokenCacheContext;
 exports.UrlString = UrlString;
 exports.UsernamePasswordClient = UsernamePasswordClient;
+exports.buildClientInfo = buildClientInfo;
+exports.buildClientInfoFromHomeAccountId = buildClientInfoFromHomeAccountId;
 exports.version = version;
 //# sourceMappingURL=index.cjs.js.map