@azure/msal-browser 2.32.2 → 2.34.0

package/lib/msal-browser.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v2.32.2 2023-01-10 */
+/*! @azure/msal-browser v2.34.0 2023-03-07 */
 'use strict';
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -119,7 +119,7 @@
         return ar;
     }
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
 
@@ -206,7 +206,7 @@
         return r;
     }
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -588,9 +588,10 @@
     (function (JsonTypes) {
         JsonTypes["Jwt"] = "JWT";
         JsonTypes["Jwk"] = "JWK";
+        JsonTypes["Pop"] = "pop";
     })(JsonTypes || (JsonTypes = {}));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -646,7 +647,7 @@
         return AuthError;
     }(Error));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -721,7 +722,7 @@
         }
     };
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -925,6 +926,14 @@
         keyIdMissing: {
             code: "key_id_missing",
             desc: "A keyId value is missing from the requested bound token's cache record and is required to match the token to it's stored binding key."
+        },
+        noNetworkConnectivity: {
+            code: "no_network_connectivity",
+            desc: "No network connectivity. Check your internet connection."
+        },
+        userCanceledError: {
+            code: "user_canceled",
+            desc: "User canceled the flow."
         }
     };
     /**
@@ -1213,10 +1222,22 @@
         ClientAuthError.createKeyIdMissingError = function () {
             return new ClientAuthError(ClientAuthErrorMessage.keyIdMissing.code, ClientAuthErrorMessage.keyIdMissing.desc);
         };
+        /**
+         * Create an error when the client does not have network connectivity
+         */
+        ClientAuthError.createNoNetworkConnectivityError = function () {
+            return new ClientAuthError(ClientAuthErrorMessage.noNetworkConnectivity.code, ClientAuthErrorMessage.noNetworkConnectivity.desc);
+        };
+        /**
+         * Create an error when the user cancels the flow
+         */
+        ClientAuthError.createUserCanceledError = function () {
+            return new ClientAuthError(ClientAuthErrorMessage.userCanceledError.code, ClientAuthErrorMessage.userCanceledError.desc);
+        };
         return ClientAuthError;
     }(AuthError));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1341,7 +1362,7 @@
         return StringUtils;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1531,12 +1552,12 @@
         return Logger;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /* eslint-disable header/header */
     var name$1 = "@azure/msal-common";
-    var version$1 = "9.0.2";
+    var version$1 = "11.0.0";
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1557,7 +1578,7 @@
         AzureCloudInstance["AzureUsGovernment"] = "https://login.microsoftonline.us";
     })(exports.AzureCloudInstance || (exports.AzureCloudInstance = {}));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1588,6 +1609,25 @@
     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(CredentialType); _i < _a.length; _i++) {
+                var credKey = _a[_i];
+                var credVal = CredentialType[credKey].toLowerCase();
+                try {
+                    // Verify credential type is preceded by a valid host name (environment) using lookbehind
+                    CredentialEntity.credentialRegexMap.set(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(CredentialType[credKey], new RegExp("" + separator + CredentialEntity.credentialDomainRegex + separator + credVal + separator));
+                }
+            }
+        };
         /**
          * Generate Account Id key component as per the schema: <home_account_id>-<environment>
          */
@@ -1634,14 +1674,10 @@
          * @param key
          */
         CredentialEntity.getCredentialType = function (key) {
-            var separator = Separators.CACHE_KEY_SEPARATOR;
-            // Match host names like "login.microsoftonline.com", "https://accounts.google.com:4000", etc.
-            var domainRe = "(https?:\\/\\/)?([\\w-]+\\.)*([\\w-]{1,63})(\\.(\\w{2,3}))(\\:[0-9]{4,5})?";
-            for (var _i = 0, _a = Object.keys(CredentialType); _i < _a.length; _i++) {
-                var credKey = _a[_i];
-                var credVal = CredentialType[credKey].toLowerCase();
-                // Verify credential type is preceded by a valid host name (environment)
-                if (key.toLowerCase().search("(?<=" + separator + domainRe + ")" + separator + credVal + separator) !== -1) {
+            var _a;
+            for (var _i = 0, _b = Object.keys(CredentialType); _i < _b.length; _i++) {
+                var credKey = _b[_i];
+                if ((_a = this.credentialRegexMap.get(CredentialType[credKey])) === null || _a === void 0 ? void 0 : _a.test(key.toLowerCase())) {
                     return CredentialType[credKey];
                 }
             }
@@ -1710,10 +1746,16 @@
              */
             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();
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1968,7 +2010,7 @@
         return ClientConfigurationError;
     }(ClientAuthError));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2152,7 +2194,7 @@
         return ScopeSet;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2190,7 +2232,7 @@
         };
     }
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2205,7 +2247,7 @@
         AuthorityType[AuthorityType["Dsts"] = 2] = "Dsts";
     })(AuthorityType || (AuthorityType = {}));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2444,7 +2486,7 @@
         return AccountEntity;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2496,7 +2538,7 @@
         return AuthToken;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2999,7 +3041,7 @@
             else if (accounts.length > 1) {
                 throw ClientAuthError.createMultipleMatchingAccountsInCacheError();
             }
-            return accountCache[0];
+            return accounts[0];
         };
         /**
          * Retrieve IdTokenEntity from cache
@@ -3375,7 +3417,7 @@
         return DefaultStorageClass;
     }(CacheManager));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3385,8 +3427,7 @@
     var DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
     var DEFAULT_SYSTEM_OPTIONS = {
         tokenRenewalOffsetSeconds: DEFAULT_TOKEN_RENEWAL_OFFSET_SEC,
-        preventCorsPreflight: false,
-        proxyUrl: Constants.EMPTY_STRING
+        preventCorsPreflight: false
     };
     var DEFAULT_LOGGER_IMPLEMENTATION = {
         loggerCallback: function () {
@@ -3469,7 +3510,7 @@
         return __assign({ clientCapabilities: [], azureCloudOptions: DEFAULT_AZURE_CLOUD_OPTIONS, skipAuthorityMetadataCache: false }, authOptions);
     }
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3489,7 +3530,7 @@
         return ServerError;
     }(AuthError));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3585,7 +3626,7 @@
         return ThrottlingUtils;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3634,7 +3675,7 @@
         return NetworkManager;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3645,98 +3686,7 @@
         CcsCredentialType["UPN"] = "UPN";
     })(CcsCredentialType || (CcsCredentialType = {}));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
-
-    /*
-     * Copyright (c) Microsoft Corporation. All rights reserved.
-     * Licensed under the MIT License.
-     */
-    /**
-     * 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, performanceClient) {
-            // Set the configuration
-            this.config = buildClientConfiguration(configuration);
-            // Initialize the logger
-            this.logger = new Logger(this.config.loggerOptions, name$1, version$1);
-            // Initialize crypto
-            this.cryptoUtils = this.config.cryptoInterface;
-            // Initialize storage interface
-            this.cacheManager = this.config.storageInterface;
-            // Set the network interface
-            this.networkClient = this.config.networkInterface;
-            // Set the NetworkManager
-            this.networkManager = new NetworkManager(this.networkClient, this.cacheManager);
-            // Set TelemetryManager
-            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
-         */
-        BaseClient.prototype.createTokenRequestHeaders = function (ccsCred) {
-            var headers = {};
-            headers[HeaderNames.CONTENT_TYPE] = Constants.URL_FORM_CONTENT_TYPE;
-            if (!this.config.systemOptions.preventCorsPreflight && ccsCred) {
-                switch (ccsCred.type) {
-                    case CcsCredentialType.HOME_ACCOUNT_ID:
-                        try {
-                            var clientInfo = buildClientInfoFromHomeAccountId(ccsCred.credential);
-                            headers[HeaderNames.CCS_HEADER] = "Oid:" + clientInfo.uid + "@" + clientInfo.utid;
-                        }
-                        catch (e) {
-                            this.logger.verbose("Could not parse home account ID for CCS Header: " + e);
-                        }
-                        break;
-                    case CcsCredentialType.UPN:
-                        headers[HeaderNames.CCS_HEADER] = "UPN: " + ccsCred.credential;
-                        break;
-                }
-            }
-            return headers;
-        };
-        /**
-         * Http post to token endpoint
-         * @param tokenEndpoint
-         * @param queryString
-         * @param headers
-         * @param thumbprint
-         */
-        BaseClient.prototype.executePostToTokenEndpoint = function (tokenEndpoint, queryString, headers, thumbprint) {
-            return __awaiter(this, void 0, void 0, function () {
-                var response;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.networkManager.sendPostRequest(thumbprint, tokenEndpoint, { body: queryString, headers: headers, proxyUrl: this.config.systemOptions.proxyUrl })];
-                        case 1:
-                            response = _a.sent();
-                            if (this.config.serverTelemetryManager && response.status < 500 && response.status !== 429) {
-                                // Telemetry data successfully logged by server, clear Telemetry cache
-                                this.config.serverTelemetryManager.clearTelemetryCache();
-                            }
-                            return [2 /*return*/, response];
-                    }
-                });
-            });
-        };
-        /**
-         * Updates the authority object of the client. Endpoint discovery must be completed.
-         * @param updatedAuthority
-         */
-        BaseClient.prototype.updateAuthority = function (updatedAuthority) {
-            if (!updatedAuthority.discoveryComplete()) {
-                throw ClientAuthError.createEndpointDiscoveryIncompleteError("Updated authority has not completed endpoint discovery.");
-            }
-            this.authority = updatedAuthority;
-        };
-        return BaseClient;
-    }());
-
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3804,7 +3754,7 @@
             }
         };
         /**
-         * Removes unnecessary or duplicate query parameters from extraQueryParameters
+         * Removes unnecessary, duplicate, and empty string query parameters from extraQueryParameters
          * @param request
          */
         RequestValidator.sanitizeEQParams = function (eQParams, queryParams) {
@@ -3817,12 +3767,17 @@
                     delete eQParams[key];
                 }
             });
-            return eQParams;
+            // remove empty string parameters
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            return Object.fromEntries(Object.entries(eQParams).filter(function (_a) {
+                var value = _a[1];
+                return value !== "";
+            }));
         };
         return RequestValidator;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4099,13 +4054,13 @@
         };
         /**
          * add extraQueryParams
-         * @param eQparams
+         * @param eQParams
          */
-        RequestParameterBuilder.prototype.addExtraQueryParameters = function (eQparams) {
+        RequestParameterBuilder.prototype.addExtraQueryParameters = function (eQParams) {
             var _this = this;
-            RequestValidator.sanitizeEQParams(eQparams, this.parameters);
-            Object.keys(eQparams).forEach(function (key) {
-                _this.parameters.set(key, eQparams[key]);
+            var sanitizedEQParams = RequestValidator.sanitizeEQParams(eQParams, this.parameters);
+            Object.keys(sanitizedEQParams).forEach(function (key) {
+                _this.parameters.set(key, eQParams[key]);
             });
         };
         RequestParameterBuilder.prototype.addClientCapabilitiesToClaims = function (claims, clientCapabilities) {
@@ -4200,7 +4155,109 @@
         return RequestParameterBuilder;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
+
+    /*
+     * Copyright (c) Microsoft Corporation. All rights reserved.
+     * Licensed under the MIT License.
+     */
+    /**
+     * 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, performanceClient) {
+            // Set the configuration
+            this.config = buildClientConfiguration(configuration);
+            // Initialize the logger
+            this.logger = new Logger(this.config.loggerOptions, name$1, version$1);
+            // Initialize crypto
+            this.cryptoUtils = this.config.cryptoInterface;
+            // Initialize storage interface
+            this.cacheManager = this.config.storageInterface;
+            // Set the network interface
+            this.networkClient = this.config.networkInterface;
+            // Set the NetworkManager
+            this.networkManager = new NetworkManager(this.networkClient, this.cacheManager);
+            // Set TelemetryManager
+            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
+         */
+        BaseClient.prototype.createTokenRequestHeaders = function (ccsCred) {
+            var headers = {};
+            headers[HeaderNames.CONTENT_TYPE] = Constants.URL_FORM_CONTENT_TYPE;
+            if (!this.config.systemOptions.preventCorsPreflight && ccsCred) {
+                switch (ccsCred.type) {
+                    case CcsCredentialType.HOME_ACCOUNT_ID:
+                        try {
+                            var clientInfo = buildClientInfoFromHomeAccountId(ccsCred.credential);
+                            headers[HeaderNames.CCS_HEADER] = "Oid:" + clientInfo.uid + "@" + clientInfo.utid;
+                        }
+                        catch (e) {
+                            this.logger.verbose("Could not parse home account ID for CCS Header: " + e);
+                        }
+                        break;
+                    case CcsCredentialType.UPN:
+                        headers[HeaderNames.CCS_HEADER] = "UPN: " + ccsCred.credential;
+                        break;
+                }
+            }
+            return headers;
+        };
+        /**
+         * Http post to token endpoint
+         * @param tokenEndpoint
+         * @param queryString
+         * @param headers
+         * @param thumbprint
+         */
+        BaseClient.prototype.executePostToTokenEndpoint = function (tokenEndpoint, queryString, headers, thumbprint) {
+            return __awaiter(this, void 0, void 0, function () {
+                var response;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.networkManager.sendPostRequest(thumbprint, tokenEndpoint, { body: queryString, headers: headers })];
+                        case 1:
+                            response = _a.sent();
+                            if (this.config.serverTelemetryManager && response.status < 500 && response.status !== 429) {
+                                // Telemetry data successfully logged by server, clear Telemetry cache
+                                this.config.serverTelemetryManager.clearTelemetryCache();
+                            }
+                            return [2 /*return*/, response];
+                    }
+                });
+            });
+        };
+        /**
+         * Updates the authority object of the client. Endpoint discovery must be completed.
+         * @param updatedAuthority
+         */
+        BaseClient.prototype.updateAuthority = function (updatedAuthority) {
+            if (!updatedAuthority.discoveryComplete()) {
+                throw ClientAuthError.createEndpointDiscoveryIncompleteError("Updated authority has not completed endpoint discovery.");
+            }
+            this.authority = updatedAuthority;
+        };
+        /**
+         * Creates query string for the /token request
+         * @param request
+         */
+        BaseClient.prototype.createTokenQueryParameters = function (request) {
+            var parameterBuilder = new RequestParameterBuilder();
+            if (request.tokenQueryParameters) {
+                parameterBuilder.addExtraQueryParameters(request.tokenQueryParameters);
+            }
+            return parameterBuilder.createQueryString();
+        };
+        return BaseClient;
+    }());
+
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4264,7 +4321,7 @@
         return IdTokenEntity;
     }(CredentialEntity));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4314,7 +4371,7 @@
         return TimeUtils;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4428,7 +4485,7 @@
         return AccessTokenEntity;
     }(CredentialEntity));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4495,7 +4552,7 @@
         return RefreshTokenEntity;
     }(CredentialEntity));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4534,10 +4591,14 @@
      */
     var InteractionRequiredAuthError = /** @class */ (function (_super) {
         __extends(InteractionRequiredAuthError, _super);
-        function InteractionRequiredAuthError(errorCode, errorMessage, subError) {
+        function InteractionRequiredAuthError(errorCode, errorMessage, subError, timestamp, traceId, correlationId, claims) {
             var _this = _super.call(this, errorCode, errorMessage, subError) || this;
-            _this.name = "InteractionRequiredAuthError";
             Object.setPrototypeOf(_this, InteractionRequiredAuthError.prototype);
+            _this.timestamp = timestamp || Constants.EMPTY_STRING;
+            _this.traceId = traceId || Constants.EMPTY_STRING;
+            _this.correlationId = correlationId || Constants.EMPTY_STRING;
+            _this.claims = claims || Constants.EMPTY_STRING;
+            _this.name = "InteractionRequiredAuthError";
             return _this;
         }
         /**
@@ -4570,7 +4631,7 @@
         return InteractionRequiredAuthError;
     }(AuthError));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4586,7 +4647,7 @@
         return CacheRecord;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4657,7 +4718,7 @@
         return ProtocolUtils;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4891,43 +4952,277 @@
         return UrlString;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
-
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
      */
-    var KeyLocation;
-    (function (KeyLocation) {
-        KeyLocation["SW"] = "sw";
-        KeyLocation["UHW"] = "uhw";
-    })(KeyLocation || (KeyLocation = {}));
-    var PopTokenGenerator = /** @class */ (function () {
-        function PopTokenGenerator(cryptoUtils) {
-            this.cryptoUtils = cryptoUtils;
-        }
+    /**
+     * Enumeration of operations that are instrumented by have their performance measured by the PerformanceClient.
+     *
+     * @export
+     * @enum {number}
+     */
+    exports.PerformanceEvents = void 0;
+    (function (PerformanceEvents) {
         /**
-         * Generates the req_cnf validated at the RP in the POP protocol for SHR parameters
-         * and returns an object containing the keyid, the full req_cnf string and the req_cnf string hash
-         * @param request
-         * @returns
+         * acquireTokenByCode API (msal-browser and msal-node).
+         * Used to acquire tokens by trading an authorization code against the token endpoint.
          */
-        PopTokenGenerator.prototype.generateCnf = function (request) {
-            return __awaiter(this, void 0, void 0, function () {
-                var reqCnf, reqCnfString, _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0: return [4 /*yield*/, this.generateKid(request)];
-                        case 1:
-                            reqCnf = _b.sent();
-                            reqCnfString = this.cryptoUtils.base64Encode(JSON.stringify(reqCnf));
-                            _a = {
-                                kid: reqCnf.kid,
-                                reqCnfString: reqCnfString
-                            };
-                            return [4 /*yield*/, this.cryptoUtils.hashString(reqCnfString)];
-                        case 2: return [2 /*return*/, (_a.reqCnfHash = _b.sent(),
-                                _a)];
+        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 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";
+        /**
+         * Time taken for token acquisition by broker
+         */
+        PerformanceEvents["AcquireTokenByBroker"] = "acquireTokenByBroker";
+        /**
+         * Time spent on the network for refresh token acquisition
+         */
+        PerformanceEvents["RefreshTokenClientExecuteTokenRequest"] = "refreshTokenClientExecuteTokenRequest";
+        /**
+         * Time taken for acquiring refresh token , records RT size
+         */
+        PerformanceEvents["RefreshTokenClientAcquireToken"] = "refreshTokenClientAcquireToken";
+        /**
+         * Time taken for acquiring cached refresh token
+         */
+        PerformanceEvents["RefreshTokenClientAcquireTokenWithCachedRefreshToken"] = "refreshTokenClientAcquireTokenWithCachedRefreshToken";
+        /**
+         * acquireTokenByRefreshToken API in RefreshTokenClient (msal-common).
+         */
+        PerformanceEvents["RefreshTokenClientAcquireTokenByRefreshToken"] = "refreshTokenClientAcquireTokenByRefreshToken";
+        /**
+         * Helper function to create token request body in RefreshTokenClient (msal-common).
+         */
+        PerformanceEvents["RefreshTokenClientCreateTokenRequestBody"] = "refreshTokenClientCreateTokenRequestBody";
+        /**
+         * acquireTokenFromCache (msal-browser).
+         * Internal API for acquiring token from cache
+         */
+        PerformanceEvents["AcquireTokenFromCache"] = "acquireTokenFromCache";
+        /**
+         * acquireTokenBySilentIframe (msal-browser).
+         * Internal API for acquiring token by silent Iframe
+         */
+        PerformanceEvents["AcquireTokenBySilentIframe"] = "acquireTokenBySilentIframe";
+        /**
+         * Internal API for initializing base request in BaseInteractionClient (msal-browser)
+         */
+        PerformanceEvents["InitializeBaseRequest"] = "initializeBaseRequest";
+        /**
+         * Internal API for initializing silent request in SilentCacheClient (msal-browser)
+         */
+        PerformanceEvents["InitializeSilentRequest"] = "initializeSilentRequest";
+        PerformanceEvents["InitializeClientApplication"] = "initializeClientApplication";
+        /**
+         * Helper function in SilentIframeClient class (msal-browser).
+         */
+        PerformanceEvents["SilentIframeClientTokenHelper"] = "silentIframeClientTokenHelper";
+        /**
+         * SilentHandler
+         */
+        PerformanceEvents["SilentHandlerInitiateAuthRequest"] = "silentHandlerInitiateAuthRequest";
+        PerformanceEvents["SilentHandlerMonitorIframeForHash"] = "silentHandlerMonitorIframeForHash";
+        PerformanceEvents["SilentHandlerLoadFrame"] = "silentHandlerLoadFrame";
+        /**
+         * Helper functions in StandardInteractionClient class (msal-browser)
+         */
+        PerformanceEvents["StandardInteractionClientCreateAuthCodeClient"] = "standardInteractionClientCreateAuthCodeClient";
+        PerformanceEvents["StandardInteractionClientGetClientConfiguration"] = "standardInteractionClientGetClientConfiguration";
+        PerformanceEvents["StandardInteractionClientInitializeAuthorizationRequest"] = "standardInteractionClientInitializeAuthorizationRequest";
+        PerformanceEvents["StandardInteractionClientInitializeAuthorizationCodeRequest"] = "standardInteractionClientInitializeAuthorizationCodeRequest";
+        /**
+         * getAuthCodeUrl API (msal-browser and msal-node).
+         */
+        PerformanceEvents["GetAuthCodeUrl"] = "getAuthCodeUrl";
+        /**
+         * Functions from InteractionHandler (msal-browser)
+         */
+        PerformanceEvents["HandleCodeResponseFromServer"] = "handleCodeResponseFromServer";
+        PerformanceEvents["HandleCodeResponseFromHash"] = "handleCodeResponseFromHash";
+        PerformanceEvents["UpdateTokenEndpointAuthority"] = "updateTokenEndpointAuthority";
+        /**
+         * APIs in Authorization Code Client (msal-common)
+         */
+        PerformanceEvents["AuthClientAcquireToken"] = "authClientAcquireToken";
+        PerformanceEvents["AuthClientExecuteTokenRequest"] = "authClientExecuteTokenRequest";
+        PerformanceEvents["AuthClientCreateTokenRequestBody"] = "authClientCreateTokenRequestBody";
+        PerformanceEvents["AuthClientCreateQueryString"] = "authClientCreateQueryString";
+        /**
+         * Generate functions in PopTokenGenerator (msal-common)
+         */
+        PerformanceEvents["PopTokenGenerateCnf"] = "popTokenGenerateCnf";
+        PerformanceEvents["PopTokenGenerateKid"] = "popTokenGenerateKid";
+        /**
+         * handleServerTokenResponse API in ResponseHandler (msal-common)
+         */
+        PerformanceEvents["HandleServerTokenResponse"] = "handleServerTokenResponse";
+        /**
+         * Authority functions
+         */
+        PerformanceEvents["AuthorityFactoryCreateDiscoveredInstance"] = "authorityFactoryCreateDiscoveredInstance";
+        PerformanceEvents["AuthorityResolveEndpointsAsync"] = "authorityResolveEndpointsAsync";
+        PerformanceEvents["AuthorityGetCloudDiscoveryMetadataFromNetwork"] = "authorityGetCloudDiscoveryMetadataFromNetwork";
+        PerformanceEvents["AuthorityUpdateCloudDiscoveryMetadata"] = "authorityUpdateCloudDiscoveryMetadata";
+        PerformanceEvents["AuthorityGetEndpointMetadataFromNetwork"] = "authorityGetEndpointMetadataFromNetwork";
+        PerformanceEvents["AuthorityUpdateEndpointMetadata"] = "authorityUpdateEndpointMetadata";
+        PerformanceEvents["AuthorityUpdateMetadataWithRegionalInformation"] = "authorityUpdateMetadataWithRegionalInformation";
+        /**
+         * Region Discovery functions
+         */
+        PerformanceEvents["RegionDiscoveryDetectRegion"] = "regionDiscoveryDetectRegion";
+        PerformanceEvents["RegionDiscoveryGetRegionFromIMDS"] = "regionDiscoveryGetRegionFromIMDS";
+        PerformanceEvents["RegionDiscoveryGetCurrentVersion"] = "regionDiscoveryGetCurrentVersion";
+        PerformanceEvents["AcquireTokenByCodeAsync"] = "acquireTokenByCodeAsync";
+        PerformanceEvents["GetEndpointMetadataFromNetwork"] = "getEndpointMetadataFromNetwork";
+        PerformanceEvents["GetCloudDiscoveryMetadataFromNetworkMeasurement"] = "getCloudDiscoveryMetadataFromNetworkMeasurement";
+        PerformanceEvents["HandleRedirectPromiseMeasurement"] = "handleRedirectPromiseMeasurement";
+        PerformanceEvents["UpdateCloudDiscoveryMetadataMeasurement"] = "updateCloudDiscoveryMetadataMeasurement";
+        PerformanceEvents["UsernamePasswordClientAcquireToken"] = "usernamePasswordClientAcquireToken";
+        PerformanceEvents["NativeMessageHandlerHandshake"] = "nativeMessageHandlerHandshake";
+    })(exports.PerformanceEvents || (exports.PerformanceEvents = {}));
+    /**
+     * State of the performance event.
+     *
+     * @export
+     * @enum {number}
+     */
+    var PerformanceEventStatus;
+    (function (PerformanceEventStatus) {
+        PerformanceEventStatus[PerformanceEventStatus["NotStarted"] = 0] = "NotStarted";
+        PerformanceEventStatus[PerformanceEventStatus["InProgress"] = 1] = "InProgress";
+        PerformanceEventStatus[PerformanceEventStatus["Completed"] = 2] = "Completed";
+    })(PerformanceEventStatus || (PerformanceEventStatus = {}));
+    var IntFields = new Set([
+        "accessTokenSize",
+        "durationMs",
+        "idTokenSize",
+        "matsSilentStatus",
+        "matsHttpStatus",
+        "refreshTokenSize",
+        "queuedTimeMs",
+        "startTimeMs",
+        "status",
+    ]);
+
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
+
+    /*
+     * Copyright (c) Microsoft Corporation. All rights reserved.
+     * Licensed under the MIT License.
+     */
+    var KeyLocation;
+    (function (KeyLocation) {
+        KeyLocation["SW"] = "sw";
+        KeyLocation["UHW"] = "uhw";
+    })(KeyLocation || (KeyLocation = {}));
+    var PopTokenGenerator = /** @class */ (function () {
+        function PopTokenGenerator(cryptoUtils, performanceClient) {
+            this.cryptoUtils = cryptoUtils;
+            this.performanceClient = performanceClient;
+        }
+        /**
+         * Generates the req_cnf validated at the RP in the POP protocol for SHR parameters
+         * and returns an object containing the keyid, the full req_cnf string and the req_cnf string hash
+         * @param request
+         * @returns
+         */
+        PopTokenGenerator.prototype.generateCnf = function (request) {
+            var _a, _b;
+            return __awaiter(this, void 0, void 0, function () {
+                var reqCnf, reqCnfString, _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.PopTokenGenerateCnf, request.correlationId);
+                            (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.PopTokenGenerateKid, request.correlationId);
+                            return [4 /*yield*/, this.generateKid(request)];
+                        case 1:
+                            reqCnf = _d.sent();
+                            reqCnfString = this.cryptoUtils.base64Encode(JSON.stringify(reqCnf));
+                            _c = {
+                                kid: reqCnf.kid,
+                                reqCnfString: reqCnfString
+                            };
+                            return [4 /*yield*/, this.cryptoUtils.hashString(reqCnfString)];
+                        case 2: return [2 /*return*/, (_c.reqCnfHash = _d.sent(),
+                                _c)];
                     }
                 });
             });
@@ -4938,13 +5233,16 @@
          * @returns
          */
         PopTokenGenerator.prototype.generateKid = function (request) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var kidThumbprint;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.cryptoUtils.getPublicKeyThumbprint(request)];
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.PopTokenGenerateKid, request.correlationId);
+                            return [4 /*yield*/, this.cryptoUtils.getPublicKeyThumbprint(request)];
                         case 1:
-                            kidThumbprint = _a.sent();
+                            kidThumbprint = _b.sent();
                             return [2 /*return*/, {
                                     kid: kidThumbprint,
                                     xms_ksl: KeyLocation.SW
@@ -4992,7 +5290,7 @@
         return PopTokenGenerator;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5062,7 +5360,7 @@
         return AppMetadataEntity;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5098,7 +5396,7 @@
         return TokenCacheContext;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5108,13 +5406,14 @@
      * Class that handles response parsing.
      */
     var ResponseHandler = /** @class */ (function () {
-        function ResponseHandler(clientId, cacheStorage, cryptoObj, logger, serializableCache, persistencePlugin) {
+        function ResponseHandler(clientId, cacheStorage, cryptoObj, logger, serializableCache, persistencePlugin, performanceClient) {
             this.clientId = clientId;
             this.cacheStorage = cacheStorage;
             this.cryptoObj = cryptoObj;
             this.logger = logger;
             this.serializableCache = serializableCache;
             this.persistencePlugin = persistencePlugin;
+            this.performanceClient = performanceClient;
         }
         /**
          * Function which validates server authorization code response.
@@ -5132,7 +5431,7 @@
             // Check for error
             if (serverResponseHash.error || serverResponseHash.error_description || serverResponseHash.suberror) {
                 if (InteractionRequiredAuthError.isInteractionRequiredError(serverResponseHash.error, serverResponseHash.error_description, serverResponseHash.suberror)) {
-                    throw new InteractionRequiredAuthError(serverResponseHash.error || Constants.EMPTY_STRING, serverResponseHash.error_description, serverResponseHash.suberror);
+                    throw new InteractionRequiredAuthError(serverResponseHash.error || Constants.EMPTY_STRING, serverResponseHash.error_description, serverResponseHash.suberror, serverResponseHash.timestamp || Constants.EMPTY_STRING, serverResponseHash.trace_id || Constants.EMPTY_STRING, serverResponseHash.correlation_id || Constants.EMPTY_STRING, serverResponseHash.claims || Constants.EMPTY_STRING);
                 }
                 throw new ServerError(serverResponseHash.error || Constants.EMPTY_STRING, serverResponseHash.error_description, serverResponseHash.suberror);
             }
@@ -5148,7 +5447,7 @@
             // Check for error
             if (serverResponse.error || serverResponse.error_description || serverResponse.suberror) {
                 if (InteractionRequiredAuthError.isInteractionRequiredError(serverResponse.error, serverResponse.error_description, serverResponse.suberror)) {
-                    throw new InteractionRequiredAuthError(serverResponse.error, serverResponse.error_description, serverResponse.suberror);
+                    throw new InteractionRequiredAuthError(serverResponse.error, serverResponse.error_description, serverResponse.suberror, serverResponse.timestamp || Constants.EMPTY_STRING, serverResponse.trace_id || Constants.EMPTY_STRING, serverResponse.correlation_id || Constants.EMPTY_STRING, serverResponse.claims || Constants.EMPTY_STRING);
                 }
                 var errString = serverResponse.error_codes + " - [" + serverResponse.timestamp + "]: " + serverResponse.error_description + " - Correlation ID: " + serverResponse.correlation_id + " - Trace ID: " + serverResponse.trace_id;
                 throw new ServerError(serverResponse.error, errString, serverResponse.suberror);
@@ -5160,11 +5459,13 @@
          * @param authority
          */
         ResponseHandler.prototype.handleServerTokenResponse = function (serverTokenResponse, authority, reqTimestamp, request, authCodePayload, userAssertionHash, handlingRefreshTokenResponse, forceCacheRefreshTokenResponse, serverRequestId) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var idTokenObj, authTime, requestStateObj, cacheRecord, cacheContext, key, account;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.HandleServerTokenResponse, serverTokenResponse.correlation_id);
                             if (serverTokenResponse.id_token) {
                                 idTokenObj = new AuthToken(serverTokenResponse.id_token || Constants.EMPTY_STRING, this.cryptoObj);
                                 // token nonce check (TODO: Add a warning if no nonce is given?)
@@ -5190,16 +5491,16 @@
                             // Add keyId from request to serverTokenResponse if defined
                             serverTokenResponse.key_id = serverTokenResponse.key_id || request.sshKid || undefined;
                             cacheRecord = this.generateCacheRecord(serverTokenResponse, authority, reqTimestamp, request, idTokenObj, userAssertionHash, authCodePayload);
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, , 5, 8]);
+                            _b.trys.push([1, , 5, 8]);
                             if (!(this.persistencePlugin && this.serializableCache)) return [3 /*break*/, 3];
                             this.logger.verbose("Persistence enabled, calling beforeCacheAccess");
                             cacheContext = new TokenCacheContext(this.serializableCache, true);
                             return [4 /*yield*/, this.persistencePlugin.beforeCacheAccess(cacheContext)];
                         case 2:
-                            _a.sent();
-                            _a.label = 3;
+                            _b.sent();
+                            _b.label = 3;
                         case 3:
                             /*
                              * When saving a refreshed tokens to the cache, it is expected that the account that was used is present in the cache.
@@ -5217,17 +5518,17 @@
                             }
                             return [4 /*yield*/, this.cacheStorage.saveCacheRecord(cacheRecord)];
                         case 4:
-                            _a.sent();
+                            _b.sent();
                             return [3 /*break*/, 8];
                         case 5:
                             if (!(this.persistencePlugin && this.serializableCache && cacheContext)) return [3 /*break*/, 7];
                             this.logger.verbose("Persistence enabled, calling afterCacheAccess");
                             return [4 /*yield*/, this.persistencePlugin.afterCacheAccess(cacheContext)];
                         case 6:
-                            _a.sent();
-                            _a.label = 7;
+                            _b.sent();
+                            _b.label = 7;
                         case 7: return [7 /*endfinally*/];
-                        case 8: return [2 /*return*/, ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenObj, requestStateObj, serverTokenResponse.spa_code, serverRequestId)];
+                        case 8: return [2 /*return*/, ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenObj, requestStateObj, serverTokenResponse, serverRequestId)];
                     }
                 });
             });
@@ -5313,7 +5614,7 @@
          * @param fromTokenCache
          * @param stateString
          */
-        ResponseHandler.generateAuthenticationResult = function (cryptoObj, authority, cacheRecord, fromTokenCache, request, idTokenObj, requestState, code, requestId) {
+        ResponseHandler.generateAuthenticationResult = function (cryptoObj, authority, cacheRecord, fromTokenCache, request, idTokenObj, requestState, serverTokenResponse, requestId) {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
                 var accessToken, responseScopes, expiresOn, extExpiresOn, familyId, popTokenGenerator, _d, secret, keyId, uid, tid;
@@ -5349,6 +5650,10 @@
                             }
                             uid = (idTokenObj === null || idTokenObj === void 0 ? void 0 : idTokenObj.claims.oid) || (idTokenObj === null || idTokenObj === void 0 ? void 0 : idTokenObj.claims.sub) || Constants.EMPTY_STRING;
                             tid = (idTokenObj === null || idTokenObj === void 0 ? void 0 : idTokenObj.claims.tid) || Constants.EMPTY_STRING;
+                            // for hybrid + native bridge enablement, send back the native account Id
+                            if ((serverTokenResponse === null || serverTokenResponse === void 0 ? void 0 : serverTokenResponse.spa_accountid) && !!cacheRecord.account) {
+                                cacheRecord.account.nativeAccountId = serverTokenResponse === null || serverTokenResponse === void 0 ? void 0 : serverTokenResponse.spa_accountid;
+                            }
                             return [2 /*return*/, {
                                     authority: authority.canonicalAuthority,
                                     uniqueId: uid,
@@ -5368,7 +5673,7 @@
                                     state: requestState ? requestState.userRequestState : Constants.EMPTY_STRING,
                                     cloudGraphHostName: ((_b = cacheRecord.account) === null || _b === void 0 ? void 0 : _b.cloudGraphHostName) || Constants.EMPTY_STRING,
                                     msGraphHost: ((_c = cacheRecord.account) === null || _c === void 0 ? void 0 : _c.msGraphHost) || Constants.EMPTY_STRING,
-                                    code: code,
+                                    code: serverTokenResponse === null || serverTokenResponse === void 0 ? void 0 : serverTokenResponse.spa_code,
                                     fromNativeBroker: false,
                                 }];
                     }
@@ -5378,7 +5683,7 @@
         return ResponseHandler;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5406,13 +5711,17 @@
          * @param request
          */
         AuthorizationCodeClient.prototype.getAuthCodeUrl = function (request) {
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
                 var queryString;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.createAuthCodeUrlQueryString(request)];
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.GetAuthCodeUrl, request.correlationId);
+                            (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.AuthClientCreateQueryString, request.correlationId);
+                            return [4 /*yield*/, this.createAuthCodeUrlQueryString(request)];
                         case 1:
-                            queryString = _a.sent();
+                            queryString = _c.sent();
                             return [2 /*return*/, UrlString.appendQueryString(this.authority.authorizationEndpoint, queryString)];
                     }
                 });
@@ -5424,32 +5733,35 @@
          * @param request
          */
         AuthorizationCodeClient.prototype.acquireToken = function (request, authCodePayload) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f;
             return __awaiter(this, void 0, void 0, function () {
                 var atsMeasurement, reqTimestamp, response, requestId, httpVerAuthority, responseHandler;
                 var _this = this;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
-                            atsMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement("AuthCodeClientAcquireToken", request.correlationId);
-                            this.logger.info("in acquireToken call in auth-code client");
-                            if (!request || StringUtils.isEmpty(request.code)) {
+                            if (!request || !request.code) {
                                 throw ClientAuthError.createTokenRequestCannotBeMadeError();
                             }
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthClientAcquireToken, request.correlationId);
+                            atsMeasurement = (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.startMeasurement("AuthCodeClientAcquireToken", request.correlationId);
+                            this.logger.info("in acquireToken call in auth-code client");
                             reqTimestamp = TimeUtils.nowSeconds();
+                            (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.AuthClientExecuteTokenRequest, request.correlationId);
                             return [4 /*yield*/, this.executeTokenRequest(this.authority, request)];
                         case 1:
-                            response = _d.sent();
-                            requestId = (_b = response.headers) === null || _b === void 0 ? void 0 : _b[HeaderNames.X_MS_REQUEST_ID];
-                            httpVerAuthority = (_c = response.headers) === null || _c === void 0 ? void 0 : _c[HeaderNames.X_MS_HTTP_VERSION];
+                            response = _g.sent();
+                            requestId = (_d = response.headers) === null || _d === void 0 ? void 0 : _d[HeaderNames.X_MS_REQUEST_ID];
+                            httpVerAuthority = (_e = response.headers) === null || _e === void 0 ? void 0 : _e[HeaderNames.X_MS_HTTP_VERSION];
                             if (httpVerAuthority) {
                                 atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.addStaticFields({
                                     httpVerAuthority: httpVerAuthority
                                 });
                             }
-                            responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin);
+                            responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin, this.performanceClient);
                             // Validate response. This function throws a server error if an error is returned by the server.
                             responseHandler.validateTokenResponse(response.body);
+                            (_f = this.performanceClient) === null || _f === void 0 ? void 0 : _f.setPreQueueTime(exports.PerformanceEvents.HandleServerTokenResponse, request.correlationId);
                             return [2 /*return*/, responseHandler.handleServerTokenResponse(response.body, this.authority, reqTimestamp, request, authCodePayload, undefined, undefined, undefined, requestId).then(function (result) {
                                     atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.endMeasurement({
                                         success: true
@@ -5511,26 +5823,19 @@
          * @param request
          */
         AuthorizationCodeClient.prototype.executeTokenRequest = function (authority, request) {
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var thumbprint, requestBody, queryParameters, ccsCredential, clientInfo, headers, endpoint;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                var queryParametersString, endpoint, requestBody, ccsCredential, clientInfo, headers, thumbprint;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
-                            thumbprint = {
-                                clientId: this.config.authOptions.clientId,
-                                authority: authority.canonicalAuthority,
-                                scopes: request.scopes,
-                                claims: request.claims,
-                                authenticationScheme: request.authenticationScheme,
-                                resourceRequestMethod: request.resourceRequestMethod,
-                                resourceRequestUri: request.resourceRequestUri,
-                                shrClaims: request.shrClaims,
-                                sshKid: request.sshKid
-                            };
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthClientExecuteTokenRequest, request.correlationId);
+                            (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.AuthClientCreateTokenRequestBody, request.correlationId);
+                            queryParametersString = this.createTokenQueryParameters(request);
+                            endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParametersString);
                             return [4 /*yield*/, this.createTokenRequestBody(request)];
                         case 1:
-                            requestBody = _a.sent();
-                            queryParameters = this.createTokenQueryParameters(request);
+                            requestBody = _c.sent();
                             ccsCredential = undefined;
                             if (request.clientInfo) {
                                 try {
@@ -5545,34 +5850,35 @@
                                 }
                             }
                             headers = this.createTokenRequestHeaders(ccsCredential || request.ccsCredential);
-                            endpoint = StringUtils.isEmpty(queryParameters) ? authority.tokenEndpoint : authority.tokenEndpoint + "?" + queryParameters;
+                            thumbprint = {
+                                clientId: this.config.authOptions.clientId,
+                                authority: authority.canonicalAuthority,
+                                scopes: request.scopes,
+                                claims: request.claims,
+                                authenticationScheme: request.authenticationScheme,
+                                resourceRequestMethod: request.resourceRequestMethod,
+                                resourceRequestUri: request.resourceRequestUri,
+                                shrClaims: request.shrClaims,
+                                sshKid: request.sshKid
+                            };
                             return [2 /*return*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)];
                     }
                 });
             });
         };
-        /**
-         * Creates query string for the /token request
-         * @param request
-         */
-        AuthorizationCodeClient.prototype.createTokenQueryParameters = function (request) {
-            var parameterBuilder = new RequestParameterBuilder();
-            if (request.tokenQueryParameters) {
-                parameterBuilder.addExtraQueryParameters(request.tokenQueryParameters);
-            }
-            return parameterBuilder.createQueryString();
-        };
         /**
          * Generates a map for all the params to be sent to the service
          * @param request
          */
         AuthorizationCodeClient.prototype.createTokenRequestBody = function (request) {
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
                 var parameterBuilder, clientAssertion, popTokenGenerator, reqCnfData, correlationId, ccsCred, clientInfo, clientInfo;
-                var _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthClientCreateTokenRequestBody, request.correlationId);
                             parameterBuilder = new RequestParameterBuilder();
                             parameterBuilder.addClientId(this.config.authOptions.clientId);
                             /*
@@ -5613,10 +5919,11 @@
                             parameterBuilder.addGrantType(GrantType.AUTHORIZATION_CODE_GRANT);
                             parameterBuilder.addClientInfo();
                             if (!(request.authenticationScheme === exports.AuthenticationScheme.POP)) return [3 /*break*/, 2];
-                            popTokenGenerator = new PopTokenGenerator(this.cryptoUtils);
+                            popTokenGenerator = new PopTokenGenerator(this.cryptoUtils, this.performanceClient);
+                            (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.PopTokenGenerateCnf, request.correlationId);
                             return [4 /*yield*/, popTokenGenerator.generateCnf(request)];
                         case 1:
-                            reqCnfData = _b.sent();
+                            reqCnfData = _d.sent();
                             // SPA PoP requires full Base64Url encoded req_cnf string (unhashed)
                             parameterBuilder.addPopToken(reqCnfData.reqCnfString);
                             return [3 /*break*/, 3];
@@ -5629,7 +5936,7 @@
                                     throw ClientConfigurationError.createMissingSshJwkError();
                                 }
                             }
-                            _b.label = 3;
+                            _d.label = 3;
                         case 3:
                             correlationId = request.correlationId || this.config.cryptoInterface.createNewGuid();
                             parameterBuilder.addCorrelationId(correlationId);
@@ -5674,9 +5981,9 @@
                             }
                             // Add hybrid spa parameters if not already provided
                             if (request.enableSpaAuthorizationCode && (!request.tokenBodyParameters || !request.tokenBodyParameters[AADServerParamKeys.RETURN_SPA_CODE])) {
-                                parameterBuilder.addExtraQueryParameters((_a = {},
-                                    _a[AADServerParamKeys.RETURN_SPA_CODE] = "1",
-                                    _a));
+                                parameterBuilder.addExtraQueryParameters((_c = {},
+                                    _c[AADServerParamKeys.RETURN_SPA_CODE] = "1",
+                                    _c));
                             }
                             return [2 /*return*/, parameterBuilder.createQueryString()];
                     }
@@ -5688,11 +5995,13 @@
          * @param request
          */
         AuthorizationCodeClient.prototype.createAuthCodeUrlQueryString = function (request) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var parameterBuilder, requestScopes, correlationId, accountSid, accountLoginHintClaim, clientInfo, clientInfo, clientInfo, popTokenGenerator, reqCnfData;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthClientCreateQueryString, request.correlationId);
                             parameterBuilder = new RequestParameterBuilder();
                             parameterBuilder.addClientId(this.config.authOptions.clientId);
                             requestScopes = __spreadArrays(request.scopes || [], request.extraScopesToConsent || []);
@@ -5803,9 +6112,9 @@
                             popTokenGenerator = new PopTokenGenerator(this.cryptoUtils);
                             return [4 /*yield*/, popTokenGenerator.generateCnf(request)];
                         case 1:
-                            reqCnfData = _a.sent();
+                            reqCnfData = _b.sent();
                             parameterBuilder.addPopToken(reqCnfData.reqCnfHash);
-                            _a.label = 2;
+                            _b.label = 2;
                         case 2: return [2 /*return*/, parameterBuilder.createQueryString()];
                     }
                 });
@@ -5852,137 +6161,7 @@
         return AuthorizationCodeClient;
     }(BaseClient));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
-    /*
-     * 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 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";
-        /**
-         * Time taken for token acquisition by broker
-         */
-        PerformanceEvents["AcquireTokenByBroker"] = "acquireTokenByBroker";
-        /**
-         * Time spent on the network for refresh token acquisition
-         */
-        PerformanceEvents["RefreshTokenClientExecuteTokenRequest"] = "refreshTokenClientExecuteTokenRequest";
-        /**
-         * Time taken for acquiring refresh token , records RT size
-         */
-        PerformanceEvents["RefreshTokenClientAcquireToken"] = "refreshTokenClientAcquireToken";
-        /**
-         * Time taken for acquiring cached refresh token
-         */
-        PerformanceEvents["RefreshTokenClientAcquireTokenWithCachedRefreshToken"] = "refreshTokenClientAcquireTokenWithCachedRefreshToken";
-        PerformanceEvents["GetEndpointMetadataFromNetwork"] = "getEndpointMetadataFromNetwork";
-        PerformanceEvents["GetCloudDiscoveryMetadataFromNetworkMeasurement"] = "getCloudDiscoveryMetadataFromNetworkMeasurement";
-        PerformanceEvents["HandleRedirectPromiseMeasurement"] = "handleRedirectPromiseMeasurement";
-        PerformanceEvents["UpdateCloudDiscoveryMetadataMeasurement"] = "updateCloudDiscoveryMetadataMeasurement";
-        PerformanceEvents["UsernamePasswordClientAcquireToken"] = "usernamePasswordClientAcquireToken";
-    })(exports.PerformanceEvents || (exports.PerformanceEvents = {}));
-    /**
-     * State of the performance event.
-     *
-     * @export
-     * @enum {number}
-     */
-    var PerformanceEventStatus;
-    (function (PerformanceEventStatus) {
-        PerformanceEventStatus[PerformanceEventStatus["NotStarted"] = 0] = "NotStarted";
-        PerformanceEventStatus[PerformanceEventStatus["InProgress"] = 1] = "InProgress";
-        PerformanceEventStatus[PerformanceEventStatus["Completed"] = 2] = "Completed";
-    })(PerformanceEventStatus || (PerformanceEventStatus = {}));
-
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5997,31 +6176,34 @@
             return _super.call(this, configuration, performanceClient) || this;
         }
         RefreshTokenClient.prototype.acquireToken = function (request) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f, _g;
             return __awaiter(this, void 0, void 0, function () {
                 var atsMeasurement, reqTimestamp, response, httpVerToken, requestId, responseHandler;
                 var _this = this;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_h) {
+                    switch (_h.label) {
                         case 0:
-                            atsMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
+                            atsMeasurement = (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.startMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
                             this.logger.verbose("RefreshTokenClientAcquireToken called", request.correlationId);
                             reqTimestamp = TimeUtils.nowSeconds();
+                            (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
                             return [4 /*yield*/, this.executeTokenRequest(request, this.authority)];
                         case 1:
-                            response = _e.sent();
-                            httpVerToken = (_b = response.headers) === null || _b === void 0 ? void 0 : _b[HeaderNames.X_MS_HTTP_VERSION];
+                            response = _h.sent();
+                            httpVerToken = (_d = response.headers) === null || _d === void 0 ? void 0 : _d[HeaderNames.X_MS_HTTP_VERSION];
                             atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.addStaticFields({
-                                refreshTokenSize: ((_c = response.body.refresh_token) === null || _c === void 0 ? void 0 : _c.length) || 0,
+                                refreshTokenSize: ((_e = response.body.refresh_token) === null || _e === void 0 ? void 0 : _e.length) || 0,
                             });
                             if (httpVerToken) {
                                 atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.addStaticFields({
                                     httpVerToken: httpVerToken,
                                 });
                             }
-                            requestId = (_d = response.headers) === null || _d === void 0 ? void 0 : _d[HeaderNames.X_MS_REQUEST_ID];
+                            requestId = (_f = response.headers) === null || _f === void 0 ? void 0 : _f[HeaderNames.X_MS_REQUEST_ID];
                             responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin);
                             responseHandler.validateTokenResponse(response.body);
+                            (_g = this.performanceClient) === null || _g === void 0 ? void 0 : _g.setPreQueueTime(exports.PerformanceEvents.HandleServerTokenResponse, request.correlationId);
                             return [2 /*return*/, responseHandler.handleServerTokenResponse(response.body, this.authority, reqTimestamp, request, undefined, undefined, true, request.forceCache, requestId).then(function (result) {
                                     atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.endMeasurement({
                                         success: true
@@ -6046,13 +6228,15 @@
          * @param request
          */
         RefreshTokenClient.prototype.acquireTokenByRefreshToken = function (request) {
+            var _a, _b, _c, _d;
             return __awaiter(this, void 0, void 0, function () {
                 var isFOCI, noFamilyRTInCache, clientMismatchErrorWithFamilyRT;
-                return __generator(this, function (_a) {
+                return __generator(this, function (_e) {
                     // Cannot renew token if no request object is given.
                     if (!request) {
                         throw ClientConfigurationError.createEmptyTokenRequestError();
                     }
+                    (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireTokenByRefreshToken, request.correlationId);
                     // We currently do not support silent flow for account === null use cases; This will be revisited for confidential flow usecases
                     if (!request.account) {
                         throw ClientAuthError.createNoAccountInSilentRequestError();
@@ -6061,6 +6245,7 @@
                     // if the app is part of the family, retrive a Family refresh token if present and make a refreshTokenRequest
                     if (isFOCI) {
                         try {
+                            (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
                             return [2 /*return*/, this.acquireTokenWithCachedRefreshToken(request, true)];
                         }
                         catch (e) {
@@ -6068,6 +6253,7 @@
                             clientMismatchErrorWithFamilyRT = e instanceof ServerError && e.errorCode === Errors.INVALID_GRANT_ERROR && e.subError === Errors.CLIENT_MISMATCH_ERROR;
                             // if family Refresh Token (FRT) cache acquisition fails or if client_mismatch error is seen with FRT, reattempt with application Refresh Token (ART)
                             if (noFamilyRTInCache || clientMismatchErrorWithFamilyRT) {
+                                (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
                                 return [2 /*return*/, this.acquireTokenWithCachedRefreshToken(request, false)];
                                 // throw in all other cases
                             }
@@ -6077,6 +6263,7 @@
                         }
                     }
                     // fall back to application refresh token acquisition
+                    (_d = this.performanceClient) === null || _d === void 0 ? void 0 : _d.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
                     return [2 /*return*/, this.acquireTokenWithCachedRefreshToken(request, false)];
                 });
             });
@@ -6086,11 +6273,12 @@
          * @param request
          */
         RefreshTokenClient.prototype.acquireTokenWithCachedRefreshToken = function (request, foci) {
-            var _a;
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
                 var atsMeasurement, refreshToken, refreshTokenRequest;
-                return __generator(this, function (_b) {
-                    atsMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
+                return __generator(this, function (_d) {
+                    (_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);
                     if (!refreshToken) {
@@ -6105,6 +6293,7 @@
                             credential: request.account.homeAccountId,
                             type: CcsCredentialType.HOME_ACCOUNT_ID
                         } });
+                    (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
                     return [2 /*return*/, this.acquireToken(refreshTokenRequest)];
                 });
             });
@@ -6115,17 +6304,20 @@
          * @param authority
          */
         RefreshTokenClient.prototype.executeTokenRequest = function (request, authority) {
-            var _a;
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var acquireTokenMeasurement, requestBody, queryParameters, headers, thumbprint, endpoint;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var acquireTokenMeasurement, queryParametersString, endpoint, requestBody, headers, thumbprint;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
-                            acquireTokenMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
+                            acquireTokenMeasurement = (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.startMeasurement(exports.PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
+                            (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientCreateTokenRequestBody, request.correlationId);
+                            queryParametersString = this.createTokenQueryParameters(request);
+                            endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParametersString);
                             return [4 /*yield*/, this.createTokenRequestBody(request)];
                         case 1:
-                            requestBody = _b.sent();
-                            queryParameters = this.createTokenQueryParameters(request);
+                            requestBody = _d.sent();
                             headers = this.createTokenRequestHeaders(request.ccsCredential);
                             thumbprint = {
                                 clientId: this.config.authOptions.clientId,
@@ -6138,7 +6330,6 @@
                                 shrClaims: request.shrClaims,
                                 sshKid: request.sshKid
                             };
-                            endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParameters);
                             return [2 /*return*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)
                                     .then(function (result) {
                                     acquireTokenMeasurement === null || acquireTokenMeasurement === void 0 ? void 0 : acquireTokenMeasurement.endMeasurement({
@@ -6156,30 +6347,20 @@
                 });
             });
         };
-        /**
-         * Creates query string for the /token request
-         * @param request
-         */
-        RefreshTokenClient.prototype.createTokenQueryParameters = function (request) {
-            var parameterBuilder = new RequestParameterBuilder();
-            if (request.tokenQueryParameters) {
-                parameterBuilder.addExtraQueryParameters(request.tokenQueryParameters);
-            }
-            return parameterBuilder.createQueryString();
-        };
         /**
          * Helper function to create the token request body
          * @param request
          */
         RefreshTokenClient.prototype.createTokenRequestBody = function (request) {
-            var _a;
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
                 var correlationId, acquireTokenMeasurement, parameterBuilder, clientAssertion, popTokenGenerator, reqCnfData, clientInfo;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RefreshTokenClientCreateTokenRequestBody, request.correlationId);
                             correlationId = request.correlationId;
-                            acquireTokenMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.BaseClientCreateTokenRequestHeaders, correlationId);
+                            acquireTokenMeasurement = (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.startMeasurement(exports.PerformanceEvents.BaseClientCreateTokenRequestHeaders, correlationId);
                             parameterBuilder = new RequestParameterBuilder();
                             parameterBuilder.addClientId(this.config.authOptions.clientId);
                             parameterBuilder.addScopes(request.scopes);
@@ -6202,10 +6383,11 @@
                                 parameterBuilder.addClientAssertionType(clientAssertion.assertionType);
                             }
                             if (!(request.authenticationScheme === exports.AuthenticationScheme.POP)) return [3 /*break*/, 2];
-                            popTokenGenerator = new PopTokenGenerator(this.cryptoUtils);
+                            popTokenGenerator = new PopTokenGenerator(this.cryptoUtils, this.performanceClient);
+                            (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.PopTokenGenerateCnf, request.correlationId);
                             return [4 /*yield*/, popTokenGenerator.generateCnf(request)];
                         case 1:
-                            reqCnfData = _b.sent();
+                            reqCnfData = _d.sent();
                             // SPA PoP requires full Base64Url encoded req_cnf string (unhashed)
                             parameterBuilder.addPopToken(reqCnfData.reqCnfString);
                             return [3 /*break*/, 3];
@@ -6221,7 +6403,7 @@
                                     throw ClientConfigurationError.createMissingSshJwkError();
                                 }
                             }
-                            _b.label = 3;
+                            _d.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);
@@ -6253,7 +6435,7 @@
         return RefreshTokenClient;
     }(BaseClient));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6377,7 +6559,7 @@
         return SilentFlowClient;
     }(BaseClient));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6389,7 +6571,7 @@
             response.hasOwnProperty("jwks_uri"));
     }
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6398,7 +6580,7 @@
     var EndpointMetadata = rawMetdataJSON.endpointMetadata;
     var InstanceDiscoveryMetadata = rawMetdataJSON.instanceDiscoveryMetadata;
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6412,7 +6594,7 @@
         ProtocolMode["OIDC"] = "OIDC";
     })(exports.ProtocolMode || (exports.ProtocolMode = {}));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6489,7 +6671,7 @@
         return AuthorityMetadataEntity;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6499,7 +6681,7 @@
             response.hasOwnProperty("metadata"));
     }
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6509,68 +6691,72 @@
             response.hasOwnProperty("error_description"));
     }
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
      */
     var RegionDiscovery = /** @class */ (function () {
-        function RegionDiscovery(networkInterface) {
+        function RegionDiscovery(networkInterface, performanceClient, correlationId) {
             this.networkInterface = networkInterface;
+            this.performanceClient = performanceClient;
+            this.correlationId = correlationId;
         }
         /**
          * Detect the region from the application's environment.
          *
          * @returns Promise<string | null>
          */
-        RegionDiscovery.prototype.detectRegion = function (environmentRegion, regionDiscoveryMetadata, proxyUrl) {
+        RegionDiscovery.prototype.detectRegion = function (environmentRegion, regionDiscoveryMetadata) {
+            var _a, _b, _c, _d;
             return __awaiter(this, void 0, void 0, function () {
                 var autodetectedRegionName, options, localIMDSVersionResponse, currentIMDSVersion, currentIMDSVersionResponse;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RegionDiscoveryDetectRegion, this.correlationId);
                             autodetectedRegionName = environmentRegion;
                             if (!!autodetectedRegionName) return [3 /*break*/, 8];
                             options = RegionDiscovery.IMDS_OPTIONS;
-                            if (proxyUrl) {
-                                options.proxyUrl = proxyUrl;
-                            }
-                            _a.label = 1;
+                            _e.label = 1;
                         case 1:
-                            _a.trys.push([1, 6, , 7]);
+                            _e.trys.push([1, 6, , 7]);
+                            (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.RegionDiscoveryGetRegionFromIMDS, this.correlationId);
                             return [4 /*yield*/, this.getRegionFromIMDS(Constants.IMDS_VERSION, options)];
                         case 2:
-                            localIMDSVersionResponse = _a.sent();
+                            localIMDSVersionResponse = _e.sent();
                             if (localIMDSVersionResponse.status === ResponseCodes.httpSuccess) {
                                 autodetectedRegionName = localIMDSVersionResponse.body;
                                 regionDiscoveryMetadata.region_source = RegionDiscoverySources.IMDS;
                             }
                             if (!(localIMDSVersionResponse.status === ResponseCodes.httpBadRequest)) return [3 /*break*/, 5];
+                            (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.RegionDiscoveryGetCurrentVersion, this.correlationId);
                             return [4 /*yield*/, this.getCurrentVersion(options)];
                         case 3:
-                            currentIMDSVersion = _a.sent();
+                            currentIMDSVersion = _e.sent();
                             if (!currentIMDSVersion) {
                                 regionDiscoveryMetadata.region_source = RegionDiscoverySources.FAILED_AUTO_DETECTION;
                                 return [2 /*return*/, null];
                             }
+                            (_d = this.performanceClient) === null || _d === void 0 ? void 0 : _d.setPreQueueTime(exports.PerformanceEvents.RegionDiscoveryGetRegionFromIMDS, this.correlationId);
                             return [4 /*yield*/, this.getRegionFromIMDS(currentIMDSVersion, options)];
                         case 4:
-                            currentIMDSVersionResponse = _a.sent();
+                            currentIMDSVersionResponse = _e.sent();
                             if (currentIMDSVersionResponse.status === ResponseCodes.httpSuccess) {
                                 autodetectedRegionName = currentIMDSVersionResponse.body;
                                 regionDiscoveryMetadata.region_source = RegionDiscoverySources.IMDS;
                             }
-                            _a.label = 5;
+                            _e.label = 5;
                         case 5: return [3 /*break*/, 7];
                         case 6:
-                            _a.sent();
+                            _e.sent();
                             regionDiscoveryMetadata.region_source = RegionDiscoverySources.FAILED_AUTO_DETECTION;
                             return [2 /*return*/, null];
                         case 7: return [3 /*break*/, 9];
                         case 8:
                             regionDiscoveryMetadata.region_source = RegionDiscoverySources.ENVIRONMENT_VARIABLE;
-                            _a.label = 9;
+                            _e.label = 9;
                         case 9:
                             // If no region was auto detected from the environment or from the IMDS endpoint, mark the attempt as a FAILED_AUTO_DETECTION
                             if (!autodetectedRegionName) {
@@ -6588,8 +6774,10 @@
          * @returns Promise<NetworkResponse<string>>
          */
         RegionDiscovery.prototype.getRegionFromIMDS = function (version, options) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
+                return __generator(this, function (_b) {
+                    (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RegionDiscoveryGetRegionFromIMDS, this.correlationId);
                     return [2 /*return*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?api-version=" + version + "&format=text", options, Constants.IMDS_TIMEOUT)];
                 });
             });
@@ -6600,24 +6788,28 @@
          * @returns Promise<string | null>
          */
         RegionDiscovery.prototype.getCurrentVersion = function (options) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var response;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
-                            _a.trys.push([0, 2, , 3]);
-                            return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?format=json", options)];
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RegionDiscoveryGetCurrentVersion, this.correlationId);
+                            _b.label = 1;
                         case 1:
-                            response = _a.sent();
+                            _b.trys.push([1, 3, , 4]);
+                            return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?format=json", options)];
+                        case 2:
+                            response = _b.sent();
                             // When IMDS endpoint is called without the api version query param, bad request response comes back with latest version.
                             if (response.status === ResponseCodes.httpBadRequest && response.body && response.body["newest-versions"] && response.body["newest-versions"].length > 0) {
                                 return [2 /*return*/, response.body["newest-versions"][0]];
                             }
                             return [2 /*return*/, null];
-                        case 2:
-                            _a.sent();
+                        case 3:
+                            _b.sent();
                             return [2 /*return*/, null];
-                        case 3: return [2 /*return*/];
+                        case 4: return [2 /*return*/];
                     }
                 });
             });
@@ -6631,7 +6823,7 @@
         return RegionDiscovery;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6642,16 +6834,17 @@
      * endpoint. It will store the pertinent config data in this object for use during token calls.
      */
     var Authority = /** @class */ (function () {
-        function Authority(authority, networkInterface, cacheManager, authorityOptions, logger, proxyUrl) {
+        function Authority(authority, networkInterface, cacheManager, authorityOptions, logger, performanceClient, correlationId) {
             this.canonicalAuthority = authority;
             this._canonicalAuthority.validateAsUri();
             this.networkInterface = networkInterface;
             this.cacheManager = cacheManager;
             this.authorityOptions = authorityOptions;
-            this.regionDiscovery = new RegionDiscovery(networkInterface);
             this.regionDiscoveryMetadata = { region_used: undefined, region_source: undefined, region_outcome: undefined };
-            this.proxyUrl = proxyUrl || Constants.EMPTY_STRING;
             this.logger = logger;
+            this.performanceClient = performanceClient;
+            this.correlationId = correlationId;
+            this.regionDiscovery = new RegionDiscovery(networkInterface, this.performanceClient, this.correlationId);
         }
         Object.defineProperty(Authority.prototype, "authorityType", {
             // See above for AuthorityType
@@ -6888,23 +7081,27 @@
          * and the /authorize, /token and logout endpoints.
          */
         Authority.prototype.resolveEndpointsAsync = function () {
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
                 var metadataEntity, cloudDiscoverySource, endpointSource, cacheKey;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityResolveEndpointsAsync, this.correlationId);
                             metadataEntity = this.cacheManager.getAuthorityMetadataByAlias(this.hostnameAndPort);
                             if (!metadataEntity) {
                                 metadataEntity = new AuthorityMetadataEntity();
                                 metadataEntity.updateCanonicalAuthority(this.canonicalAuthority);
                             }
+                            (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.AuthorityUpdateCloudDiscoveryMetadata, this.correlationId);
                             return [4 /*yield*/, this.updateCloudDiscoveryMetadata(metadataEntity)];
                         case 1:
-                            cloudDiscoverySource = _a.sent();
+                            cloudDiscoverySource = _d.sent();
                             this.canonicalAuthority = this.canonicalAuthority.replace(this.hostnameAndPort, metadataEntity.preferred_network);
+                            (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.AuthorityUpdateEndpointMetadata, this.correlationId);
                             return [4 /*yield*/, this.updateEndpointMetadata(metadataEntity)];
                         case 2:
-                            endpointSource = _a.sent();
+                            endpointSource = _d.sent();
                             if (cloudDiscoverySource !== AuthorityMetadataSource.CACHE && endpointSource !== AuthorityMetadataSource.CACHE) {
                                 // Reset the expiration time unless both values came from a successful cache lookup
                                 metadataEntity.resetExpiresAt();
@@ -6923,12 +7120,13 @@
          * @param metadataEntity
          */
         Authority.prototype.updateEndpointMetadata = function (metadataEntity) {
-            var _a, _b;
+            var _a, _b, _c, _d, _e, _f;
             return __awaiter(this, void 0, void 0, function () {
                 var metadata, harcodedMetadata;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityUpdateEndpointMetadata, this.correlationId);
                             metadata = this.getEndpointMetadataFromConfig();
                             if (metadata) {
                                 metadataEntity.updateEndpointMetadata(metadata, false);
@@ -6939,25 +7137,28 @@
                                 return [2 /*return*/, AuthorityMetadataSource.CACHE];
                             }
                             harcodedMetadata = this.getEndpointMetadataFromHardcodedValues();
+                            (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.AuthorityGetEndpointMetadataFromNetwork, this.correlationId);
                             return [4 /*yield*/, this.getEndpointMetadataFromNetwork()];
                         case 1:
-                            metadata = _c.sent();
+                            metadata = _g.sent();
                             if (!metadata) return [3 /*break*/, 4];
-                            if (!((_a = this.authorityOptions.azureRegionConfiguration) === null || _a === void 0 ? void 0 : _a.azureRegion)) return [3 /*break*/, 3];
+                            if (!((_c = this.authorityOptions.azureRegionConfiguration) === null || _c === void 0 ? void 0 : _c.azureRegion)) return [3 /*break*/, 3];
+                            (_d = this.performanceClient) === null || _d === void 0 ? void 0 : _d.setPreQueueTime(exports.PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation, this.correlationId);
                             return [4 /*yield*/, this.updateMetadataWithRegionalInformation(metadata)];
                         case 2:
-                            metadata = _c.sent();
-                            _c.label = 3;
+                            metadata = _g.sent();
+                            _g.label = 3;
                         case 3:
                             metadataEntity.updateEndpointMetadata(metadata, true);
                             return [2 /*return*/, AuthorityMetadataSource.NETWORK];
                         case 4:
                             if (!(harcodedMetadata && !this.authorityOptions.skipAuthorityMetadataCache)) return [3 /*break*/, 7];
-                            if (!((_b = this.authorityOptions.azureRegionConfiguration) === null || _b === void 0 ? void 0 : _b.azureRegion)) return [3 /*break*/, 6];
+                            if (!((_e = this.authorityOptions.azureRegionConfiguration) === null || _e === void 0 ? void 0 : _e.azureRegion)) return [3 /*break*/, 6];
+                            (_f = this.performanceClient) === null || _f === void 0 ? void 0 : _f.setPreQueueTime(exports.PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation, this.correlationId);
                             return [4 /*yield*/, this.updateMetadataWithRegionalInformation(harcodedMetadata)];
                         case 5:
-                            harcodedMetadata = _c.sent();
-                            _c.label = 6;
+                            harcodedMetadata = _g.sent();
+                            _g.label = 6;
                         case 6:
                             metadataEntity.updateEndpointMetadata(harcodedMetadata, false);
                             return [2 /*return*/, AuthorityMetadataSource.HARDCODED_VALUES];
@@ -6997,25 +7198,24 @@
          * @param hasHardcodedMetadata boolean
          */
         Authority.prototype.getEndpointMetadataFromNetwork = function () {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var options, response;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityGetEndpointMetadataFromNetwork, this.correlationId);
                             options = {};
-                            if (this.proxyUrl) {
-                                options.proxyUrl = this.proxyUrl;
-                            }
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
+                            _b.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, this.networkInterface.
                                     sendGetRequestAsync(this.defaultOpenIdConfigurationEndpoint, options)];
                         case 2:
-                            response = _a.sent();
+                            response = _b.sent();
                             return [2 /*return*/, isOpenIdConfigResponse(response.body) ? response.body : null];
                         case 3:
-                            _a.sent();
+                            _b.sent();
                             return [2 /*return*/, null];
                         case 4: return [2 /*return*/];
                     }
@@ -7035,25 +7235,28 @@
          * Update the retrieved metadata with regional information.
          */
         Authority.prototype.updateMetadataWithRegionalInformation = function (metadata) {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g;
             return __awaiter(this, void 0, void 0, function () {
                 var autodetectedRegionName, azureRegion;
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
-                        case 0: return [4 /*yield*/, this.regionDiscovery.detectRegion((_a = this.authorityOptions.azureRegionConfiguration) === null || _a === void 0 ? void 0 : _a.environmentRegion, this.regionDiscoveryMetadata, this.proxyUrl)];
+                return __generator(this, function (_h) {
+                    switch (_h.label) {
+                        case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation, this.correlationId);
+                            (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.RegionDiscoveryDetectRegion, this.correlationId);
+                            return [4 /*yield*/, this.regionDiscovery.detectRegion((_c = this.authorityOptions.azureRegionConfiguration) === null || _c === void 0 ? void 0 : _c.environmentRegion, this.regionDiscoveryMetadata)];
                         case 1:
-                            autodetectedRegionName = _f.sent();
-                            azureRegion = ((_b = this.authorityOptions.azureRegionConfiguration) === null || _b === void 0 ? void 0 : _b.azureRegion) === Constants.AZURE_REGION_AUTO_DISCOVER_FLAG
+                            autodetectedRegionName = _h.sent();
+                            azureRegion = ((_d = this.authorityOptions.azureRegionConfiguration) === null || _d === void 0 ? void 0 : _d.azureRegion) === Constants.AZURE_REGION_AUTO_DISCOVER_FLAG
                                 ? autodetectedRegionName
-                                : (_c = this.authorityOptions.azureRegionConfiguration) === null || _c === void 0 ? void 0 : _c.azureRegion;
-                            if (((_d = this.authorityOptions.azureRegionConfiguration) === null || _d === void 0 ? void 0 : _d.azureRegion) === Constants.AZURE_REGION_AUTO_DISCOVER_FLAG) {
+                                : (_e = this.authorityOptions.azureRegionConfiguration) === null || _e === void 0 ? void 0 : _e.azureRegion;
+                            if (((_f = this.authorityOptions.azureRegionConfiguration) === null || _f === void 0 ? void 0 : _f.azureRegion) === Constants.AZURE_REGION_AUTO_DISCOVER_FLAG) {
                                 this.regionDiscoveryMetadata.region_outcome = autodetectedRegionName ?
                                     RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_SUCCESSFUL :
                                     RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_FAILED;
                             }
                             else {
                                 if (autodetectedRegionName) {
-                                    this.regionDiscoveryMetadata.region_outcome = (((_e = this.authorityOptions.azureRegionConfiguration) === null || _e === void 0 ? void 0 : _e.azureRegion) === autodetectedRegionName) ?
+                                    this.regionDiscoveryMetadata.region_outcome = (((_g = this.authorityOptions.azureRegionConfiguration) === null || _g === void 0 ? void 0 : _g.azureRegion) === autodetectedRegionName) ?
                                         RegionDiscoveryOutcomes.CONFIGURED_MATCHES_DETECTED :
                                         RegionDiscoveryOutcomes.CONFIGURED_NOT_DETECTED;
                                 }
@@ -7077,11 +7280,13 @@
          * @param newMetadata
          */
         Authority.prototype.updateCloudDiscoveryMetadata = function (metadataEntity) {
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
                 var metadata, metadataEntityExpired, harcodedMetadata;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityUpdateCloudDiscoveryMetadata, this.correlationId);
                             this.logger.verbose("Attempting to get cloud discovery metadata in the config");
                             this.logger.verbosePii("Known Authorities: " + (this.authorityOptions.knownAuthorities || Constants.NOT_APPLICABLE));
                             this.logger.verbosePii("Authority Metadata: " + (this.authorityOptions.authorityMetadata || Constants.NOT_APPLICABLE));
@@ -7104,9 +7309,10 @@
                                 this.logger.verbose("The metadata entity is expired.");
                             }
                             this.logger.verbose("Did not find cloud discovery metadata in the cache... Attempting to get cloud discovery metadata from the network.");
+                            (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.AuthorityGetCloudDiscoveryMetadataFromNetwork, this.correlationId);
                             return [4 /*yield*/, this.getCloudDiscoveryMetadataFromNetwork()];
                         case 1:
-                            metadata = _a.sent();
+                            metadata = _c.sent();
                             if (metadata) {
                                 this.logger.verbose("cloud discovery metadata was successfully returned from getCloudDiscoveryMetadataFromNetwork()");
                                 metadataEntity.updateCloudDiscoveryMetadata(metadata, true);
@@ -7164,23 +7370,22 @@
          * @param hasHardcodedMetadata boolean
          */
         Authority.prototype.getCloudDiscoveryMetadataFromNetwork = function () {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var instanceDiscoveryEndpoint, options, match, response, typedResponseBody, metadata, error_1, typedError;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
+                            (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityGetCloudDiscoveryMetadataFromNetwork, this.correlationId);
                             instanceDiscoveryEndpoint = "" + Constants.AAD_INSTANCE_DISCOVERY_ENDPT + this.canonicalAuthority + "oauth2/v2.0/authorize";
                             options = {};
-                            if (this.proxyUrl) {
-                                options.proxyUrl = this.proxyUrl;
-                            }
                             match = null;
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
+                            _b.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(instanceDiscoveryEndpoint, options)];
                         case 2:
-                            response = _a.sent();
+                            response = _b.sent();
                             typedResponseBody = void 0;
                             metadata = void 0;
                             if (isCloudInstanceDiscoveryResponse(response.body)) {
@@ -7208,7 +7413,7 @@
                             match = Authority.getCloudDiscoveryMetadataFromNetworkResponse(metadata, this.hostnameAndPort);
                             return [3 /*break*/, 4];
                         case 3:
-                            error_1 = _a.sent();
+                            error_1 = _b.sent();
                             if (error_1 instanceof AuthError) {
                                 this.logger.error("There was a network error while attempting to get the cloud discovery instance metadata.\nError: " + error_1.errorCode + "\nError Description: " + error_1.errorMessage);
                             }
@@ -7353,7 +7558,7 @@
         return Authority;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7372,16 +7577,18 @@
          * @param networkClient
          * @param protocolMode
          */
-        AuthorityFactory.createDiscoveredInstance = function (authorityUri, networkClient, cacheManager, authorityOptions, logger, proxyUrl) {
+        AuthorityFactory.createDiscoveredInstance = function (authorityUri, networkClient, cacheManager, authorityOptions, logger, performanceClient, correlationId) {
             return __awaiter(this, void 0, void 0, function () {
                 var acquireTokenAuthority, e_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            acquireTokenAuthority = AuthorityFactory.createInstance(authorityUri, networkClient, cacheManager, authorityOptions, logger, proxyUrl);
+                            performanceClient === null || performanceClient === void 0 ? void 0 : performanceClient.addQueueMeasurement(exports.PerformanceEvents.AuthorityFactoryCreateDiscoveredInstance, correlationId);
+                            acquireTokenAuthority = AuthorityFactory.createInstance(authorityUri, networkClient, cacheManager, authorityOptions, logger, performanceClient, correlationId);
                             _a.label = 1;
                         case 1:
                             _a.trys.push([1, 3, , 4]);
+                            performanceClient === null || performanceClient === void 0 ? void 0 : performanceClient.setPreQueueTime(exports.PerformanceEvents.AuthorityResolveEndpointsAsync, correlationId);
                             return [4 /*yield*/, acquireTokenAuthority.resolveEndpointsAsync()];
                         case 2:
                             _a.sent();
@@ -7404,17 +7611,17 @@
          * @param networkInterface
          * @param protocolMode
          */
-        AuthorityFactory.createInstance = function (authorityUrl, networkInterface, cacheManager, authorityOptions, logger, proxyUrl) {
+        AuthorityFactory.createInstance = function (authorityUrl, networkInterface, cacheManager, authorityOptions, logger, performanceClient, correlationId) {
             // Throw error if authority url is empty
             if (StringUtils.isEmpty(authorityUrl)) {
                 throw ClientConfigurationError.createUrlEmptyError();
             }
-            return new Authority(authorityUrl, networkInterface, cacheManager, authorityOptions, logger, proxyUrl);
+            return new Authority(authorityUrl, networkInterface, cacheManager, authorityOptions, logger, performanceClient, correlationId);
         };
         return AuthorityFactory;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7445,7 +7652,7 @@
         return ServerTelemetryEntity;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7473,7 +7680,7 @@
         return ThrottlingEntity;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7490,7 +7697,7 @@
         }
     };
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7535,7 +7742,7 @@
         return JoseHeaderError;
     }(AuthError));
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7565,8 +7772,8 @@
                 throw JoseHeaderError.createMissingAlgError();
             }
             var shrHeader = new JoseHeader({
-                // Access Token PoP headers must have type JWT, but the type header can be overriden for special cases
-                typ: shrHeaderOptions.typ || JsonTypes.Jwt,
+                // Access Token PoP headers must have type pop, but the type header can be overriden for special cases
+                typ: shrHeaderOptions.typ || JsonTypes.Pop,
                 kid: shrHeaderOptions.kid,
                 alg: shrHeaderOptions.alg
             });
@@ -7575,7 +7782,7 @@
         return JoseHeader;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7634,7 +7841,7 @@
         return AuthenticationHeaderParser;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7796,7 +8003,7 @@
         return ServerTelemetryManager;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7823,9 +8030,120 @@
             this.logger = logger;
             this.callbacks = new Map();
             this.eventsByCorrelationId = new Map();
-            this.staticFieldsByCorrelationId = new Map();
-            this.measurementsById = new Map();
+            this.queueMeasurements = new Map();
+            this.preQueueTimeByCorrelationId = new Map();
         }
+        /**
+         * Starts and returns an platform-specific implementation of IPerformanceMeasurement.
+         * Note: this function can be changed to abstract at the next major version bump.
+         *
+         * @param {string} measureName
+         * @param {string} correlationId
+         * @returns {IPerformanceMeasurement}
+         */
+        /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+        PerformanceClient.prototype.startPerformanceMeasurement = function (measureName, correlationId) {
+            return {};
+        };
+        /**
+         * Starts and returns an platform-specific implementation of IPerformanceMeasurement.
+         * Note: this incorrectly-named function will be removed at the next major version bump.
+         *
+         * @param {string} measureName
+         * @param {string} correlationId
+         * @returns {IPerformanceMeasurement}
+         */
+        /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+        PerformanceClient.prototype.startPerformanceMeasuremeant = function (measureName, correlationId) {
+            return {};
+        };
+        /**
+         * Get integral fields.
+         * Override to change the set.
+         */
+        PerformanceClient.prototype.getIntFields = function () {
+            return IntFields;
+        };
+        /**
+         * Gets map of pre-queue times by correlation Id
+         *
+         * @param {PerformanceEvents} eventName
+         * @param {string} correlationId
+         * @returns {number}
+         */
+        PerformanceClient.prototype.getPreQueueTime = function (eventName, correlationId) {
+            var preQueueEvent = this.preQueueTimeByCorrelationId.get(correlationId);
+            if (!preQueueEvent) {
+                this.logger.trace("PerformanceClient.getPreQueueTime: no pre-queue times found for correlationId: " + correlationId + ", unable to add queue measurement");
+                return;
+            }
+            else if (preQueueEvent.name !== eventName) {
+                this.logger.trace("PerformanceClient.getPreQueueTime: no pre-queue time found for " + eventName + ", unable to add queue measurement");
+                return;
+            }
+            return preQueueEvent.time;
+        };
+        /**
+         * Calculates the difference between current time and time when function was queued.
+         * Note: It is possible to have 0 as the queue time if the current time and the queued time was the same.
+         *
+         * @param {number} preQueueTime
+         * @param {number} currentTime
+         * @returns {number}
+         */
+        PerformanceClient.prototype.calculateQueuedTime = function (preQueueTime, currentTime) {
+            if (preQueueTime < 1) {
+                this.logger.trace("PerformanceClient: preQueueTime should be a positive integer and not " + preQueueTime);
+                return 0;
+            }
+            if (currentTime < 1) {
+                this.logger.trace("PerformanceClient: currentTime should be a positive integer and not " + currentTime);
+                return 0;
+            }
+            if (currentTime < preQueueTime) {
+                this.logger.trace("PerformanceClient: currentTime is less than preQueueTime, check how time is being retrieved");
+                return 0;
+            }
+            return currentTime - preQueueTime;
+        };
+        /**
+         * Adds queue measurement time to QueueMeasurements array for given correlation ID.
+         *
+         * @param {PerformanceEvents} eventName
+         * @param {?string} correlationId
+         * @param {?number} queueTime
+         * @param {?boolean} manuallyCompleted - indicator for manually completed queue measurements
+         * @returns
+         */
+        PerformanceClient.prototype.addQueueMeasurement = function (eventName, correlationId, queueTime, manuallyCompleted) {
+            if (!correlationId) {
+                this.logger.trace("PerformanceClient.addQueueMeasurement: correlationId not provided for " + eventName + ", cannot add queue measurement");
+                return;
+            }
+            if (queueTime === 0) {
+                // Possible for there to be no queue time after calculation
+                this.logger.trace("PerformanceClient.addQueueMeasurement: queue time provided for " + eventName + " is " + queueTime);
+            }
+            else if (!queueTime) {
+                this.logger.trace("PerformanceClient.addQueueMeasurement: no queue time provided for " + eventName);
+                return;
+            }
+            var queueMeasurement = { eventName: eventName, queueTime: queueTime, manuallyCompleted: manuallyCompleted };
+            // Adds to existing correlation Id if present in queueMeasurements
+            var existingMeasurements = this.queueMeasurements.get(correlationId);
+            if (existingMeasurements) {
+                existingMeasurements.push(queueMeasurement);
+                this.queueMeasurements.set(correlationId, existingMeasurements);
+            }
+            else {
+                // Sets new correlation Id if not present in queueMeasurements
+                this.logger.trace("PerformanceClient.addQueueMeasurement: adding correlationId " + correlationId + " to queue measurements");
+                var measurementArray = [queueMeasurement];
+                this.queueMeasurements.set(correlationId, measurementArray);
+            }
+            // Delete processed pre-queue event.
+            this.preQueueTimeByCorrelationId.delete(correlationId);
+        };
         /**
          * Starts measuring performance for a given operation. Returns a function that should be used to end the measurement.
          *
@@ -7841,8 +8159,9 @@
             if (!correlationId) {
                 this.logger.info("PerformanceClient: No correlation id provided for " + measureName + ", generating", eventCorrelationId);
             }
+            // Duplicate code to address spelling error will be removed at the next major version bump.
             this.logger.trace("PerformanceClient: Performance measurement started for " + measureName, eventCorrelationId);
-            var performanceMeasurement = this.startPerformanceMeasurement(measureName, eventCorrelationId);
+            var performanceMeasurement = this.startPerformanceMeasuremeant(measureName, eventCorrelationId);
             performanceMeasurement.startMeasurement();
             var inProgressEvent = {
                 eventId: this.generateId(),
@@ -7854,27 +8173,15 @@
                 name: measureName,
                 startTimeMs: Date.now(),
                 correlationId: eventCorrelationId,
-            };
-            // Store in progress events so they can be discarded if not ended properly
-            this.cacheEventByCorrelationId(inProgressEvent);
-            var staticFields = {
                 appName: (_a = this.applicationTelemetry) === null || _a === void 0 ? void 0 : _a.appName,
                 appVersion: (_b = this.applicationTelemetry) === null || _b === void 0 ? void 0 : _b.appVersion,
             };
-            this.addStaticFields(staticFields, eventCorrelationId);
-            this.cacheMeasurement(inProgressEvent, performanceMeasurement);
+            // Store in progress events so they can be discarded if not ended properly
+            this.cacheEventByCorrelationId(inProgressEvent);
             // Return the event and functions the caller can use to properly end/flush the measurement
             return {
                 endMeasurement: function (event) {
-                    var completedEvent = _this.endMeasurement(__assign(__assign({}, inProgressEvent), event));
-                    if (completedEvent) {
-                        // Cache event so that submeasurements can be added downstream
-                        _this.cacheEventByCorrelationId(completedEvent);
-                    }
-                    return completedEvent;
-                },
-                flushMeasurement: function () {
-                    return _this.flushMeasurements(inProgressEvent.name, inProgressEvent.correlationId);
+                    return _this.endMeasurement(__assign(__assign({}, inProgressEvent), event), performanceMeasurement);
                 },
                 discardMeasurement: function () {
                     return _this.discardMeasurements(inProgressEvent.correlationId);
@@ -7882,6 +8189,9 @@
                 addStaticFields: function (fields) {
                     return _this.addStaticFields(fields, inProgressEvent.correlationId);
                 },
+                increment: function (counters) {
+                    return _this.increment(counters, inProgressEvent.correlationId);
+                },
                 measurement: performanceMeasurement,
                 event: inProgressEvent
             };
@@ -7889,33 +8199,59 @@
         /**
          * Stops measuring the performance for an operation. Should only be called directly by PerformanceClient classes,
          * as consumers should instead use the function returned by startMeasurement.
+         * Adds a new field named as "[event name]DurationMs" for sub-measurements, completes and emits an event
+         * otherwise.
          *
          * @param {PerformanceEvent} event
+         * @param {IPerformanceMeasurement} measurement
          * @returns {(PerformanceEvent | null)}
          */
-        PerformanceClient.prototype.endMeasurement = function (event) {
-            var performanceMeasurement = this.measurementsById.get(event.eventId);
-            if (performanceMeasurement) {
-                // Immediately delete so that the same event isnt ended twice
-                this.measurementsById.delete(event.eventId);
-                performanceMeasurement.endMeasurement();
-                var durationMs = performanceMeasurement.flushMeasurement();
-                // null indicates no measurement was taken (e.g. needed performance APIs not present)
-                if (durationMs !== null) {
-                    this.logger.trace("PerformanceClient: Performance measurement ended for " + event.name + ": " + durationMs + " ms", event.correlationId);
-                    var completedEvent = __assign(__assign({ 
-                        // Allow duration to be overwritten when event ends (e.g. testing), but not status
-                        durationMs: Math.round(durationMs) }, event), { status: PerformanceEventStatus.Completed });
-                    return completedEvent;
-                }
-                else {
-                    this.logger.trace("PerformanceClient: Performance measurement not taken", event.correlationId);
-                }
+        PerformanceClient.prototype.endMeasurement = function (event, measurement) {
+            var _this = this;
+            var _a, _b;
+            var rootEvent = this.eventsByCorrelationId.get(event.correlationId);
+            if (!rootEvent) {
+                this.logger.trace("PerformanceClient: Measurement not found for " + event.eventId, event.correlationId);
+                return null;
+            }
+            var isRoot = event.eventId === rootEvent.eventId;
+            var queueInfo = {
+                totalQueueTime: 0,
+                totalQueueCount: 0,
+                manuallyCompletedCount: 0
+            };
+            if (isRoot) {
+                queueInfo = this.getQueueInfo(event.correlationId);
+                this.discardCache(rootEvent.correlationId);
             }
             else {
-                this.logger.trace("PerformanceClient: Measurement not found for " + event.eventId, event.correlationId);
+                (_a = rootEvent.incompleteSubMeasurements) === null || _a === void 0 ? void 0 : _a.delete(event.eventId);
             }
-            return null;
+            measurement === null || measurement === void 0 ? void 0 : measurement.endMeasurement();
+            var durationMs = measurement === null || measurement === void 0 ? void 0 : measurement.flushMeasurement();
+            // null indicates no measurement was taken (e.g. needed performance APIs not present)
+            if (!durationMs) {
+                this.logger.trace("PerformanceClient: Performance measurement not taken", rootEvent.correlationId);
+                return null;
+            }
+            this.logger.trace("PerformanceClient: Performance measurement ended for " + event.name + ": " + durationMs + " ms", event.correlationId);
+            // Add sub-measurement attribute to root event.
+            if (!isRoot) {
+                rootEvent[event.name + "DurationMs"] = Math.floor(durationMs);
+                return __assign({}, rootEvent);
+            }
+            var finalEvent = __assign(__assign({}, rootEvent), event);
+            var incompleteSubsCount = 0;
+            // Incomplete sub-measurements are discarded. They are likely an instrumentation bug that should be fixed.
+            (_b = finalEvent.incompleteSubMeasurements) === null || _b === void 0 ? void 0 : _b.forEach(function (subMeasurement) {
+                _this.logger.trace("PerformanceClient: Incomplete submeasurement " + subMeasurement.name + " found for " + event.name, finalEvent.correlationId);
+                incompleteSubsCount++;
+            });
+            finalEvent.incompleteSubMeasurements = undefined;
+            finalEvent = __assign(__assign({}, finalEvent), { durationMs: Math.round(durationMs), queuedTimeMs: queueInfo.totalQueueTime, queuedCount: queueInfo.totalQueueCount, queuedManuallyCompletedCount: queueInfo.manuallyCompletedCount, status: PerformanceEventStatus.Completed, incompleteSubsCount: incompleteSubsCount });
+            this.truncateIntegralFields(finalEvent, this.getIntFields());
+            this.emitEvents([finalEvent], event.correlationId);
+            return finalEvent;
         };
         /**
          * Saves extra information to be emitted when the measurements are flushed
@@ -7923,14 +8259,33 @@
          * @param correlationId
          */
         PerformanceClient.prototype.addStaticFields = function (fields, correlationId) {
-            var existingStaticFields = this.staticFieldsByCorrelationId.get(correlationId);
-            if (existingStaticFields) {
-                this.logger.trace("PerformanceClient: Updating static fields");
-                this.staticFieldsByCorrelationId.set(correlationId, __assign(__assign({}, existingStaticFields), fields));
+            this.logger.trace("PerformanceClient: Updating static fields");
+            var event = this.eventsByCorrelationId.get(correlationId);
+            if (event) {
+                this.eventsByCorrelationId.set(correlationId, __assign(__assign({}, event), fields));
+            }
+            else {
+                this.logger.trace("PerformanceClient: Event not found for", correlationId);
+            }
+        };
+        /**
+         * Increment counters to be emitted when the measurements are flushed
+         * @param counters {Counters}
+         * @param correlationId {string} correlation identifier
+         */
+        PerformanceClient.prototype.increment = function (counters, correlationId) {
+            this.logger.trace("PerformanceClient: Updating counters");
+            var event = this.eventsByCorrelationId.get(correlationId);
+            if (event) {
+                for (var counter in counters) {
+                    if (!event.hasOwnProperty(counter)) {
+                        event[counter] = 0;
+                    }
+                    event[counter] += counters[counter];
+                }
             }
             else {
-                this.logger.trace("PerformanceClient: Adding static fields");
-                this.staticFieldsByCorrelationId.set(correlationId, fields);
+                this.logger.trace("PerformanceClient: Event not found for", correlationId);
             }
         };
         /**
@@ -7943,99 +8298,35 @@
          * @param {PerformanceEvent} event
          */
         PerformanceClient.prototype.cacheEventByCorrelationId = function (event) {
-            var existingEvents = this.eventsByCorrelationId.get(event.correlationId);
-            if (existingEvents) {
+            var rootEvent = this.eventsByCorrelationId.get(event.correlationId);
+            if (rootEvent) {
                 this.logger.trace("PerformanceClient: Performance measurement for " + event.name + " added/updated", event.correlationId);
-                existingEvents.set(event.eventId, event);
+                rootEvent.incompleteSubMeasurements = rootEvent.incompleteSubMeasurements || new Map();
+                rootEvent.incompleteSubMeasurements.set(event.eventId, { name: event.name, startTimeMs: event.startTimeMs });
             }
             else {
                 this.logger.trace("PerformanceClient: Performance measurement for " + event.name + " started", event.correlationId);
-                this.eventsByCorrelationId.set(event.correlationId, new Map().set(event.eventId, event));
+                this.eventsByCorrelationId.set(event.correlationId, __assign({}, event));
             }
         };
-        /**
-         * Cache measurements by their id.
-         *
-         * @private
-         * @param {PerformanceEvent} event
-         * @param {IPerformanceMeasurement} measurement
-         */
-        PerformanceClient.prototype.cacheMeasurement = function (event, measurement) {
-            this.measurementsById.set(event.eventId, measurement);
-        };
-        /**
-         * Gathers and emits performance events for measurements taked for the given top-level API and correlation ID.
-         *
-         * @param {PerformanceEvents} measureName
-         * @param {string} correlationId
-         */
-        PerformanceClient.prototype.flushMeasurements = function (measureName, correlationId) {
-            var _this = this;
-            this.logger.trace("PerformanceClient: Performance measurements flushed for " + measureName, correlationId);
-            var eventsForCorrelationId = this.eventsByCorrelationId.get(correlationId);
-            if (eventsForCorrelationId) {
-                this.discardMeasurements(correlationId);
-                /*
-                 * Manually end incomplete submeasurements to ensure there arent orphaned/never ending events.
-                 * Incomplete submeasurements are likely an instrumentation bug that should be fixed.
-                 * IE only supports Map.forEach.
-                 */
-                var completedEvents_1 = [];
-                eventsForCorrelationId.forEach(function (event) {
-                    if (event.name !== measureName && event.status !== PerformanceEventStatus.Completed) {
-                        _this.logger.trace("PerformanceClient: Incomplete submeasurement " + event.name + " found for " + measureName, correlationId);
-                        var completedEvent = _this.endMeasurement(event);
-                        if (completedEvent) {
-                            completedEvents_1.push(completedEvent);
-                        }
-                    }
-                    completedEvents_1.push(event);
-                });
-                // Sort events by start time (earliest first)
-                var sortedCompletedEvents = completedEvents_1.sort(function (eventA, eventB) { return eventA.startTimeMs - eventB.startTimeMs; });
-                // Take completed top level event and add completed submeasurements durations as properties
-                var topLevelEvents = sortedCompletedEvents.filter(function (event) { return event.name === measureName && event.status === PerformanceEventStatus.Completed; });
-                if (topLevelEvents.length > 0) {
-                    /*
-                     * Only take the first top-level event if there are multiple events with the same correlation id.
-                     * This greatly simplifies logic for submeasurements.
-                     */
-                    if (topLevelEvents.length > 1) {
-                        this.logger.verbose("PerformanceClient: Multiple distinct top-level performance events found, using the first", correlationId);
-                    }
-                    var topLevelEvent = topLevelEvents[0];
-                    this.logger.verbose("PerformanceClient: Measurement found for " + measureName, correlationId);
-                    // Build event object with top level and sub measurements
-                    var eventToEmit = sortedCompletedEvents.reduce(function (previous, current) {
-                        if (current.name !== measureName) {
-                            _this.logger.trace("PerformanceClient: Complete submeasurement found for " + current.name, correlationId);
-                            // TODO: Emit additional properties for each subMeasurement
-                            var subMeasurementName = current.name + "DurationMs";
-                            /*
-                             * Some code paths, such as resolving an authority, can occur multiple times.
-                             * Only take the first measurement, since the second could be read from the cache,
-                             * or due to the same correlation id being used for two distinct requests.
-                             */
-                            if (!previous[subMeasurementName]) {
-                                previous[subMeasurementName] = current.durationMs;
-                            }
-                            else {
-                                _this.logger.verbose("PerformanceClient: Submeasurement for " + measureName + " already exists for " + current.name + ", ignoring", correlationId);
-                            }
-                        }
-                        return previous;
-                    }, topLevelEvent);
-                    var staticFields = this.staticFieldsByCorrelationId.get(correlationId);
-                    var finalEvent = __assign(__assign({}, eventToEmit), staticFields);
-                    this.emitEvents([finalEvent], eventToEmit.correlationId);
-                }
-                else {
-                    this.logger.verbose("PerformanceClient: No completed top-level measurements found for " + measureName, correlationId);
-                }
-            }
-            else {
-                this.logger.verbose("PerformanceClient: No measurements found", correlationId);
+        PerformanceClient.prototype.getQueueInfo = function (correlationId) {
+            var queueMeasurementForCorrelationId = this.queueMeasurements.get(correlationId);
+            if (!queueMeasurementForCorrelationId) {
+                this.logger.trace("PerformanceClient: no queue measurements found for for correlationId: " + correlationId);
             }
+            var totalQueueTime = 0;
+            var totalQueueCount = 0;
+            var manuallyCompletedCount = 0;
+            queueMeasurementForCorrelationId === null || queueMeasurementForCorrelationId === void 0 ? void 0 : queueMeasurementForCorrelationId.forEach(function (measurement) {
+                totalQueueTime += measurement.queueTime;
+                totalQueueCount++;
+                manuallyCompletedCount += measurement.manuallyCompleted ? 1 : 0;
+            });
+            return {
+                totalQueueTime: totalQueueTime,
+                totalQueueCount: totalQueueCount,
+                manuallyCompletedCount: manuallyCompletedCount
+            };
         };
         /**
          * Removes measurements for a given correlation id.
@@ -8046,6 +8337,18 @@
             this.logger.trace("PerformanceClient: Performance measurements discarded", correlationId);
             this.eventsByCorrelationId.delete(correlationId);
         };
+        /**
+         * Removes cache for a given correlation id.
+         *
+         * @param {string} correlationId correlation identifier
+         */
+        PerformanceClient.prototype.discardCache = function (correlationId) {
+            this.discardMeasurements(correlationId);
+            this.logger.trace("PerformanceClient: QueueMeasurements discarded", correlationId);
+            this.queueMeasurements.delete(correlationId);
+            this.logger.trace("PerformanceClient: Pre-queue times discarded", correlationId);
+            this.preQueueTimeByCorrelationId.delete(correlationId);
+        };
         /**
          * Registers a callback function to receive performance events.
          *
@@ -8088,10 +8391,22 @@
                 callback.apply(null, [events]);
             });
         };
+        /**
+         * Enforce truncation of integral fields in performance event.
+         * @param {PerformanceEvent} event performance event to update.
+         * @param {Set<string>} intFields integral fields.
+         */
+        PerformanceClient.prototype.truncateIntegralFields = function (event, intFields) {
+            intFields.forEach(function (key) {
+                if (key in event && typeof event[key] === "number") {
+                    event[key] = Math.floor(event[key]);
+                }
+            });
+        };
         return PerformanceClient;
     }());
 
-    /*! @azure/msal-common v9.0.2 2023-01-10 */
+    /*! @azure/msal-common v11.0.0 2023-03-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8117,9 +8432,24 @@
         StubPerformanceClient.prototype.generateId = function () {
             return "callback-id";
         };
+        StubPerformanceClient.prototype.startPerformanceMeasuremeant = function () {
+            return new StubPerformanceMeasurement();
+        };
         StubPerformanceClient.prototype.startPerformanceMeasurement = function () {
             return new StubPerformanceMeasurement();
         };
+        /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+        StubPerformanceClient.prototype.calculateQueuedTime = function (preQueueTime, currentTime) {
+            return 0;
+        };
+        /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+        StubPerformanceClient.prototype.addQueueMeasurement = function (eventName, correlationId, queueTime) {
+            return;
+        };
+        /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+        StubPerformanceClient.prototype.setPreQueueTime = function (eventName, correlationId) {
+            return;
+        };
         return StubPerformanceClient;
     }(PerformanceClient));
 
@@ -8279,6 +8609,10 @@
             code: "auth_code_or_nativeAccountId_required",
             desc: "An authorization code or nativeAccountId must be provided to this flow."
         },
+        spaCodeAndNativeAccountPresent: {
+            code: "spa_code_and_nativeAccountId_present",
+            desc: "Request cannot contain both spa code and native account id."
+        },
         databaseUnavailable: {
             code: "database_unavailable",
             desc: "IndexedDB, which is required for persistent cryptographic key storage, is unavailable. This may be caused by browser privacy features which block persistent storage in third-party contexts."
@@ -8551,6 +8885,12 @@
         BrowserAuthError.createAuthCodeOrNativeAccountIdRequiredError = function () {
             return new BrowserAuthError(BrowserAuthErrorMessage.authCodeOrNativeAccountRequired.code, BrowserAuthErrorMessage.authCodeOrNativeAccountRequired.desc);
         };
+        /**
+         * Create an error when both authorization code and native account ID are provided
+         */
+        BrowserAuthError.createSpaCodeAndNativeAccountIdPresentError = function () {
+            return new BrowserAuthError(BrowserAuthErrorMessage.spaCodeAndNativeAccountPresent.code, BrowserAuthErrorMessage.spaCodeAndNativeAccountPresent.desc);
+        };
         /**
          * Create an error when IndexedDB is unavailable
          */
@@ -9981,7 +10321,7 @@
 
     /* eslint-disable header/header */
     var name = "@azure/msal-browser";
-    var version = "2.32.2";
+    var version = "2.34.0";
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -10452,6 +10792,7 @@
                 return __generator$1(this, function (_b) {
                     switch (_b.label) {
                         case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.InitializeBaseRequest, request.correlationId);
                             this.logger.verbose("Initializing BaseAuthRequest");
                             authority = request.authority || this.config.auth.authority;
                             scopes = __spread(((request && request.scopes) || []));
@@ -10569,6 +10910,7 @@
                 return __generator$1(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest, request.correlationId);
                             this.logger.verbose("initializeAuthorizationRequest called", request.correlationId);
                             return [4 /*yield*/, this.browserCrypto.generatePkceCodes()];
                         case 1:
@@ -10669,10 +11011,14 @@
                 var clientConfig;
                 return __generator$1(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, requestAzureCloudOptions)];
+                        case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, this.correlationId);
+                            // Create auth module.
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientGetClientConfiguration, this.correlationId);
+                            return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, requestAzureCloudOptions)];
                         case 1:
                             clientConfig = _a.sent();
-                            return [2 /*return*/, new AuthorizationCodeClient(clientConfig)];
+                            return [2 /*return*/, new AuthorizationCodeClient(clientConfig, this.performanceClient)];
                     }
                 });
             });
@@ -10689,7 +11035,9 @@
                 return __generator$1(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.StandardInteractionClientGetClientConfiguration, this.correlationId);
                             this.logger.verbose("getClientConfiguration called", this.correlationId);
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientGetDiscoveredAuthority, this.correlationId);
                             return [4 /*yield*/, this.getDiscoveredAuthority(requestAuthority, requestAzureCloudOptions)];
                         case 1:
                             discoveredAuthority = _a.sent();
@@ -10757,6 +11105,7 @@
                 return __generator$1(this, function (_b) {
                     switch (_b.label) {
                         case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.StandardInteractionClientGetDiscoveredAuthority, this.correlationId);
                             this.logger.verbose("getDiscoveredAuthority called", this.correlationId);
                             getAuthorityMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.StandardInteractionClientGetDiscoveredAuthority, this.correlationId);
                             authorityOptions = {
@@ -10769,7 +11118,8 @@
                             userAuthority = requestAuthority ? requestAuthority : this.config.auth.authority;
                             builtAuthority = Authority.generateAuthority(userAuthority, requestAzureCloudOptions || this.config.auth.azureCloudOptions);
                             this.logger.verbose("Creating discovered authority with configured authority", this.correlationId);
-                            return [4 /*yield*/, AuthorityFactory.createDiscoveredInstance(builtAuthority, this.config.system.networkClient, this.browserStorage, authorityOptions, this.logger)
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.AuthorityFactoryCreateDiscoveredInstance, this.correlationId);
+                            return [4 /*yield*/, AuthorityFactory.createDiscoveredInstance(builtAuthority, this.config.system.networkClient, this.browserStorage, authorityOptions, this.logger, this.performanceClient, this.correlationId)
                                     .then(function (result) {
                                     getAuthorityMeasurement.endMeasurement({
                                         success: true,
@@ -10800,12 +11150,14 @@
                 return __generator$1(this, function (_b) {
                     switch (_b.label) {
                         case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest, this.correlationId);
                             this.logger.verbose("initializeAuthorizationRequest called", this.correlationId);
                             redirectUri = this.getRedirectUri(request.redirectUri);
                             browserState = {
                                 interactionType: interactionType
                             };
                             state = ProtocolUtils.setRequestState(this.browserCrypto, (request && request.state) || Constants.EMPTY_STRING, browserState);
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.InitializeBaseRequest, this.correlationId);
                             _a = [{}];
                             return [4 /*yield*/, this.initializeBaseRequest(request)];
                         case 1:
@@ -10839,11 +11191,12 @@
      * Abstract class which defines operations for a browser interaction handling class.
      */
     var InteractionHandler = /** @class */ (function () {
-        function InteractionHandler(authCodeModule, storageImpl, authCodeRequest, logger) {
+        function InteractionHandler(authCodeModule, storageImpl, authCodeRequest, logger, performanceClient) {
             this.authModule = authCodeModule;
             this.browserStorage = storageImpl;
             this.authCodeRequest = authCodeRequest;
             this.logger = logger;
+            this.performanceClient = performanceClient;
         }
         /**
          * Function to handle response parameters from hash.
@@ -10853,6 +11206,7 @@
             return __awaiter$1(this, void 0, void 0, function () {
                 var stateKey, requestState, authCodeResponse;
                 return __generator$1(this, function (_a) {
+                    this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.HandleCodeResponseFromHash, this.authCodeRequest.correlationId);
                     this.logger.verbose("InteractionHandler.handleCodeResponse called");
                     // Check that location hash isn't empty.
                     if (StringUtils.isEmpty(locationHash)) {
@@ -10875,6 +11229,7 @@
                             throw e;
                         }
                     }
+                    this.performanceClient.setPreQueueTime(exports.PerformanceEvents.HandleCodeResponseFromServer, this.authCodeRequest.correlationId);
                     return [2 /*return*/, this.handleCodeResponseFromServer(authCodeResponse, state, authority, networkModule)];
                 });
             });
@@ -10894,6 +11249,7 @@
                 return __generator$1(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.HandleCodeResponseFromServer, this.authCodeRequest.correlationId);
                             this.logger.trace("InteractionHandler.handleCodeResponseFromServer called");
                             stateKey = this.browserStorage.generateStateKey(state);
                             requestState = this.browserStorage.getTemporaryCache(stateKey);
@@ -10905,6 +11261,7 @@
                             // Assign code to request
                             this.authCodeRequest.code = authCodeResponse.code;
                             if (!authCodeResponse.cloud_instance_host_name) return [3 /*break*/, 2];
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.UpdateTokenEndpointAuthority, this.authCodeRequest.correlationId);
                             return [4 /*yield*/, this.updateTokenEndpointAuthority(authCodeResponse.cloud_instance_host_name, authority, networkModule)];
                         case 1:
                             _a.sent();
@@ -10925,6 +11282,8 @@
                                     this.authCodeRequest.ccsCredential = cachedCcsCred;
                                 }
                             }
+                            // Acquire token with retrieved code.
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.AuthClientAcquireToken, this.authCodeRequest.correlationId);
                             return [4 /*yield*/, this.authModule.acquireToken(this.authCodeRequest, authCodeResponse)];
                         case 3:
                             tokenResponse = _a.sent();
@@ -10946,8 +11305,9 @@
                 return __generator$1(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.UpdateTokenEndpointAuthority, this.authCodeRequest.correlationId);
                             cloudInstanceAuthorityUri = "https://" + cloudInstanceHostname + "/" + authority.tenant + "/";
-                            return [4 /*yield*/, AuthorityFactory.createDiscoveredInstance(cloudInstanceAuthorityUri, networkModule, this.browserStorage, authority.options, this.logger)];
+                            return [4 /*yield*/, AuthorityFactory.createDiscoveredInstance(cloudInstanceAuthorityUri, networkModule, this.browserStorage, authority.options, this.logger, this.performanceClient, this.authCodeRequest.correlationId)];
                         case 1:
                             cloudInstanceAuthority = _a.sent();
                             this.authModule.updateAuthority(cloudInstanceAuthority);
@@ -10982,8 +11342,8 @@
      */
     var RedirectHandler = /** @class */ (function (_super) {
         __extends$1(RedirectHandler, _super);
-        function RedirectHandler(authCodeModule, storageImpl, authCodeRequest, logger, browserCrypto) {
-            var _this = _super.call(this, authCodeModule, storageImpl, authCodeRequest, logger) || this;
+        function RedirectHandler(authCodeModule, storageImpl, authCodeRequest, logger, browserCrypto, performanceClient) {
+            var _this = _super.call(this, authCodeModule, storageImpl, authCodeRequest, logger, performanceClient) || this;
             _this.browserCrypto = browserCrypto;
             return _this;
         }
@@ -11301,7 +11661,10 @@
                 var clientConfig;
                 return __generator$1(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, azureCloudOptions)];
+                        case 0:
+                            // Create auth module.
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientGetClientConfiguration, this.correlationId);
+                            return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, azureCloudOptions)];
                         case 1:
                             clientConfig = _a.sent();
                             return [2 /*return*/, new SilentFlowClient(clientConfig, this.performanceClient)];
@@ -11315,6 +11678,8 @@
                 return __generator$1(this, function (_b) {
                     switch (_b.label) {
                         case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.InitializeSilentRequest, this.correlationId);
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.InitializeBaseRequest, this.correlationId);
                             _a = [__assign$1({}, request)];
                             return [4 /*yield*/, this.initializeBaseRequest(request)];
                         case 1: return [2 /*return*/, __assign$1.apply(void 0, [__assign$1.apply(void 0, _a.concat([_b.sent()])), { account: account, forceRefresh: request.forceRefresh || false }])];
@@ -11566,60 +11931,96 @@
          */
         NativeInteractionClient.prototype.handleNativeResponse = function (response, request, reqTimestamp) {
             return __awaiter$1(this, void 0, void 0, function () {
-                var mats, idTokenObj, authority, authorityPreferredCache, homeAccountIdentifier, accountEntity, responseScopes, accountProperties, uid, tid, responseAccessToken, responseTokenType, _a, popTokenGenerator, shrParameters, result, idTokenEntity, expiresIn, tokenExpirationSeconds, accessTokenEntity;
-                var _this = this;
-                return __generator$1(this, function (_b) {
-                    switch (_b.label) {
+                var authority, authorityPreferredCache, idTokenObj, homeAccountIdentifier, accountEntity, result;
+                return __generator$1(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            this.logger.trace("NativeInteractionClient - handleNativeResponse called.");
+                            if (response.account.id !== request.accountId) {
+                                // User switch in native broker prompt is not supported. All users must first sign in through web flow to ensure server state is in sync
+                                throw NativeAuthError.createUserSwitchError();
+                            }
+                            if (response.account.id !== request.accountId) {
+                                // User switch in native broker prompt is not supported. All users must first sign in through web flow to ensure server state is in sync
+                                throw NativeAuthError.createUserSwitchError();
+                            }
+                            return [4 /*yield*/, this.getDiscoveredAuthority(request.authority)];
+                        case 1:
+                            authority = _a.sent();
+                            authorityPreferredCache = authority.getPreferredCache();
+                            idTokenObj = this.createIdTokenObj(response);
+                            homeAccountIdentifier = this.createHomeAccountIdentifier(response, idTokenObj);
+                            accountEntity = this.createAccountEntity(response, homeAccountIdentifier, idTokenObj, authorityPreferredCache);
+                            return [4 /*yield*/, this.generateAuthenticationResult(response, request, idTokenObj, accountEntity, authority.canonicalAuthority, reqTimestamp)];
+                        case 2:
+                            result = _a.sent();
+                            // cache accounts and tokens in the appropriate storage
+                            this.cacheAccount(accountEntity);
+                            this.cacheNativeTokens(response, request, homeAccountIdentifier, idTokenObj, result.accessToken, result.tenantId, reqTimestamp);
+                            return [2 /*return*/, result];
+                    }
+                });
+            });
+        };
+        /**
+         * Create an idToken Object (not entity)
+         * @param response
+         * @returns
+         */
+        NativeInteractionClient.prototype.createIdTokenObj = function (response) {
+            return new AuthToken(response.id_token || Constants.EMPTY_STRING, this.browserCrypto);
+        };
+        /**
+         * creates an homeAccountIdentifier for the account
+         * @param response
+         * @param idTokenObj
+         * @returns
+         */
+        NativeInteractionClient.prototype.createHomeAccountIdentifier = function (response, idTokenObj) {
+            // Save account in browser storage
+            var homeAccountIdentifier = AccountEntity.generateHomeAccountId(response.client_info || Constants.EMPTY_STRING, AuthorityType.Default, this.logger, this.browserCrypto, idTokenObj);
+            return homeAccountIdentifier;
+        };
+        /**
+         * Creates account entity
+         * @param response
+         * @param homeAccountIdentifier
+         * @param idTokenObj
+         * @param authority
+         * @returns
+         */
+        NativeInteractionClient.prototype.createAccountEntity = function (response, homeAccountIdentifier, idTokenObj, authority) {
+            return AccountEntity.createAccount(response.client_info, homeAccountIdentifier, idTokenObj, undefined, undefined, undefined, authority, response.account.id);
+        };
+        /**
+         * Helper to generate scopes
+         * @param response
+         * @param request
+         * @returns
+         */
+        NativeInteractionClient.prototype.generateScopes = function (response, request) {
+            return response.scope ? ScopeSet.fromString(response.scope) : ScopeSet.fromString(request.scope);
+        };
+        /**
+         * If PoP token is requesred, records the PoP token if returned from the WAM, else generates one in the browser
+         * @param request
+         * @param response
+         */
+        NativeInteractionClient.prototype.generatePopAccessToken = function (response, request) {
+            return __awaiter$1(this, void 0, void 0, function () {
+                var popTokenGenerator, shrParameters;
+                return __generator$1(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
-                            this.logger.trace("NativeInteractionClient - handleNativeResponse called.");
-                            mats = this.getMATSFromResponse(response);
-                            this.performanceClient.addStaticFields({
-                                extensionId: this.nativeMessageHandler.getExtensionId(),
-                                extensionVersion: this.nativeMessageHandler.getExtensionVersion(),
-                                matsBrokerVersion: mats ? mats.broker_version : undefined,
-                                matsAccountJoinOnStart: mats ? mats.account_join_on_start : undefined,
-                                matsAccountJoinOnEnd: mats ? mats.account_join_on_end : undefined,
-                                matsDeviceJoin: mats ? mats.device_join : undefined,
-                                matsPromptBehavior: mats ? mats.prompt_behavior : undefined,
-                                matsApiErrorCode: mats ? mats.api_error_code : undefined,
-                                matsUiVisible: mats ? mats.ui_visible : undefined,
-                                matsSilentCode: mats ? mats.silent_code : undefined,
-                                matsSilentBiSubCode: mats ? mats.silent_bi_sub_code : undefined,
-                                matsSilentMessage: mats ? mats.silent_message : undefined,
-                                matsSilentStatus: mats ? mats.silent_status : undefined,
-                                matsHttpStatus: mats ? mats.http_status : undefined,
-                                matsHttpEventCount: mats ? mats.http_event_count : undefined
-                            }, this.correlationId);
-                            if (response.account.id !== request.accountId) {
-                                // User switch in native broker prompt is not supported. All users must first sign in through web flow to ensure server state is in sync
-                                throw NativeAuthError.createUserSwitchError();
-                            }
-                            idTokenObj = new AuthToken(response.id_token || Constants.EMPTY_STRING, this.browserCrypto);
-                            return [4 /*yield*/, this.getDiscoveredAuthority(request.authority)];
-                        case 1:
-                            authority = _b.sent();
-                            authorityPreferredCache = authority.getPreferredCache();
-                            homeAccountIdentifier = AccountEntity.generateHomeAccountId(response.client_info || Constants.EMPTY_STRING, AuthorityType.Default, this.logger, this.browserCrypto, idTokenObj);
-                            accountEntity = AccountEntity.createAccount(response.client_info, homeAccountIdentifier, idTokenObj, undefined, undefined, undefined, authorityPreferredCache, response.account.id);
-                            this.browserStorage.setAccount(accountEntity);
-                            responseScopes = response.scope ? ScopeSet.fromString(response.scope) : ScopeSet.fromString(request.scope);
-                            accountProperties = response.account.properties || {};
-                            uid = accountProperties["UID"] || idTokenObj.claims.oid || idTokenObj.claims.sub || Constants.EMPTY_STRING;
-                            tid = accountProperties["TenantId"] || idTokenObj.claims.tid || Constants.EMPTY_STRING;
-                            responseTokenType = exports.AuthenticationScheme.BEARER;
-                            _a = request.tokenType;
-                            switch (_a) {
-                                case exports.AuthenticationScheme.POP: return [3 /*break*/, 2];
-                            }
-                            return [3 /*break*/, 4];
-                        case 2:
-                            // Set the token type to POP in the response
-                            responseTokenType = exports.AuthenticationScheme.POP;
+                            if (!(request.tokenType === exports.AuthenticationScheme.POP)) return [3 /*break*/, 2];
+                            /**
+                             * This code prioritizes SHR returned from the native layer. In case of error/SHR not calculated from WAM and the AT
+                             * is still received, SHR is calculated locally
+                             */
                             // Check if native layer returned an SHR token
                             if (response.shr) {
                                 this.logger.trace("handleNativeServerResponse: SHR is enabled in native layer");
-                                responseAccessToken = response.shr;
-                                return [3 /*break*/, 5];
+                                return [2 /*return*/, response.shr];
                             }
                             popTokenGenerator = new PopTokenGenerator(this.browserCrypto);
                             shrParameters = {
@@ -11636,17 +12037,39 @@
                                 throw ClientAuthError.createKeyIdMissingError();
                             }
                             return [4 /*yield*/, popTokenGenerator.signPopToken(response.access_token, request.keyId, shrParameters)];
-                        case 3:
-                            responseAccessToken = _b.sent();
-                            return [3 /*break*/, 5];
-                        case 4:
-                            {
-                                responseAccessToken = response.access_token;
-                            }
-                            _b.label = 5;
-                        case 5:
+                        case 1: return [2 /*return*/, _a.sent()];
+                        case 2: return [2 /*return*/, response.access_token];
+                    }
+                });
+            });
+        };
+        /**
+         * Generates authentication result
+         * @param response
+         * @param request
+         * @param idTokenObj
+         * @param accountEntity
+         * @param authority
+         * @param reqTimestamp
+         * @returns
+         */
+        NativeInteractionClient.prototype.generateAuthenticationResult = function (response, request, idTokenObj, accountEntity, authority, reqTimestamp) {
+            return __awaiter$1(this, void 0, void 0, function () {
+                var mats, responseScopes, accountProperties, uid, tid, responseAccessToken, tokenType, result;
+                return __generator$1(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            mats = this.addTelemetryFromNativeResponse(response);
+                            responseScopes = response.scope ? ScopeSet.fromString(response.scope) : ScopeSet.fromString(request.scope);
+                            accountProperties = response.account.properties || {};
+                            uid = accountProperties["UID"] || idTokenObj.claims.oid || idTokenObj.claims.sub || Constants.EMPTY_STRING;
+                            tid = accountProperties["TenantId"] || idTokenObj.claims.tid || Constants.EMPTY_STRING;
+                            return [4 /*yield*/, this.generatePopAccessToken(response, request)];
+                        case 1:
+                            responseAccessToken = _a.sent();
+                            tokenType = (request.tokenType === exports.AuthenticationScheme.POP) ? exports.AuthenticationScheme.POP : exports.AuthenticationScheme.BEARER;
                             result = {
-                                authority: authority.canonicalAuthority,
+                                authority: authority,
                                 uniqueId: uid,
                                 tenantId: tid,
                                 scopes: responseScopes.asArray(),
@@ -11656,30 +12079,78 @@
                                 accessToken: responseAccessToken,
                                 fromCache: mats ? this.isResponseFromCache(mats) : false,
                                 expiresOn: new Date(Number(reqTimestamp + response.expires_in) * 1000),
-                                tokenType: responseTokenType,
+                                tokenType: tokenType,
                                 correlationId: this.correlationId,
                                 state: response.state,
                                 fromNativeBroker: true
                             };
-                            idTokenEntity = IdTokenEntity.createIdTokenEntity(homeAccountIdentifier, request.authority, response.id_token || Constants.EMPTY_STRING, request.clientId, idTokenObj.claims.tid || Constants.EMPTY_STRING);
-                            this.nativeStorageManager.setIdTokenCredential(idTokenEntity);
-                            expiresIn = (responseTokenType === exports.AuthenticationScheme.POP)
-                                ? Constants.SHR_NONCE_VALIDITY
-                                : (typeof response.expires_in === "string"
-                                    ? parseInt(response.expires_in, 10)
-                                    : response.expires_in) || 0;
-                            tokenExpirationSeconds = reqTimestamp + expiresIn;
-                            accessTokenEntity = AccessTokenEntity.createAccessTokenEntity(homeAccountIdentifier, request.authority, responseAccessToken, request.clientId, tid, responseScopes.printScopes(), tokenExpirationSeconds, 0, this.browserCrypto);
-                            this.nativeStorageManager.setAccessTokenCredential(accessTokenEntity);
-                            // Remove any existing cached tokens for this account in browser storage
-                            this.browserStorage.removeAccountContext(accountEntity).catch(function (e) {
-                                _this.logger.error("Error occurred while removing account context from browser storage. " + e);
-                            });
                             return [2 /*return*/, result];
                     }
                 });
             });
         };
+        /**
+         * cache the account entity in browser storage
+         * @param accountEntity
+         */
+        NativeInteractionClient.prototype.cacheAccount = function (accountEntity) {
+            var _this = this;
+            // Store the account info and hence `nativeAccountId` in browser cache
+            this.browserStorage.setAccount(accountEntity);
+            // Remove any existing cached tokens for this account in browser storage
+            this.browserStorage.removeAccountContext(accountEntity).catch(function (e) {
+                _this.logger.error("Error occurred while removing account context from browser storage. " + e);
+            });
+        };
+        /**
+         * Stores the access_token and id_token in inmemory storage
+         * @param response
+         * @param request
+         * @param homeAccountIdentifier
+         * @param idTokenObj
+         * @param responseAccessToken
+         * @param tenantId
+         * @param reqTimestamp
+         */
+        NativeInteractionClient.prototype.cacheNativeTokens = function (response, request, homeAccountIdentifier, idTokenObj, responseAccessToken, tenantId, reqTimestamp) {
+            // cache idToken in inmemory storage
+            var idTokenEntity = IdTokenEntity.createIdTokenEntity(homeAccountIdentifier, request.authority, response.id_token || Constants.EMPTY_STRING, request.clientId, idTokenObj.claims.tid || Constants.EMPTY_STRING);
+            this.nativeStorageManager.setIdTokenCredential(idTokenEntity);
+            // cache accessToken in inmemory storage
+            var expiresIn = (request.tokenType === exports.AuthenticationScheme.POP)
+                ? Constants.SHR_NONCE_VALIDITY
+                : (typeof response.expires_in === "string"
+                    ? parseInt(response.expires_in, 10)
+                    : response.expires_in) || 0;
+            var tokenExpirationSeconds = reqTimestamp + expiresIn;
+            var responseScopes = this.generateScopes(response, request);
+            var accessTokenEntity = AccessTokenEntity.createAccessTokenEntity(homeAccountIdentifier, request.authority, responseAccessToken, request.clientId, tenantId, responseScopes.printScopes(), tokenExpirationSeconds, 0, this.browserCrypto);
+            this.nativeStorageManager.setAccessTokenCredential(accessTokenEntity);
+        };
+        NativeInteractionClient.prototype.addTelemetryFromNativeResponse = function (response) {
+            var mats = this.getMATSFromResponse(response);
+            if (!mats) {
+                return null;
+            }
+            this.performanceClient.addStaticFields({
+                extensionId: this.nativeMessageHandler.getExtensionId(),
+                extensionVersion: this.nativeMessageHandler.getExtensionVersion(),
+                matsBrokerVersion: mats.broker_version,
+                matsAccountJoinOnStart: mats.account_join_on_start,
+                matsAccountJoinOnEnd: mats.account_join_on_end,
+                matsDeviceJoin: mats.device_join,
+                matsPromptBehavior: mats.prompt_behavior,
+                matsApiErrorCode: mats.api_error_code,
+                matsUiVisible: mats.ui_visible,
+                matsSilentCode: mats.silent_code,
+                matsSilentBiSubCode: mats.silent_bi_sub_code,
+                matsSilentMessage: mats.silent_message,
+                matsSilentStatus: mats.silent_status,
+                matsHttpStatus: mats.http_status,
+                matsHttpEventCount: mats.http_event_count
+            }, this.correlationId);
+            return mats;
+        };
         /**
          * Validates native platform response before processing
          * @param response
@@ -11798,7 +12269,7 @@
      * Licensed under the MIT License.
      */
     var NativeMessageHandler = /** @class */ (function () {
-        function NativeMessageHandler(logger, handshakeTimeoutMs, extensionId) {
+        function NativeMessageHandler(logger, handshakeTimeoutMs, performanceClient, extensionId) {
             this.logger = logger;
             this.handshakeTimeoutMs = handshakeTimeoutMs;
             this.extensionId = extensionId;
@@ -11807,6 +12278,8 @@
             this.responseId = 0;
             this.messageChannel = new MessageChannel();
             this.windowListener = this.onWindowMessage.bind(this); // Window event callback doesn't have access to 'this' unless it's bound
+            this.performanceClient = performanceClient;
+            this.handshakeEvent = performanceClient.startMeasurement(exports.PerformanceEvents.NativeMessageHandlerHandshake);
         }
         /**
          * Sends a given message to the extension and resolves with the extension response
@@ -11835,10 +12308,11 @@
         };
         /**
          * Returns an instance of the MessageHandler that has successfully established a connection with an extension
-         * @param logger
-         * @param handshakeTimeoutMs
+         * @param {Logger} logger
+         * @param {number} handshakeTimeoutMs
+         * @param {IPerformanceClient} performanceClient
          */
-        NativeMessageHandler.createProvider = function (logger, handshakeTimeoutMs) {
+        NativeMessageHandler.createProvider = function (logger, handshakeTimeoutMs, performanceClient) {
             return __awaiter$1(this, void 0, void 0, function () {
                 var preferredProvider, backupProvider;
                 return __generator$1(this, function (_a) {
@@ -11848,14 +12322,14 @@
                             _a.label = 1;
                         case 1:
                             _a.trys.push([1, 3, , 5]);
-                            preferredProvider = new NativeMessageHandler(logger, handshakeTimeoutMs, NativeConstants.PREFERRED_EXTENSION_ID);
+                            preferredProvider = new NativeMessageHandler(logger, handshakeTimeoutMs, performanceClient, NativeConstants.PREFERRED_EXTENSION_ID);
                             return [4 /*yield*/, preferredProvider.sendHandshakeRequest()];
                         case 2:
                             _a.sent();
                             return [2 /*return*/, preferredProvider];
                         case 3:
                             _a.sent();
-                            backupProvider = new NativeMessageHandler(logger, handshakeTimeoutMs);
+                            backupProvider = new NativeMessageHandler(logger, handshakeTimeoutMs, performanceClient);
                             return [4 /*yield*/, backupProvider.sendHandshakeRequest()];
                         case 4:
                             _a.sent();
@@ -11884,6 +12358,10 @@
                             method: NativeExtensionMethod.HandshakeRequest
                         }
                     };
+                    this.handshakeEvent.addStaticFields({
+                        extensionId: this.extensionId,
+                        extensionHandshakeTimeoutMs: this.handshakeTimeoutMs
+                    });
                     this.messageChannel.port1.onmessage = function (event) {
                         _this.onChannelMessage(event);
                     };
@@ -11898,6 +12376,7 @@
                                 window.removeEventListener("message", _this.windowListener, false);
                                 _this.messageChannel.port1.close();
                                 _this.messageChannel.port2.close();
+                                _this.handshakeEvent.endMeasurement({ extensionHandshakeTimedOut: true, success: false });
                                 reject(BrowserAuthError.createNativeHandshakeTimeoutError());
                                 _this.handshakeResolvers.delete(req.responseId);
                             }, _this.handshakeTimeoutMs); // Use a reasonable timeout in milliseconds here
@@ -11931,6 +12410,7 @@
                 window.removeEventListener("message", this.windowListener, false);
                 var handshakeResolver = this.handshakeResolvers.get(request.responseId);
                 if (handshakeResolver) {
+                    this.handshakeEvent.endMeasurement({ success: false, extensionInstalled: false });
                     handshakeResolver.reject(BrowserAuthError.createNativeExtensionNotInstalledError());
                 }
             }
@@ -11978,6 +12458,7 @@
                     this.extensionId = request.extensionId;
                     this.extensionVersion = request.body.version;
                     this.logger.verbose("NativeMessageHandler - Received HandshakeResponse from extension: " + this.extensionId);
+                    this.handshakeEvent.endMeasurement({ extensionInstalled: true, success: true });
                     handshakeResolver.resolve();
                     this.handshakeResolvers.delete(request.responseId);
                 }
@@ -12065,7 +12546,9 @@
                 var _this = this;
                 return __generator$1(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.initializeAuthorizationRequest(request, exports.InteractionType.Redirect)];
+                        case 0:
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest, request.correlationId);
+                            return [4 /*yield*/, this.initializeAuthorizationRequest(request, exports.InteractionType.Redirect)];
                         case 1:
                             validRequest = _a.sent();
                             this.browserStorage.updateCacheEntries(validRequest.state, validRequest.nonce, validRequest.authority, validRequest.loginHint || Constants.EMPTY_STRING, validRequest.account || null);
@@ -12080,14 +12563,18 @@
                             _a.label = 2;
                         case 2:
                             _a.trys.push([2, 7, , 8]);
+                            // Create auth code request and generate PKCE params
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest, request.correlationId);
                             return [4 /*yield*/, this.initializeAuthorizationCodeRequest(validRequest)];
                         case 3:
                             authCodeRequest = _a.sent();
+                            // Initialize the client
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, request.correlationId);
                             return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, validRequest.authority, validRequest.azureCloudOptions)];
                         case 4:
                             authClient = _a.sent();
                             this.logger.verbose("Auth code client created");
-                            interactionHandler = new RedirectHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.browserCrypto);
+                            interactionHandler = new RedirectHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.browserCrypto, this.performanceClient);
                             return [4 /*yield*/, authClient.getAuthCodeUrl(__assign$1(__assign$1({}, validRequest), { nativeBroker: NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeMessageHandler, request.authenticationScheme) }))];
                         case 5:
                             navigateUrl = _a.sent();
@@ -12273,12 +12760,13 @@
                             if (!currentAuthority) {
                                 throw BrowserAuthError.createNoCachedAuthorityError();
                             }
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, cachedRequest.correlationId);
                             return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, currentAuthority)];
                         case 1:
                             authClient = _a.sent();
                             this.logger.verbose("Auth code client created");
                             ThrottlingUtils.removeThrottle(this.browserStorage, this.config.auth.clientId, cachedRequest);
-                            interactionHandler = new RedirectHandler(authClient, this.browserStorage, cachedRequest, this.logger, this.browserCrypto);
+                            interactionHandler = new RedirectHandler(authClient, this.browserStorage, cachedRequest, this.logger, this.browserCrypto, this.performanceClient);
                             return [4 /*yield*/, interactionHandler.handleCodeResponseFromHash(hash, state, authClient.authority, this.networkClient)];
                         case 2: return [2 /*return*/, _a.sent()];
                     }
@@ -12313,6 +12801,7 @@
                                 timeout: this.config.system.redirectNavigationTimeout,
                                 noHistory: false
                             };
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, validLogoutRequest.correlationId);
                             return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, logoutRequest && logoutRequest.authority)];
                         case 3:
                             authClient = _a.sent();
@@ -12460,6 +12949,7 @@
                         case 0:
                             this.logger.verbose("acquireTokenPopupAsync called");
                             serverTelemetryManager = this.initializeServerTelemetryManager(exports.ApiId.acquireTokenPopup);
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest, request.correlationId);
                             return [4 /*yield*/, this.initializeAuthorizationRequest(request, exports.InteractionType.Popup)];
                         case 1:
                             validRequest = _a.sent();
@@ -12467,9 +12957,13 @@
                             _a.label = 2;
                         case 2:
                             _a.trys.push([2, 8, , 9]);
+                            // Create auth code request and generate PKCE params
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest, request.correlationId);
                             return [4 /*yield*/, this.initializeAuthorizationCodeRequest(validRequest)];
                         case 3:
                             authCodeRequest = _a.sent();
+                            // Initialize the client
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, request.correlationId);
                             return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, validRequest.authority, validRequest.azureCloudOptions)];
                         case 4:
                             authClient = _a.sent();
@@ -12482,7 +12976,7 @@
                             return [4 /*yield*/, authClient.getAuthCodeUrl(__assign$1(__assign$1({}, validRequest), { nativeBroker: isNativeBroker }))];
                         case 5:
                             navigateUrl = _a.sent();
-                            interactionHandler = new InteractionHandler(authClient, this.browserStorage, authCodeRequest, this.logger);
+                            interactionHandler = new InteractionHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.performanceClient);
                             popupParameters = {
                                 popup: popup,
                                 popupName: popupName,
@@ -12563,6 +13057,8 @@
                         case 2:
                             // Clear cache on logout
                             _a.sent();
+                            // Initialize the client
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, validRequest.correlationId);
                             return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, requestAuthority)];
                         case 3:
                             authClient = _a.sent();
@@ -12991,8 +13487,8 @@
      */
     var SilentHandler = /** @class */ (function (_super) {
         __extends$1(SilentHandler, _super);
-        function SilentHandler(authCodeModule, storageImpl, authCodeRequest, logger, systemOptions) {
-            var _this = _super.call(this, authCodeModule, storageImpl, authCodeRequest, logger) || this;
+        function SilentHandler(authCodeModule, storageImpl, authCodeRequest, logger, systemOptions, performanceClient) {
+            var _this = _super.call(this, authCodeModule, storageImpl, authCodeRequest, logger, performanceClient) || this;
             _this.navigateFrameWait = systemOptions.navigateFrameWait;
             _this.pollIntervalMilliseconds = systemOptions.pollIntervalMilliseconds;
             return _this;
@@ -13004,24 +13500,20 @@
          */
         SilentHandler.prototype.initiateAuthRequest = function (requestUrl) {
             return __awaiter$1(this, void 0, void 0, function () {
-                var _a;
-                return __generator$1(this, function (_b) {
-                    switch (_b.label) {
+                return __generator$1(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.SilentHandlerInitiateAuthRequest, this.authCodeRequest.correlationId);
                             if (StringUtils.isEmpty(requestUrl)) {
                                 // Throw error if request URL is empty.
                                 this.logger.info("Navigate url is empty");
                                 throw BrowserAuthError.createEmptyNavigationUriError();
                             }
                             if (!this.navigateFrameWait) return [3 /*break*/, 2];
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.SilentHandlerLoadFrame, this.authCodeRequest.correlationId);
                             return [4 /*yield*/, this.loadFrame(requestUrl)];
-                        case 1:
-                            _a = _b.sent();
-                            return [3 /*break*/, 3];
-                        case 2:
-                            _a = this.loadFrameSync(requestUrl);
-                            _b.label = 3;
-                        case 3: return [2 /*return*/, _a];
+                        case 1: return [2 /*return*/, _a.sent()];
+                        case 2: return [2 /*return*/, this.loadFrameSync(requestUrl)];
                     }
                 });
             });
@@ -13033,6 +13525,7 @@
          */
         SilentHandler.prototype.monitorIframeForHash = function (iframe, timeout) {
             var _this = this;
+            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.SilentHandlerMonitorIframeForHash, this.authCodeRequest.correlationId);
             return new Promise(function (resolve, reject) {
                 if (timeout < DEFAULT_IFRAME_TIMEOUT_MS) {
                     _this.logger.warning("system.loadFrameTimeout or system.iframeHashTimeout set to lower (" + timeout + "ms) than the default (" + DEFAULT_IFRAME_TIMEOUT_MS + "ms). This may result in timeouts.");
@@ -13081,11 +13574,12 @@
          * @ignore
          */
         SilentHandler.prototype.loadFrame = function (urlNavigate) {
+            var _this = this;
+            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.SilentHandlerLoadFrame, this.authCodeRequest.correlationId);
             /*
              * This trick overcomes iframe navigation in IE
              * IE does not load the page consistently in iframe
              */
-            var _this = this;
             return new Promise(function (resolve, reject) {
                 var frameHandle = _this.createHiddenIframe();
                 setTimeout(function () {
@@ -13160,6 +13654,7 @@
                 return __generator$1(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.SilentIframeClientAcquireToken, request.correlationId);
                             this.logger.verbose("acquireTokenByIframe called");
                             acquireTokenMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.SilentIframeClientAcquireToken, request.correlationId);
                             // Check that we have some SSO data
@@ -13173,6 +13668,8 @@
                                 });
                                 throw BrowserAuthError.createSilentPromptValueError(request.prompt);
                             }
+                            // Create silent request
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest, request.correlationId);
                             return [4 /*yield*/, this.initializeAuthorizationRequest(__assign$1(__assign$1({}, request), { prompt: request.prompt || PromptValue.NONE }), exports.InteractionType.Silent)];
                         case 1:
                             silentRequest = _a.sent();
@@ -13181,10 +13678,13 @@
                             _a.label = 2;
                         case 2:
                             _a.trys.push([2, 5, , 6]);
+                            // Initialize the client
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, request.correlationId);
                             return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions)];
                         case 3:
                             authClient = _a.sent();
                             this.logger.verbose("Auth code client created");
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.SilentIframeClientTokenHelper, request.correlationId);
                             return [4 /*yield*/, this.silentTokenHelper(authClient, silentRequest).then(function (result) {
                                     acquireTokenMeasurement.endMeasurement({
                                         success: true,
@@ -13231,16 +13731,26 @@
                 var _this = this;
                 return __generator$1(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.initializeAuthorizationCodeRequest(silentRequest)];
+                        case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.SilentIframeClientTokenHelper, silentRequest.correlationId);
+                            // Create auth code request and generate PKCE params
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest, silentRequest.correlationId);
+                            return [4 /*yield*/, this.initializeAuthorizationCodeRequest(silentRequest)];
                         case 1:
                             authCodeRequest = _a.sent();
+                            // Create authorize request url
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.GetAuthCodeUrl, silentRequest.correlationId);
                             return [4 /*yield*/, authClient.getAuthCodeUrl(__assign$1(__assign$1({}, silentRequest), { nativeBroker: NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeMessageHandler, silentRequest.authenticationScheme) }))];
                         case 2:
                             navigateUrl = _a.sent();
-                            silentHandler = new SilentHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.config.system);
+                            silentHandler = new SilentHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.config.system, this.performanceClient);
+                            // Get the frame handle for the silent request
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.SilentHandlerInitiateAuthRequest, silentRequest.correlationId);
                             return [4 /*yield*/, silentHandler.initiateAuthRequest(navigateUrl)];
                         case 3:
                             msalFrame = _a.sent();
+                            // Monitor the window for the hash. Return the string value and close the popup when the hash is received. Default timeout is 60 seconds.
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.SilentHandlerMonitorIframeForHash, silentRequest.correlationId);
                             return [4 /*yield*/, silentHandler.monitorIframeForHash(msalFrame, this.config.system.iframeHashTimeout)];
                         case 4:
                             hash = _a.sent();
@@ -13258,6 +13768,7 @@
                                     })];
                             }
                             // Handle response from hash string
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.HandleCodeResponseFromHash, silentRequest.correlationId);
                             return [2 /*return*/, silentHandler.handleCodeResponseFromHash(hash, state, authClient.authority, this.networkClient)];
                     }
                 });
@@ -13286,6 +13797,8 @@
                 return __generator$1(this, function (_b) {
                     switch (_b.label) {
                         case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.SilentRefreshClientAcquireToken, request.correlationId);
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.InitializeBaseRequest, request.correlationId);
                             _a = [__assign$1({}, request)];
                             return [4 /*yield*/, this.initializeBaseRequest(request)];
                         case 1:
@@ -13297,6 +13810,7 @@
                             refreshTokenClient = _b.sent();
                             this.logger.verbose("Refresh token client created");
                             // Send request to renew token. Auth module will throw errors if token cannot be renewed.
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientAcquireTokenByRefreshToken, request.correlationId);
                             return [2 /*return*/, refreshTokenClient.acquireTokenByRefreshToken(silentRequest)
                                     .then(function (result) {
                                     acquireTokenMeasurement.endMeasurement({
@@ -13339,7 +13853,10 @@
                 var clientConfig;
                 return __generator$1(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, azureCloudOptions)];
+                        case 0:
+                            // Create auth module.
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientGetClientConfiguration, this.correlationId);
+                            return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, azureCloudOptions)];
                         case 1:
                             clientConfig = _a.sent();
                             return [2 /*return*/, new RefreshTokenClient(clientConfig, this.performanceClient)];
@@ -14918,91 +15435,304 @@
                             return [2 /*return*/, !keyFound];
                     }
                 });
-            });
+            });
+        };
+        /**
+         * Removes all cryptographic keys from IndexedDB storage
+         */
+        CryptoOps.prototype.clearKeystore = function () {
+            return __awaiter$1(this, void 0, void 0, function () {
+                return __generator$1(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.cache.clear()];
+                        case 1: return [2 /*return*/, _a.sent()];
+                    }
+                });
+            });
+        };
+        /**
+         * Signs the given object as a jwt payload with private key retrieved by given kid.
+         * @param payload
+         * @param kid
+         */
+        CryptoOps.prototype.signJwt = function (payload, kid, correlationId) {
+            var _a;
+            return __awaiter$1(this, void 0, void 0, function () {
+                var signJwtMeasurement, cachedKeyPair, publicKeyJwk, publicKeyJwkString, encodedKeyIdThumbprint, shrHeader, encodedShrHeader, encodedPayload, tokenString, tokenBuffer, signatureBuffer, encodedSignature, signedJwt;
+                return __generator$1(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            signJwtMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.CryptoOptsSignJwt, correlationId);
+                            return [4 /*yield*/, this.cache.asymmetricKeys.getItem(kid)];
+                        case 1:
+                            cachedKeyPair = _b.sent();
+                            if (!cachedKeyPair) {
+                                throw BrowserAuthError.createSigningKeyNotFoundInStorageError(kid);
+                            }
+                            return [4 /*yield*/, this.browserCrypto.exportJwk(cachedKeyPair.publicKey)];
+                        case 2:
+                            publicKeyJwk = _b.sent();
+                            publicKeyJwkString = BrowserStringUtils.getSortedObjectString(publicKeyJwk);
+                            encodedKeyIdThumbprint = this.b64Encode.urlEncode(JSON.stringify({ kid: kid }));
+                            shrHeader = JoseHeader.getShrHeaderString({ kid: encodedKeyIdThumbprint, alg: publicKeyJwk.alg });
+                            encodedShrHeader = this.b64Encode.urlEncode(shrHeader);
+                            // Generate payload
+                            payload.cnf = {
+                                jwk: JSON.parse(publicKeyJwkString)
+                            };
+                            encodedPayload = this.b64Encode.urlEncode(JSON.stringify(payload));
+                            tokenString = encodedShrHeader + "." + encodedPayload;
+                            tokenBuffer = BrowserStringUtils.stringToArrayBuffer(tokenString);
+                            return [4 /*yield*/, this.browserCrypto.sign(cachedKeyPair.privateKey, tokenBuffer)];
+                        case 3:
+                            signatureBuffer = _b.sent();
+                            encodedSignature = this.b64Encode.urlEncodeArr(new Uint8Array(signatureBuffer));
+                            signedJwt = tokenString + "." + encodedSignature;
+                            if (signJwtMeasurement) {
+                                signJwtMeasurement.endMeasurement({
+                                    success: true
+                                });
+                            }
+                            return [2 /*return*/, signedJwt];
+                    }
+                });
+            });
+        };
+        /**
+         * Returns the SHA-256 hash of an input string
+         * @param plainText
+         */
+        CryptoOps.prototype.hashString = function (plainText) {
+            return __awaiter$1(this, void 0, void 0, function () {
+                var hashBuffer, hashBytes;
+                return __generator$1(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.browserCrypto.sha256Digest(plainText)];
+                        case 1:
+                            hashBuffer = _a.sent();
+                            hashBytes = new Uint8Array(hashBuffer);
+                            return [2 /*return*/, this.b64Encode.urlEncodeArr(hashBytes)];
+                    }
+                });
+            });
+        };
+        CryptoOps.POP_KEY_USAGES = ["sign", "verify"];
+        CryptoOps.EXTRACTABLE = true;
+        return CryptoOps;
+    }());
+
+    /*
+     * Copyright (c) Microsoft Corporation. All rights reserved.
+     * Licensed under the MIT License.
+     */
+    var BrowserPerformanceMeasurement = /** @class */ (function () {
+        function BrowserPerformanceMeasurement(name, correlationId) {
+            this.correlationId = correlationId;
+            this.measureName = BrowserPerformanceMeasurement.makeMeasureName(name, correlationId);
+            this.startMark = BrowserPerformanceMeasurement.makeStartMark(name, correlationId);
+            this.endMark = BrowserPerformanceMeasurement.makeEndMark(name, correlationId);
+        }
+        BrowserPerformanceMeasurement.makeMeasureName = function (name, correlationId) {
+            return "msal.measure." + name + "." + correlationId;
+        };
+        BrowserPerformanceMeasurement.makeStartMark = function (name, correlationId) {
+            return "msal.start." + name + "." + correlationId;
+        };
+        BrowserPerformanceMeasurement.makeEndMark = function (name, correlationId) {
+            return "msal.end." + name + "." + correlationId;
+        };
+        BrowserPerformanceMeasurement.supportsBrowserPerformance = function () {
+            return typeof window !== "undefined" &&
+                typeof window.performance !== "undefined" &&
+                typeof window.performance.mark === "function" &&
+                typeof window.performance.measure === "function" &&
+                typeof window.performance.clearMarks === "function" &&
+                typeof window.performance.clearMeasures === "function" &&
+                typeof window.performance.getEntriesByName === "function";
+        };
+        /**
+         * Flush browser marks and measurements.
+         * @param {string} correlationId
+         * @param {SubMeasurement} measurements
+         */
+        BrowserPerformanceMeasurement.flushMeasurements = function (correlationId, measurements) {
+            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
+                try {
+                    measurements.forEach(function (measurement) {
+                        var measureName = BrowserPerformanceMeasurement.makeMeasureName(measurement.name, correlationId);
+                        var entriesForMeasurement = window.performance.getEntriesByName(measureName, "measure");
+                        if (entriesForMeasurement.length > 0) {
+                            window.performance.clearMeasures(measureName);
+                            window.performance.clearMarks(BrowserPerformanceMeasurement.makeStartMark(measureName, correlationId));
+                            window.performance.clearMarks(BrowserPerformanceMeasurement.makeEndMark(measureName, correlationId));
+                        }
+                    });
+                }
+                catch (e) {
+                    // Silently catch and return null
+                }
+            }
+        };
+        BrowserPerformanceMeasurement.prototype.startMeasurement = function () {
+            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
+                try {
+                    window.performance.mark(this.startMark);
+                }
+                catch (e) {
+                    // Silently catch
+                }
+            }
+        };
+        BrowserPerformanceMeasurement.prototype.endMeasurement = function () {
+            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
+                try {
+                    window.performance.mark(this.endMark);
+                    window.performance.measure(this.measureName, this.startMark, this.endMark);
+                }
+                catch (e) {
+                    // Silently catch
+                }
+            }
+        };
+        BrowserPerformanceMeasurement.prototype.flushMeasurement = function () {
+            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
+                try {
+                    var entriesForMeasurement = window.performance.getEntriesByName(this.measureName, "measure");
+                    if (entriesForMeasurement.length > 0) {
+                        var durationMs = entriesForMeasurement[0].duration;
+                        window.performance.clearMeasures(this.measureName);
+                        window.performance.clearMarks(this.startMark);
+                        window.performance.clearMarks(this.endMark);
+                        return durationMs;
+                    }
+                }
+                catch (e) {
+                    // Silently catch and return null
+                }
+            }
+            return null;
+        };
+        return BrowserPerformanceMeasurement;
+    }());
+
+    /*
+     * Copyright (c) Microsoft Corporation. All rights reserved.
+     * Licensed under the MIT License.
+     */
+    var BrowserPerformanceClient = /** @class */ (function (_super) {
+        __extends$1(BrowserPerformanceClient, _super);
+        function BrowserPerformanceClient(clientId, authority, logger, libraryName, libraryVersion, applicationTelemetry, cryptoOptions) {
+            var _this = _super.call(this, clientId, authority, logger, libraryName, libraryVersion, applicationTelemetry) || this;
+            _this.browserCrypto = new BrowserCrypto(_this.logger, cryptoOptions);
+            _this.guidGenerator = new GuidGenerator(_this.browserCrypto);
+            return _this;
+        }
+        BrowserPerformanceClient.prototype.startPerformanceMeasuremeant = function (measureName, correlationId) {
+            return new BrowserPerformanceMeasurement(measureName, correlationId);
+        };
+        BrowserPerformanceClient.prototype.generateId = function () {
+            return this.guidGenerator.generateGuid();
+        };
+        BrowserPerformanceClient.prototype.getPageVisibility = function () {
+            var _a;
+            return ((_a = document.visibilityState) === null || _a === void 0 ? void 0 : _a.toString()) || null;
+        };
+        BrowserPerformanceClient.prototype.deleteIncompleteSubMeasurements = function (inProgressEvent) {
+            var rootEvent = this.eventsByCorrelationId.get(inProgressEvent.event.correlationId);
+            var isRootEvent = rootEvent && rootEvent.eventId === inProgressEvent.event.eventId;
+            var incompleteMeasurements = [];
+            if (isRootEvent && (rootEvent === null || rootEvent === void 0 ? void 0 : rootEvent.incompleteSubMeasurements)) {
+                rootEvent.incompleteSubMeasurements.forEach(function (subMeasurement) {
+                    incompleteMeasurements.push(__assign$1({}, subMeasurement));
+                });
+            }
+            // Clean up remaining marks for incomplete sub-measurements
+            if (incompleteMeasurements.length > 0) {
+                BrowserPerformanceMeasurement.flushMeasurements(inProgressEvent.event.correlationId, incompleteMeasurements);
+            }
+        };
+        BrowserPerformanceClient.prototype.supportsBrowserPerformanceNow = function () {
+            return typeof window !== "undefined" &&
+                typeof window.performance !== "undefined" &&
+                typeof window.performance.now === "function";
         };
         /**
-         * Removes all cryptographic keys from IndexedDB storage
+         * Starts measuring performance for a given operation. Returns a function that should be used to end the measurement.
+         * Also captures browser page visibilityState.
+         *
+         * @param {PerformanceEvents} measureName
+         * @param {?string} [correlationId]
+         * @returns {((event?: Partial<PerformanceEvent>) => PerformanceEvent| null)}
          */
-        CryptoOps.prototype.clearKeystore = function () {
-            return __awaiter$1(this, void 0, void 0, function () {
-                return __generator$1(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.cache.clear()];
-                        case 1: return [2 /*return*/, _a.sent()];
-                    }
-                });
-            });
+        BrowserPerformanceClient.prototype.startMeasurement = function (measureName, correlationId) {
+            var _this = this;
+            // Capture page visibilityState and then invoke start/end measurement
+            var startPageVisibility = this.getPageVisibility();
+            var inProgressEvent = _super.prototype.startMeasurement.call(this, measureName, correlationId);
+            return __assign$1(__assign$1({}, inProgressEvent), { endMeasurement: function (event) {
+                    var res = inProgressEvent.endMeasurement(__assign$1({ startPageVisibility: startPageVisibility, endPageVisibility: _this.getPageVisibility() }, event));
+                    _this.deleteIncompleteSubMeasurements(inProgressEvent);
+                    return res;
+                }, discardMeasurement: function () {
+                    inProgressEvent.discardMeasurement();
+                    _this.deleteIncompleteSubMeasurements(inProgressEvent);
+                    inProgressEvent.measurement.flushMeasurement();
+                } });
         };
         /**
-         * Signs the given object as a jwt payload with private key retrieved by given kid.
-         * @param payload
-         * @param kid
+         * Adds pre-queue time to preQueueTimeByCorrelationId map.
+         * @param {PerformanceEvents} eventName
+         * @param {?string} correlationId
+         * @returns
          */
-        CryptoOps.prototype.signJwt = function (payload, kid, correlationId) {
-            var _a;
-            return __awaiter$1(this, void 0, void 0, function () {
-                var signJwtMeasurement, cachedKeyPair, publicKeyJwk, publicKeyJwkString, encodedKeyIdThumbprint, shrHeader, encodedShrHeader, encodedPayload, tokenString, tokenBuffer, signatureBuffer, encodedSignature, signedJwt;
-                return __generator$1(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            signJwtMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.CryptoOptsSignJwt, correlationId);
-                            return [4 /*yield*/, this.cache.asymmetricKeys.getItem(kid)];
-                        case 1:
-                            cachedKeyPair = _b.sent();
-                            if (!cachedKeyPair) {
-                                throw BrowserAuthError.createSigningKeyNotFoundInStorageError(kid);
-                            }
-                            return [4 /*yield*/, this.browserCrypto.exportJwk(cachedKeyPair.publicKey)];
-                        case 2:
-                            publicKeyJwk = _b.sent();
-                            publicKeyJwkString = BrowserStringUtils.getSortedObjectString(publicKeyJwk);
-                            encodedKeyIdThumbprint = this.b64Encode.urlEncode(JSON.stringify({ kid: kid }));
-                            shrHeader = JoseHeader.getShrHeaderString({ kid: encodedKeyIdThumbprint, alg: publicKeyJwk.alg });
-                            encodedShrHeader = this.b64Encode.urlEncode(shrHeader);
-                            // Generate payload
-                            payload.cnf = {
-                                jwk: JSON.parse(publicKeyJwkString)
-                            };
-                            encodedPayload = this.b64Encode.urlEncode(JSON.stringify(payload));
-                            tokenString = encodedShrHeader + "." + encodedPayload;
-                            tokenBuffer = BrowserStringUtils.stringToArrayBuffer(tokenString);
-                            return [4 /*yield*/, this.browserCrypto.sign(cachedKeyPair.privateKey, tokenBuffer)];
-                        case 3:
-                            signatureBuffer = _b.sent();
-                            encodedSignature = this.b64Encode.urlEncodeArr(new Uint8Array(signatureBuffer));
-                            signedJwt = tokenString + "." + encodedSignature;
-                            if (signJwtMeasurement) {
-                                signJwtMeasurement.endMeasurement({
-                                    success: true
-                                });
-                            }
-                            return [2 /*return*/, signedJwt];
-                    }
-                });
-            });
+        BrowserPerformanceClient.prototype.setPreQueueTime = function (eventName, correlationId) {
+            if (!this.supportsBrowserPerformanceNow()) {
+                this.logger.trace("BrowserPerformanceClient: window performance API not available, unable to set telemetry queue time for " + eventName);
+                return;
+            }
+            if (!correlationId) {
+                this.logger.trace("BrowserPerformanceClient: correlationId for " + eventName + " not provided, unable to set telemetry queue time");
+                return;
+            }
+            var preQueueEvent = this.preQueueTimeByCorrelationId.get(correlationId);
+            /**
+             * Manually complete queue measurement if there is an incomplete pre-queue event.
+             * Incomplete pre-queue events are instrumentation bugs that should be fixed.
+             */
+            if (preQueueEvent) {
+                this.logger.trace("BrowserPerformanceClient: Incomplete pre-queue " + preQueueEvent.name + " found", correlationId);
+                this.addQueueMeasurement(preQueueEvent.name, correlationId, undefined, true);
+            }
+            this.preQueueTimeByCorrelationId.set(eventName, { name: eventName, time: window.performance.now() });
         };
         /**
-         * Returns the SHA-256 hash of an input string
-         * @param plainText
+         * Calculates and adds queue time measurement for given performance event.
+         *
+         * @param {PerformanceEvents} eventName
+         * @param {?string} correlationId
+         * @param {?number} queueTime
+         * @param {?boolean} manuallyCompleted - indicator for manually completed queue measurements
+         * @returns
          */
-        CryptoOps.prototype.hashString = function (plainText) {
-            return __awaiter$1(this, void 0, void 0, function () {
-                var hashBuffer, hashBytes;
-                return __generator$1(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.browserCrypto.sha256Digest(plainText)];
-                        case 1:
-                            hashBuffer = _a.sent();
-                            hashBytes = new Uint8Array(hashBuffer);
-                            return [2 /*return*/, this.b64Encode.urlEncodeArr(hashBytes)];
-                    }
-                });
-            });
+        BrowserPerformanceClient.prototype.addQueueMeasurement = function (eventName, correlationId, queueTime, manuallyCompleted) {
+            if (!this.supportsBrowserPerformanceNow()) {
+                this.logger.trace("BrowserPerformanceClient: window performance API not available, unable to add queue measurement for " + eventName);
+                return;
+            }
+            if (!correlationId) {
+                this.logger.trace("BrowserPerformanceClient: correlationId for " + eventName + " not provided, unable to add queue measurement");
+                return;
+            }
+            var preQueueTime = _super.prototype.getPreQueueTime.call(this, eventName, correlationId);
+            if (!preQueueTime) {
+                return;
+            }
+            var currentTime = window.performance.now();
+            var resQueueTime = queueTime || _super.prototype.calculateQueuedTime.call(this, preQueueTime, currentTime);
+            return _super.prototype.addQueueMeasurement.call(this, eventName, correlationId, resQueueTime, manuallyCompleted);
         };
-        CryptoOps.POP_KEY_USAGES = ["sign", "verify"];
-        CryptoOps.EXTRACTABLE = true;
-        return CryptoOps;
-    }());
+        return BrowserPerformanceClient;
+    }(PerformanceClient));
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -15018,13 +15748,16 @@
         SilentIframeClient: SilentIframeClient,
         SilentCacheClient: SilentCacheClient,
         SilentRefreshClient: SilentRefreshClient,
+        NativeInteractionClient: NativeInteractionClient,
         RedirectHandler: RedirectHandler,
         EventHandler: EventHandler,
         NativeMessageHandler: NativeMessageHandler,
         BrowserConstants: BrowserConstants,
         get TemporaryCacheKeys () { return TemporaryCacheKeys; },
         CryptoOps: CryptoOps,
-        NativeAuthError: NativeAuthError
+        NativeAuthError: NativeAuthError,
+        BrowserPerformanceClient: BrowserPerformanceClient,
+        BrowserPerformanceMeasurement: BrowserPerformanceMeasurement
     });
 
     /*
@@ -15287,6 +16020,8 @@
                             if (!request.code) {
                                 throw BrowserAuthError.createAuthCodeRequiredError();
                             }
+                            // Create silent request
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest, request.correlationId);
                             return [4 /*yield*/, this.initializeAuthorizationRequest(request, exports.InteractionType.Silent)];
                         case 1:
                             silentRequest = _a.sent();
@@ -15296,12 +16031,14 @@
                         case 2:
                             _a.trys.push([2, 4, , 5]);
                             authCodeRequest = __assign$1(__assign$1({}, silentRequest), { code: request.code });
+                            // Initialize the client
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.StandardInteractionClientGetClientConfiguration, request.correlationId);
                             return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, silentRequest.authority)];
                         case 3:
                             clientConfig = _a.sent();
                             authClient = new HybridSpaAuthorizationCodeClient(clientConfig);
                             this.logger.verbose("Auth code client created");
-                            silentHandler = new SilentHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.config.system);
+                            silentHandler = new SilentHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.config.system, this.performanceClient);
                             // Handle auth code parameters from request
                             return [2 /*return*/, silentHandler.handleCodeResponseFromServer({
                                     code: request.code,
@@ -15332,110 +16069,6 @@
         return SilentAuthCodeClient;
     }(StandardInteractionClient));
 
-    /*
-     * Copyright (c) Microsoft Corporation. All rights reserved.
-     * Licensed under the MIT License.
-     */
-    var BrowserPerformanceMeasurement = /** @class */ (function () {
-        function BrowserPerformanceMeasurement(name, correlationId) {
-            this.correlationId = correlationId;
-            this.measureName = "msal.measure." + name + "." + this.correlationId;
-            this.startMark = "msal.start." + name + "." + this.correlationId;
-            this.endMark = "msal.end." + name + "." + this.correlationId;
-        }
-        BrowserPerformanceMeasurement.supportsBrowserPerformance = function () {
-            return typeof window !== "undefined" &&
-                typeof window.performance !== "undefined" &&
-                typeof window.performance.mark === "function" &&
-                typeof window.performance.measure === "function" &&
-                typeof window.performance.clearMarks === "function" &&
-                typeof window.performance.clearMeasures === "function" &&
-                typeof window.performance.getEntriesByName === "function";
-        };
-        BrowserPerformanceMeasurement.prototype.startMeasurement = function () {
-            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
-                try {
-                    window.performance.mark(this.startMark);
-                }
-                catch (e) {
-                    // Silently catch
-                }
-            }
-        };
-        BrowserPerformanceMeasurement.prototype.endMeasurement = function () {
-            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
-                try {
-                    window.performance.mark(this.endMark);
-                    window.performance.measure(this.measureName, this.startMark, this.endMark);
-                }
-                catch (e) {
-                    // Silently catch
-                }
-            }
-        };
-        BrowserPerformanceMeasurement.prototype.flushMeasurement = function () {
-            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
-                try {
-                    var entriesForMeasurement = window.performance.getEntriesByName(this.measureName, "measure");
-                    if (entriesForMeasurement.length > 0) {
-                        var durationMs = entriesForMeasurement[0].duration;
-                        window.performance.clearMeasures(this.measureName);
-                        window.performance.clearMarks(this.startMark);
-                        window.performance.clearMarks(this.endMark);
-                        return durationMs;
-                    }
-                }
-                catch (e) {
-                    // Silently catch and return null
-                }
-            }
-            return null;
-        };
-        return BrowserPerformanceMeasurement;
-    }());
-
-    /*
-     * Copyright (c) Microsoft Corporation. All rights reserved.
-     * Licensed under the MIT License.
-     */
-    var BrowserPerformanceClient = /** @class */ (function (_super) {
-        __extends$1(BrowserPerformanceClient, _super);
-        function BrowserPerformanceClient(clientId, authority, logger, libraryName, libraryVersion, applicationTelemetry, cryptoOptions) {
-            var _this = _super.call(this, clientId, authority, logger, libraryName, libraryVersion, applicationTelemetry) || this;
-            _this.browserCrypto = new BrowserCrypto(_this.logger, cryptoOptions);
-            _this.guidGenerator = new GuidGenerator(_this.browserCrypto);
-            return _this;
-        }
-        BrowserPerformanceClient.prototype.startPerformanceMeasurement = function (measureName, correlationId) {
-            return new BrowserPerformanceMeasurement(measureName, correlationId);
-        };
-        BrowserPerformanceClient.prototype.generateId = function () {
-            return this.guidGenerator.generateGuid();
-        };
-        BrowserPerformanceClient.prototype.getPageVisibility = function () {
-            var _a;
-            return ((_a = document.visibilityState) === null || _a === void 0 ? void 0 : _a.toString()) || null;
-        };
-        /**
-         * Starts measuring performance for a given operation. Returns a function that should be used to end the measurement.
-         * Also captures browser page visibilityState.
-         *
-         * @param {PerformanceEvents} measureName
-         * @param {?string} [correlationId]
-         * @returns {((event?: Partial<PerformanceEvent>) => PerformanceEvent| null)}
-         */
-        BrowserPerformanceClient.prototype.startMeasurement = function (measureName, correlationId) {
-            var _this = this;
-            // Capture page visibilityState and then invoke start/end measurement
-            var startPageVisibility = this.getPageVisibility();
-            var inProgressEvent = _super.prototype.startMeasurement.call(this, measureName, correlationId);
-            return __assign$1(__assign$1({}, inProgressEvent), { endMeasurement: function (event) {
-                    return inProgressEvent.endMeasurement(__assign$1({ startPageVisibility: startPageVisibility, endPageVisibility: _this.getPageVisibility() }, event));
-                } });
-        };
-        return BrowserPerformanceClient;
-    }(PerformanceClient));
-
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -15502,13 +16135,15 @@
             this.nativeInternalStorage = new BrowserCacheManager(this.config.auth.clientId, nativeCacheOptions, this.browserCrypto, this.logger);
             // Initialize the token cache
             this.tokenCache = new TokenCache(this.config, this.browserStorage, this.logger, this.browserCrypto);
+            // Register listener functions
+            this.trackPageVisibilityWithMeasurement = this.trackPageVisibilityWithMeasurement.bind(this);
         }
         /**
          * Initializer function to perform async startup tasks such as connecting to WAM extension
          */
         ClientApplication.prototype.initialize = function () {
             return __awaiter$1(this, void 0, void 0, function () {
-                var _a, e_1;
+                var allowNativeBroker, initMeasurement, _a, e_1;
                 return __generator$1(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -15517,13 +16152,15 @@
                                 this.logger.info("initialize has already been called, exiting early.");
                                 return [2 /*return*/];
                             }
+                            allowNativeBroker = this.config.system.allowNativeBroker;
+                            initMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.InitializeClientApplication);
                             this.eventHandler.emitEvent(exports.EventType.INITIALIZE_START);
-                            if (!this.config.system.allowNativeBroker) return [3 /*break*/, 4];
+                            if (!allowNativeBroker) return [3 /*break*/, 4];
                             _b.label = 1;
                         case 1:
                             _b.trys.push([1, 3, , 4]);
                             _a = this;
-                            return [4 /*yield*/, NativeMessageHandler.createProvider(this.logger, this.config.system.nativeBrokerHandshakeTimeout)];
+                            return [4 /*yield*/, NativeMessageHandler.createProvider(this.logger, this.config.system.nativeBrokerHandshakeTimeout, this.performanceClient)];
                         case 2:
                             _a.nativeExtensionProvider = _b.sent();
                             return [3 /*break*/, 4];
@@ -15534,6 +16171,7 @@
                         case 4:
                             this.initialized = true;
                             this.eventHandler.emitEvent(exports.EventType.INITIALIZE_END);
+                            initMeasurement.endMeasurement({ allowNativeBroker: allowNativeBroker, success: true });
                             return [2 /*return*/];
                     }
                 });
@@ -15709,7 +16347,6 @@
                         isNativeBroker: true,
                         requestId: response.requestId
                     });
-                    atPopupMeasurement.flushMeasurement();
                     return response;
                 }).catch(function (e) {
                     if (e instanceof NativeAuthError && e.isFatal()) {
@@ -15749,7 +16386,6 @@
                     success: true,
                     requestId: result.requestId
                 });
-                atPopupMeasurement.flushMeasurement();
                 return result;
             }).catch(function (e) {
                 if (loggedInAccounts.length > 0) {
@@ -15763,11 +16399,20 @@
                     subErrorCode: e.subError,
                     success: false
                 });
-                atPopupMeasurement.flushMeasurement();
                 // Since this function is syncronous we need to reject
                 return Promise.reject(e);
             });
         };
+        ClientApplication.prototype.trackPageVisibilityWithMeasurement = function () {
+            var measurement = this.ssoSilentMeasurement || this.acquireTokenByCodeAsyncMeasurement;
+            if (!measurement) {
+                return;
+            }
+            this.logger.info("Perf: Visibility change detected in ", measurement.event.name);
+            measurement.increment({
+                visibilityChangeCount: 1,
+            });
+        };
         // #endregion
         // #region Silent Flow
         /**
@@ -15786,16 +16431,21 @@
          * @returns A promise that is fulfilled when this function has completed, or rejected if an error was raised.
          */
         ClientApplication.prototype.ssoSilent = function (request) {
+            var _a;
             return __awaiter$1(this, void 0, void 0, function () {
-                var correlationId, validRequest, ssoSilentMeasurement, result, silentIframeClient;
+                var correlationId, validRequest, result, silentIframeClient;
                 var _this = this;
-                return __generator$1(this, function (_a) {
+                return __generator$1(this, function (_b) {
                     correlationId = this.getRequestCorrelationId(request);
                     validRequest = __assign$1(__assign$1({}, request), { 
                         // will be PromptValue.NONE or PromptValue.NO_SESSION
                         prompt: request.prompt, correlationId: correlationId });
                     this.preflightBrowserEnvironmentCheck(exports.InteractionType.Silent);
-                    ssoSilentMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.SsoSilent, correlationId);
+                    this.ssoSilentMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.SsoSilent, correlationId);
+                    (_a = this.ssoSilentMeasurement) === null || _a === void 0 ? void 0 : _a.increment({
+                        visibilityChangeCount: 0
+                    });
+                    document.addEventListener("visibilitychange", this.trackPageVisibilityWithMeasurement);
                     this.logger.verbose("ssoSilent called", correlationId);
                     this.eventHandler.emitEvent(exports.EventType.SSO_SILENT_START, exports.InteractionType.Silent, validRequest);
                     if (this.canUseNative(validRequest)) {
@@ -15814,27 +16464,29 @@
                         result = silentIframeClient.acquireToken(validRequest);
                     }
                     return [2 /*return*/, result.then(function (response) {
+                            var _a, _b;
                             _this.eventHandler.emitEvent(exports.EventType.SSO_SILENT_SUCCESS, exports.InteractionType.Silent, response);
-                            ssoSilentMeasurement.addStaticFields({
+                            (_a = _this.ssoSilentMeasurement) === null || _a === void 0 ? void 0 : _a.addStaticFields({
                                 accessTokenSize: response.accessToken.length,
                                 idTokenSize: response.idToken.length
                             });
-                            ssoSilentMeasurement.endMeasurement({
+                            (_b = _this.ssoSilentMeasurement) === null || _b === void 0 ? void 0 : _b.endMeasurement({
                                 success: true,
                                 isNativeBroker: response.fromNativeBroker,
                                 requestId: response.requestId
                             });
-                            ssoSilentMeasurement.flushMeasurement();
                             return response;
                         }).catch(function (e) {
+                            var _a;
                             _this.eventHandler.emitEvent(exports.EventType.SSO_SILENT_FAILURE, exports.InteractionType.Silent, null, e);
-                            ssoSilentMeasurement.endMeasurement({
+                            (_a = _this.ssoSilentMeasurement) === null || _a === void 0 ? void 0 : _a.endMeasurement({
                                 errorCode: e.errorCode,
                                 subErrorCode: e.subError,
                                 success: false
                             });
-                            ssoSilentMeasurement.flushMeasurement();
                             throw e;
+                        }).finally(function () {
+                            document.removeEventListener("visibilitychange", _this.trackPageVisibilityWithMeasurement);
                         })];
                 });
             });
@@ -15860,7 +16512,11 @@
                     this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_BY_CODE_START, exports.InteractionType.Silent, request);
                     atbcMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.AcquireTokenByCode, request.correlationId);
                     try {
-                        if (request.code) {
+                        if (request.code && request.nativeAccountId) {
+                            // Throw error in case server returns both spa_code and spa_accountid in exchange for auth code.
+                            throw BrowserAuthError.createSpaCodeAndNativeAccountIdPresentError();
+                        }
+                        else if (request.code) {
                             hybridAuthCode_1 = request.code;
                             response = this.hybridAuthCodeResponses.get(hybridAuthCode_1);
                             if (!response) {
@@ -15878,7 +16534,6 @@
                                         isNativeBroker: result.fromNativeBroker,
                                         requestId: result.requestId
                                     });
-                                    atbcMeasurement.flushMeasurement();
                                     return result;
                                 })
                                     .catch(function (error) {
@@ -15889,16 +16544,12 @@
                                         subErrorCode: error.subError,
                                         success: false
                                     });
-                                    atbcMeasurement.flushMeasurement();
                                     throw error;
                                 });
                                 this.hybridAuthCodeResponses.set(hybridAuthCode_1, response);
                             }
                             else {
                                 this.logger.verbose("Existing acquireTokenByCode request found", request.correlationId);
-                                atbcMeasurement.endMeasurement({
-                                    success: true
-                                });
                                 atbcMeasurement.discardMeasurement();
                             }
                             return [2 /*return*/, response];
@@ -15940,16 +16591,42 @@
          * @returns Result of the operation to redeem the authorization code
          */
         ClientApplication.prototype.acquireTokenByCodeAsync = function (request) {
+            var _a;
             return __awaiter$1(this, void 0, void 0, function () {
                 var silentAuthCodeClient, silentTokenResult;
-                return __generator$1(this, function (_a) {
-                    switch (_a.label) {
+                var _this = this;
+                return __generator$1(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             this.logger.trace("acquireTokenByCodeAsync called", request.correlationId);
+                            this.acquireTokenByCodeAsyncMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.AcquireTokenByCodeAsync, request.correlationId);
+                            (_a = this.acquireTokenByCodeAsyncMeasurement) === null || _a === void 0 ? void 0 : _a.increment({
+                                visibilityChangeCount: 0
+                            });
+                            document.addEventListener("visibilitychange", this.trackPageVisibilityWithMeasurement);
                             silentAuthCodeClient = this.createSilentAuthCodeClient(request.correlationId);
-                            return [4 /*yield*/, silentAuthCodeClient.acquireToken(request)];
+                            return [4 /*yield*/, silentAuthCodeClient.acquireToken(request).then(function (response) {
+                                    var _a;
+                                    (_a = _this.acquireTokenByCodeAsyncMeasurement) === null || _a === void 0 ? void 0 : _a.endMeasurement({
+                                        success: true,
+                                        fromCache: response.fromCache,
+                                        isNativeBroker: response.fromNativeBroker,
+                                        requestId: response.requestId
+                                    });
+                                    return response;
+                                }).catch(function (tokenRenewalError) {
+                                    var _a;
+                                    (_a = _this.acquireTokenByCodeAsyncMeasurement) === null || _a === void 0 ? void 0 : _a.endMeasurement({
+                                        errorCode: tokenRenewalError.errorCode,
+                                        subErrorCode: tokenRenewalError.subError,
+                                        success: false
+                                    });
+                                    throw tokenRenewalError;
+                                }).finally(function () {
+                                    document.removeEventListener("visibilitychange", _this.trackPageVisibilityWithMeasurement);
+                                })];
                         case 1:
-                            silentTokenResult = _a.sent();
+                            silentTokenResult = _b.sent();
                             return [2 /*return*/, silentTokenResult];
                     }
                 });
@@ -15965,6 +16642,7 @@
         ClientApplication.prototype.acquireTokenFromCache = function (silentCacheClient, commonRequest, silentRequest) {
             return __awaiter$1(this, void 0, void 0, function () {
                 return __generator$1(this, function (_a) {
+                    this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.AcquireTokenFromCache, commonRequest.correlationId);
                     switch (silentRequest.cacheLookupPolicy) {
                         case exports.CacheLookupPolicy.Default:
                         case exports.CacheLookupPolicy.AccessToken:
@@ -15987,12 +16665,14 @@
             return __awaiter$1(this, void 0, void 0, function () {
                 var silentRefreshClient;
                 return __generator$1(this, function (_a) {
+                    this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.AcquireTokenByRefreshToken, commonRequest.correlationId);
                     switch (silentRequest.cacheLookupPolicy) {
                         case exports.CacheLookupPolicy.Default:
                         case exports.CacheLookupPolicy.AccessTokenAndRefreshToken:
                         case exports.CacheLookupPolicy.RefreshToken:
                         case exports.CacheLookupPolicy.RefreshTokenAndNetwork:
                             silentRefreshClient = this.createSilentRefreshClient(commonRequest.correlationId);
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.SilentRefreshClientAcquireToken, commonRequest.correlationId);
                             return [2 /*return*/, silentRefreshClient.acquireToken(commonRequest)];
                         default:
                             throw ClientAuthError.createRefreshRequiredError();
@@ -16010,7 +16690,9 @@
             return __awaiter$1(this, void 0, void 0, function () {
                 var silentIframeClient;
                 return __generator$1(this, function (_a) {
+                    this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.AcquireTokenBySilentIframe, request.correlationId);
                     silentIframeClient = this.createSilentIframeClient(request.correlationId);
+                    this.performanceClient.setPreQueueTime(exports.PerformanceEvents.SilentIframeClientAcquireToken, request.correlationId);
                     return [2 /*return*/, silentIframeClient.acquireToken(request)];
                 });
             });
@@ -16428,7 +17110,10 @@
          */
         function PublicClientApplication(configuration) {
             var _this = _super.call(this, configuration) || this;
+            _this.astsAsyncMeasurement = undefined;
             _this.activeSilentTokenRequests = new Map();
+            // Register listener functions
+            _this.trackPageVisibility = _this.trackPageVisibility.bind(_this);
             return _this;
         }
         /**
@@ -16500,6 +17185,7 @@
                     cachedResponse = this.activeSilentTokenRequests.get(silentRequestKey);
                     if (typeof cachedResponse === "undefined") {
                         this.logger.verbose("acquireTokenSilent called for the first time, storing active request", correlationId);
+                        this.performanceClient.setPreQueueTime(exports.PerformanceEvents.AcquireTokenSilentAsync, correlationId);
                         response = this.acquireTokenSilentAsync(__assign$1(__assign$1({}, request), { correlationId: correlationId }), account)
                             .then(function (result) {
                             _this.activeSilentTokenRequests.delete(silentRequestKey);
@@ -16514,7 +17200,6 @@
                                 cacheLookupPolicy: request.cacheLookupPolicy,
                                 requestId: result.requestId,
                             });
-                            atsMeasurement.flushMeasurement();
                             return result;
                         })
                             .catch(function (error) {
@@ -16524,7 +17209,6 @@
                                 subErrorCode: error.subError,
                                 success: false
                             });
-                            atsMeasurement.flushMeasurement();
                             throw error;
                         });
                         this.activeSilentTokenRequests.set(silentRequestKey, response);
@@ -16532,9 +17216,6 @@
                     }
                     else {
                         this.logger.verbose("acquireTokenSilent has been called previously, returning the result from the first call", correlationId);
-                        atsMeasurement.endMeasurement({
-                            success: true
-                        });
                         // Discard measurements for memoized calls, as they are usually only a couple of ms and will artificially deflate metrics
                         atsMeasurement.discardMeasurement();
                         return [2 /*return*/, cachedResponse];
@@ -16542,6 +17223,15 @@
                 });
             });
         };
+        PublicClientApplication.prototype.trackPageVisibility = function () {
+            if (!this.astsAsyncMeasurement) {
+                return;
+            }
+            this.logger.info("Perf: Visibility change detected");
+            this.astsAsyncMeasurement.increment({
+                visibilityChangeCount: 1,
+            });
+        };
         /**
          * Silently acquire an access token for a given set of scopes. Will use cached token if available, otherwise will attempt to acquire a new token from the network via refresh token.
          * @param {@link (SilentRequest:type)}
@@ -16549,14 +17239,20 @@
          * @returns {Promise.<AuthenticationResult>} - a promise that is fulfilled when this function has completed, or rejected if an error was raised. Returns the {@link AuthResponse}
          */
         PublicClientApplication.prototype.acquireTokenSilentAsync = function (request, account) {
+            var _a;
             return __awaiter$1(this, void 0, void 0, function () {
-                var atsAsyncMeasurement, result, silentRequest, silentCacheClient, silentRequest_1, requestWithCLP_1;
+                var result, silentRequest, silentCacheClient, silentRequest_1, requestWithCLP_1;
                 var _this = this;
-                return __generator$1(this, function (_a) {
-                    switch (_a.label) {
+                return __generator$1(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
+                            this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.AcquireTokenSilentAsync, request.correlationId);
                             this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Silent, request);
-                            atsAsyncMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.AcquireTokenSilentAsync, request.correlationId);
+                            this.astsAsyncMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.AcquireTokenSilentAsync, request.correlationId);
+                            (_a = this.astsAsyncMeasurement) === null || _a === void 0 ? void 0 : _a.increment({
+                                visibilityChangeCount: 0
+                            });
+                            document.addEventListener("visibilitychange", this.trackPageVisibility);
                             if (!(NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeExtensionProvider, request.authenticationScheme) && account.nativeAccountId)) return [3 /*break*/, 1];
                             this.logger.verbose("acquireTokenSilent - attempting to acquire token from native platform");
                             silentRequest = __assign$1(__assign$1({}, request), { account: account });
@@ -16566,7 +17262,7 @@
                                     // If native token acquisition fails for availability reasons fallback to web flow
                                     if (e instanceof NativeAuthError && e.isFatal()) {
                                         this.logger.verbose("acquireTokenSilent - native platform unavailable, falling back to web flow");
-                                        this.nativeExtensionProvider = undefined; // Prevent future requests from continuing to attempt 
+                                        this.nativeExtensionProvider = undefined; // Prevent future requests from continuing to attempt
                                         silentIframeClient = this.createSilentIframeClient(request.correlationId);
                                         return [2 /*return*/, silentIframeClient.acquireToken(request)];
                                     }
@@ -16577,12 +17273,14 @@
                         case 1:
                             this.logger.verbose("acquireTokenSilent - attempting to acquire token from web flow");
                             silentCacheClient = this.createSilentCacheClient(request.correlationId);
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.InitializeSilentRequest, request.correlationId);
                             return [4 /*yield*/, silentCacheClient.initializeSilentRequest(request, account)];
                         case 2:
-                            silentRequest_1 = _a.sent();
+                            silentRequest_1 = _b.sent();
                             requestWithCLP_1 = __assign$1(__assign$1({}, request), { 
                                 // set the request's CacheLookupPolicy to Default if it was not optionally passed in
                                 cacheLookupPolicy: request.cacheLookupPolicy || exports.CacheLookupPolicy.Default });
+                            this.performanceClient.setPreQueueTime(exports.PerformanceEvents.AcquireTokenFromCache, silentRequest_1.correlationId);
                             result = this.acquireTokenFromCache(silentCacheClient, silentRequest_1, requestWithCLP_1).catch(function (cacheError) {
                                 if (requestWithCLP_1.cacheLookupPolicy === exports.CacheLookupPolicy.AccessToken) {
                                     throw cacheError;
@@ -16590,6 +17288,7 @@
                                 // block the reload if it occurred inside a hidden iframe
                                 BrowserUtils.blockReloadInHiddenIframes();
                                 _this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_NETWORK_START, exports.InteractionType.Silent, silentRequest_1);
+                                _this.performanceClient.setPreQueueTime(exports.PerformanceEvents.AcquireTokenByRefreshToken, silentRequest_1.correlationId);
                                 return _this.acquireTokenByRefreshToken(silentRequest_1, requestWithCLP_1).catch(function (refreshTokenError) {
                                     var isServerError = refreshTokenError instanceof ServerError;
                                     var isInteractionRequiredError = refreshTokenError instanceof InteractionRequiredAuthError;
@@ -16603,13 +17302,15 @@
                                         throw refreshTokenError;
                                     }
                                     _this.logger.verbose("Refresh token expired/invalid or CacheLookupPolicy is set to Skip, attempting acquire token by iframe.", request.correlationId);
+                                    _this.performanceClient.setPreQueueTime(exports.PerformanceEvents.AcquireTokenBySilentIframe, silentRequest_1.correlationId);
                                     return _this.acquireTokenBySilentIframe(silentRequest_1);
                                 });
                             });
-                            _a.label = 3;
+                            _b.label = 3;
                         case 3: return [2 /*return*/, result.then(function (response) {
+                                var _a;
                                 _this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, response);
-                                atsAsyncMeasurement.endMeasurement({
+                                (_a = _this.astsAsyncMeasurement) === null || _a === void 0 ? void 0 : _a.endMeasurement({
                                     success: true,
                                     fromCache: response.fromCache,
                                     isNativeBroker: response.fromNativeBroker,
@@ -16617,13 +17318,16 @@
                                 });
                                 return response;
                             }).catch(function (tokenRenewalError) {
+                                var _a;
                                 _this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Silent, null, tokenRenewalError);
-                                atsAsyncMeasurement.endMeasurement({
+                                (_a = _this.astsAsyncMeasurement) === null || _a === void 0 ? void 0 : _a.endMeasurement({
                                     errorCode: tokenRenewalError.errorCode,
                                     subErrorCode: tokenRenewalError.subError,
                                     success: false
                                 });
                                 throw tokenRenewalError;
+                            }).finally(function () {
+                                document.removeEventListener("visibilitychange", _this.trackPageVisibility);
                             })];
                     }
                 });