@azure/msal-browser 2.33.0 → 2.34.0

package/dist/index.cjs.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v2.33.0 2023-02-06 */
+/*! @azure/msal-browser v2.34.0 2023-03-07 */
 'use strict';
 'use strict';
 
@@ -117,7 +117,7 @@ function __spread() {
     return ar;
 }
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -204,7 +204,7 @@ function __spreadArrays() {
     return r;
 }
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -586,9 +586,10 @@ var JsonTypes;
 (function (JsonTypes) {
     JsonTypes["Jwt"] = "JWT";
     JsonTypes["Jwk"] = "JWK";
+    JsonTypes["Pop"] = "pop";
 })(JsonTypes || (JsonTypes = {}));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -644,7 +645,7 @@ var AuthError = /** @class */ (function (_super) {
     return AuthError;
 }(Error));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -719,7 +720,7 @@ var DEFAULT_CRYPTO_IMPLEMENTATION = {
     }
 };
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -923,6 +924,14 @@ var ClientAuthErrorMessage = {
     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."
     }
 };
 /**
@@ -1211,10 +1220,22 @@ var ClientAuthError = /** @class */ (function (_super) {
     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 v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1339,7 +1360,7 @@ var StringUtils = /** @class */ (function () {
     return StringUtils;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1529,12 +1550,12 @@ var Logger = /** @class */ (function () {
     return Logger;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /* eslint-disable header/header */
 var name$1 = "@azure/msal-common";
-var version$1 = "10.0.0";
+var version$1 = "11.0.0";
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1555,7 +1576,7 @@ exports.AzureCloudInstance = void 0;
     AzureCloudInstance["AzureUsGovernment"] = "https://login.microsoftonline.us";
 })(exports.AzureCloudInstance || (exports.AzureCloudInstance = {}));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1723,13 +1744,16 @@ var CredentialEntity = /** @class */ (function () {
          */
         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, etc.
-    CredentialEntity.credentialDomainRegex = "(https?:\\/\\/)?((([\\w-]+\\.)*([\\w-]{1,63})(\\.(\\w{2,63})))|(localhost))(\\:[0-9]{4,5})?";
+    /*
+     * 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 v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1984,7 +2008,7 @@ var ClientConfigurationError = /** @class */ (function (_super) {
     return ClientConfigurationError;
 }(ClientAuthError));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2168,7 +2192,7 @@ var ScopeSet = /** @class */ (function () {
     return ScopeSet;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2206,7 +2230,7 @@ function buildClientInfoFromHomeAccountId(homeAccountId) {
     };
 }
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -2221,7 +2245,7 @@ var AuthorityType;
     AuthorityType[AuthorityType["Dsts"] = 2] = "Dsts";
 })(AuthorityType || (AuthorityType = {}));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2460,7 +2484,7 @@ var AccountEntity = /** @class */ (function () {
     return AccountEntity;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2512,7 +2536,7 @@ var AuthToken = /** @class */ (function () {
     return AuthToken;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3015,7 +3039,7 @@ var CacheManager = /** @class */ (function () {
         else if (accounts.length > 1) {
             throw ClientAuthError.createMultipleMatchingAccountsInCacheError();
         }
-        return accountCache[0];
+        return accounts[0];
     };
     /**
      * Retrieve IdTokenEntity from cache
@@ -3391,7 +3415,7 @@ var DefaultStorageClass = /** @class */ (function (_super) {
     return DefaultStorageClass;
 }(CacheManager));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3484,7 +3508,7 @@ function buildAuthOptions(authOptions) {
     return __assign({ clientCapabilities: [], azureCloudOptions: DEFAULT_AZURE_CLOUD_OPTIONS, skipAuthorityMetadataCache: false }, authOptions);
 }
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3504,7 +3528,7 @@ var ServerError = /** @class */ (function (_super) {
     return ServerError;
 }(AuthError));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3600,7 +3624,7 @@ var ThrottlingUtils = /** @class */ (function () {
     return ThrottlingUtils;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3649,7 +3673,7 @@ var NetworkManager = /** @class */ (function () {
     return NetworkManager;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3660,7 +3684,7 @@ var CcsCredentialType;
     CcsCredentialType["UPN"] = "UPN";
 })(CcsCredentialType || (CcsCredentialType = {}));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3751,7 +3775,7 @@ var RequestValidator = /** @class */ (function () {
     return RequestValidator;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4129,7 +4153,7 @@ var RequestParameterBuilder = /** @class */ (function () {
     return RequestParameterBuilder;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4231,7 +4255,7 @@ var BaseClient = /** @class */ (function () {
     return BaseClient;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4295,7 +4319,7 @@ var IdTokenEntity = /** @class */ (function (_super) {
     return IdTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4345,7 +4369,7 @@ var TimeUtils = /** @class */ (function () {
     return TimeUtils;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4459,7 +4483,7 @@ var AccessTokenEntity = /** @class */ (function (_super) {
     return AccessTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4526,7 +4550,7 @@ var RefreshTokenEntity = /** @class */ (function (_super) {
     return RefreshTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4605,7 +4629,7 @@ var InteractionRequiredAuthError = /** @class */ (function (_super) {
     return InteractionRequiredAuthError;
 }(AuthError));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4621,7 +4645,7 @@ var CacheRecord = /** @class */ (function () {
     return CacheRecord;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4692,7 +4716,7 @@ var ProtocolUtils = /** @class */ (function () {
     return ProtocolUtils;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4926,7 +4950,7 @@ var UrlString = /** @class */ (function () {
     return UrlString;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5063,6 +5087,7 @@ exports.PerformanceEvents = void 0;
      * Internal API for initializing silent request in SilentCacheClient (msal-browser)
      */
     PerformanceEvents["InitializeSilentRequest"] = "initializeSilentRequest";
+    PerformanceEvents["InitializeClientApplication"] = "initializeClientApplication";
     /**
      * Helper function in SilentIframeClient class (msal-browser).
      */
@@ -5128,6 +5153,7 @@ exports.PerformanceEvents = void 0;
     PerformanceEvents["HandleRedirectPromiseMeasurement"] = "handleRedirectPromiseMeasurement";
     PerformanceEvents["UpdateCloudDiscoveryMetadataMeasurement"] = "updateCloudDiscoveryMetadataMeasurement";
     PerformanceEvents["UsernamePasswordClientAcquireToken"] = "usernamePasswordClientAcquireToken";
+    PerformanceEvents["NativeMessageHandlerHandshake"] = "nativeMessageHandlerHandshake";
 })(exports.PerformanceEvents || (exports.PerformanceEvents = {}));
 /**
  * State of the performance event.
@@ -5153,7 +5179,7 @@ var IntFields = new Set([
     "status",
 ]);
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5262,7 +5288,7 @@ var PopTokenGenerator = /** @class */ (function () {
     return PopTokenGenerator;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5332,7 +5358,7 @@ var AppMetadataEntity = /** @class */ (function () {
     return AppMetadataEntity;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5368,7 +5394,7 @@ var AppMetadataEntity = /** @class */ (function () {
     return TokenCacheContext;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5500,7 +5526,7 @@ var ResponseHandler = /** @class */ (function () {
                         _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)];
                 }
             });
         });
@@ -5586,7 +5612,7 @@ var ResponseHandler = /** @class */ (function () {
      * @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;
@@ -5622,6 +5648,10 @@ var ResponseHandler = /** @class */ (function () {
                         }
                         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,
@@ -5641,7 +5671,7 @@ var ResponseHandler = /** @class */ (function () {
                                 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,
                             }];
                 }
@@ -5651,7 +5681,7 @@ var ResponseHandler = /** @class */ (function () {
     return ResponseHandler;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6129,7 +6159,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
     return AuthorizationCodeClient;
 }(BaseClient));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6403,7 +6433,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
     return RefreshTokenClient;
 }(BaseClient));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6527,7 +6557,7 @@ var SilentFlowClient = /** @class */ (function (_super) {
     return SilentFlowClient;
 }(BaseClient));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6539,7 +6569,7 @@ function isOpenIdConfigResponse(response) {
         response.hasOwnProperty("jwks_uri"));
 }
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6548,7 +6578,7 @@ var rawMetdataJSON = { "endpointMetadata": { "https://login.microsoftonline.com/
 var EndpointMetadata = rawMetdataJSON.endpointMetadata;
 var InstanceDiscoveryMetadata = rawMetdataJSON.instanceDiscoveryMetadata;
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6562,7 +6592,7 @@ exports.ProtocolMode = void 0;
     ProtocolMode["OIDC"] = "OIDC";
 })(exports.ProtocolMode || (exports.ProtocolMode = {}));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6639,7 +6669,7 @@ var AuthorityMetadataEntity = /** @class */ (function () {
     return AuthorityMetadataEntity;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6649,7 +6679,7 @@ function isCloudInstanceDiscoveryResponse(response) {
         response.hasOwnProperty("metadata"));
 }
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6659,7 +6689,7 @@ function isCloudInstanceDiscoveryErrorResponse(response) {
         response.hasOwnProperty("error_description"));
 }
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6791,7 +6821,7 @@ var RegionDiscovery = /** @class */ (function () {
     return RegionDiscovery;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7526,7 +7556,7 @@ var Authority = /** @class */ (function () {
     return Authority;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7589,7 +7619,7 @@ var AuthorityFactory = /** @class */ (function () {
     return AuthorityFactory;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7620,7 +7650,7 @@ var ServerTelemetryEntity = /** @class */ (function () {
     return ServerTelemetryEntity;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7648,7 +7678,7 @@ var ThrottlingEntity = /** @class */ (function () {
     return ThrottlingEntity;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7665,7 +7695,7 @@ var StubbedNetworkModule = {
     }
 };
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7710,7 +7740,7 @@ var JoseHeaderError = /** @class */ (function (_super) {
     return JoseHeaderError;
 }(AuthError));
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7740,8 +7770,8 @@ var JoseHeader = /** @class */ (function () {
             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
         });
@@ -7750,7 +7780,7 @@ var JoseHeader = /** @class */ (function () {
     return JoseHeader;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7809,7 +7839,7 @@ var AuthenticationHeaderParser = /** @class */ (function () {
     return AuthenticationHeaderParser;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7971,7 +8001,7 @@ var ServerTelemetryManager = /** @class */ (function () {
     return ServerTelemetryManager;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7998,11 +8028,8 @@ var PerformanceClient = /** @class */ (function () {
         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();
-        this.countersByCorrelationId = new Map();
     }
     /**
      * Starts and returns an platform-specific implementation of IPerformanceMeasurement.
@@ -8043,16 +8070,16 @@ var PerformanceClient = /** @class */ (function () {
      * @returns {number}
      */
     PerformanceClient.prototype.getPreQueueTime = function (eventName, correlationId) {
-        var preQueueTimesByEvents = this.preQueueTimeByCorrelationId.get(correlationId);
-        if (!preQueueTimesByEvents) {
+        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 (!preQueueTimesByEvents.get(eventName)) {
+        else if (preQueueEvent.name !== eventName) {
             this.logger.trace("PerformanceClient.getPreQueueTime: no pre-queue time found for " + eventName + ", unable to add queue measurement");
             return;
         }
-        return preQueueTimesByEvents.get(eventName);
+        return preQueueEvent.time;
     };
     /**
      * Calculates the difference between current time and time when function was queued.
@@ -8080,12 +8107,13 @@ var PerformanceClient = /** @class */ (function () {
     /**
      * Adds queue measurement time to QueueMeasurements array for given correlation ID.
      *
-     * @param {PerformanceEvents} name
+     * @param {PerformanceEvents} eventName
      * @param {?string} correlationId
-     * @param {?number} time
+     * @param {?number} queueTime
+     * @param {?boolean} manuallyCompleted - indicator for manually completed queue measurements
      * @returns
      */
-    PerformanceClient.prototype.addQueueMeasurement = function (eventName, correlationId, queueTime) {
+    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;
@@ -8098,7 +8126,7 @@ var PerformanceClient = /** @class */ (function () {
             this.logger.trace("PerformanceClient.addQueueMeasurement: no queue time provided for " + eventName);
             return;
         }
-        var queueMeasurement = { eventName: eventName, queueTime: queueTime };
+        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) {
@@ -8111,6 +8139,8 @@ var PerformanceClient = /** @class */ (function () {
             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.
@@ -8129,17 +8159,8 @@ var PerformanceClient = /** @class */ (function () {
         }
         // 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 validMeasurement;
-        var performanceMeasuremeant = this.startPerformanceMeasuremeant(measureName, eventCorrelationId);
-        if (performanceMeasuremeant.startMeasurement) {
-            performanceMeasuremeant.startMeasurement();
-            validMeasurement = performanceMeasuremeant;
-        }
-        else {
-            var performanceMeasurement = this.startPerformanceMeasurement(measureName, eventCorrelationId);
-            performanceMeasurement.startMeasurement();
-            validMeasurement = performanceMeasurement;
-        }
+        var performanceMeasurement = this.startPerformanceMeasuremeant(measureName, eventCorrelationId);
+        performanceMeasurement.startMeasurement();
         var inProgressEvent = {
             eventId: this.generateId(),
             status: PerformanceEventStatus.InProgress,
@@ -8150,27 +8171,15 @@ var PerformanceClient = /** @class */ (function () {
             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, validMeasurement);
+        // 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);
@@ -8181,40 +8190,66 @@ var PerformanceClient = /** @class */ (function () {
             increment: function (counters) {
                 return _this.increment(counters, inProgressEvent.correlationId);
             },
-            measurement: validMeasurement,
+            measurement: performanceMeasurement,
             event: inProgressEvent
         };
     };
     /**
      * 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
@@ -8222,14 +8257,13 @@ var PerformanceClient = /** @class */ (function () {
      * @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: Adding static fields");
-            this.staticFieldsByCorrelationId.set(correlationId, fields);
+            this.logger.trace("PerformanceClient: Event not found for", correlationId);
         }
     };
     /**
@@ -8238,18 +8272,18 @@ var PerformanceClient = /** @class */ (function () {
      * @param correlationId {string} correlation identifier
      */
     PerformanceClient.prototype.increment = function (counters, correlationId) {
-        var existing = this.countersByCorrelationId.get(correlationId);
-        if (!existing) {
-            this.logger.trace("PerformanceClient: Setting counters");
-            this.countersByCorrelationId.set(correlationId, __assign({}, counters));
-            return;
-        }
         this.logger.trace("PerformanceClient: Updating counters");
-        for (var counter in counters) {
-            if (!existing.hasOwnProperty(counter)) {
-                existing[counter] = 0;
+        var event = this.eventsByCorrelationId.get(correlationId);
+        if (event) {
+            for (var counter in counters) {
+                if (!event.hasOwnProperty(counter)) {
+                    event[counter] = 0;
+                }
+                event[counter] += counters[counter];
             }
-            existing[counter] += counters[counter];
+        }
+        else {
+            this.logger.trace("PerformanceClient: Event not found for", correlationId);
         }
     };
     /**
@@ -8262,117 +8296,35 @@ var PerformanceClient = /** @class */ (function () {
      * @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);
-        /**
-         * Adds all queue time and count measurements for given correlation ID
-         * then deletes queue times for given correlation ID from queueMeasurements map.
-         */
+    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;
         });
-        var eventsForCorrelationId = this.eventsByCorrelationId.get(correlationId);
-        var staticFields = this.staticFieldsByCorrelationId.get(correlationId);
-        var counters = this.countersByCorrelationId.get(correlationId);
-        if (eventsForCorrelationId) {
-            this.discardCache(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 = [];
-            var incompleteSubsCount_1 = 0;
-            eventsForCorrelationId.forEach(function (event) {
-                if (event.name !== measureName && event.status !== PerformanceEventStatus.Completed) {
-                    _this.logger.trace("PerformanceClient: Incomplete submeasurement " + event.name + " found for " + measureName, correlationId);
-                    incompleteSubsCount_1++;
-                    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 finalEvent = __assign(__assign(__assign(__assign({}, eventToEmit), staticFields), counters), { queuedTimeMs: totalQueueTime, queuedCount: totalQueueCount, incompleteSubsCount: incompleteSubsCount_1 });
-                this.truncateIntegralFields(finalEvent, this.getIntFields());
-                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);
-        }
+        return {
+            totalQueueTime: totalQueueTime,
+            totalQueueCount: totalQueueCount,
+            manuallyCompletedCount: manuallyCompletedCount
+        };
     };
     /**
      * Removes measurements for a given correlation id.
@@ -8386,14 +8338,10 @@ var PerformanceClient = /** @class */ (function () {
     /**
      * Removes cache for a given correlation id.
      *
-     * @param {string} correlation identifier
+     * @param {string} correlationId correlation identifier
      */
     PerformanceClient.prototype.discardCache = function (correlationId) {
         this.discardMeasurements(correlationId);
-        this.logger.trace("PerformanceClient: Static fields discarded", correlationId);
-        this.staticFieldsByCorrelationId.delete(correlationId);
-        this.logger.trace("PerformanceClient: Counters discarded", correlationId);
-        this.countersByCorrelationId.delete(correlationId);
         this.logger.trace("PerformanceClient: QueueMeasurements discarded", correlationId);
         this.queueMeasurements.delete(correlationId);
         this.logger.trace("PerformanceClient: Pre-queue times discarded", correlationId);
@@ -8456,7 +8404,7 @@ var PerformanceClient = /** @class */ (function () {
     return PerformanceClient;
 }());
 
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8659,6 +8607,10 @@ var BrowserAuthErrorMessage = {
         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."
@@ -8931,6 +8883,12 @@ var BrowserAuthError = /** @class */ (function (_super) {
     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
      */
@@ -10361,7 +10319,7 @@ var DEFAULT_BROWSER_CACHE_MANAGER = function (clientId, logger) {
 
 /* eslint-disable header/header */
 var name = "@azure/msal-browser";
-var version = "2.33.0";
+var version = "2.34.0";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -11971,60 +11929,96 @@ var NativeInteractionClient = /** @class */ (function (_super) {
      */
     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.");
-                        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);
+                        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 = _b.sent();
+                        authority = _a.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];
+                        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:
-                        // Set the token type to POP in the response
-                        responseTokenType = exports.AuthenticationScheme.POP;
+                        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:
+                        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 = {
@@ -12041,17 +12035,39 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                             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(),
@@ -12061,30 +12077,78 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                             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
@@ -12203,7 +12267,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
  * 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;
@@ -12212,6 +12276,8 @@ var NativeMessageHandler = /** @class */ (function () {
         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
@@ -12240,10 +12306,11 @@ var NativeMessageHandler = /** @class */ (function () {
     };
     /**
      * 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) {
@@ -12253,14 +12320,14 @@ var NativeMessageHandler = /** @class */ (function () {
                         _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();
@@ -12289,6 +12356,10 @@ var NativeMessageHandler = /** @class */ (function () {
                         method: NativeExtensionMethod.HandshakeRequest
                     }
                 };
+                this.handshakeEvent.addStaticFields({
+                    extensionId: this.extensionId,
+                    extensionHandshakeTimeoutMs: this.handshakeTimeoutMs
+                });
                 this.messageChannel.port1.onmessage = function (event) {
                     _this.onChannelMessage(event);
                 };
@@ -12303,6 +12374,7 @@ var NativeMessageHandler = /** @class */ (function () {
                             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
@@ -12336,6 +12408,7 @@ var NativeMessageHandler = /** @class */ (function () {
             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());
             }
         }
@@ -12383,6 +12456,7 @@ var NativeMessageHandler = /** @class */ (function () {
                 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);
             }
@@ -15452,10 +15526,19 @@ var CryptoOps = /** @class */ (function () {
 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;
+        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" &&
@@ -15465,6 +15548,29 @@ var BrowserPerformanceMeasurement = /** @class */ (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 {
@@ -15529,6 +15635,20 @@ var BrowserPerformanceClient = /** @class */ (function (_super) {
         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" &&
@@ -15548,7 +15668,13 @@ var BrowserPerformanceClient = /** @class */ (function (_super) {
         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));
+                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();
             } });
     };
     /**
@@ -15566,26 +15692,27 @@ var BrowserPerformanceClient = /** @class */ (function (_super) {
             this.logger.trace("BrowserPerformanceClient: correlationId for " + eventName + " not provided, unable to set telemetry queue time");
             return;
         }
-        var preQueueTimesByEvents = this.preQueueTimeByCorrelationId.get(correlationId);
-        if (preQueueTimesByEvents) {
-            preQueueTimesByEvents.set(eventName, window.performance.now());
-            this.preQueueTimeByCorrelationId.set(correlationId, preQueueTimesByEvents);
-        }
-        else {
-            var preQueueTimes = new Map();
-            preQueueTimes.set(eventName, window.performance.now());
-            this.preQueueTimeByCorrelationId.set(correlationId, preQueueTimes);
+        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() });
     };
     /**
      * Calculates and adds queue time measurement for given performance event.
      *
-     * @param {PerformanceEvents} name
+     * @param {PerformanceEvents} eventName
      * @param {?string} correlationId
-     * @param {?number} preQueueTime
+     * @param {?number} queueTime
+     * @param {?boolean} manuallyCompleted - indicator for manually completed queue measurements
      * @returns
      */
-    BrowserPerformanceClient.prototype.addQueueMeasurement = function (eventName, correlationId) {
+    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;
@@ -15599,8 +15726,8 @@ var BrowserPerformanceClient = /** @class */ (function (_super) {
             return;
         }
         var currentTime = window.performance.now();
-        var queueTime = _super.prototype.calculateQueuedTime.call(this, preQueueTime, currentTime);
-        return _super.prototype.addQueueMeasurement.call(this, eventName, correlationId, queueTime);
+        var resQueueTime = queueTime || _super.prototype.calculateQueuedTime.call(this, preQueueTime, currentTime);
+        return _super.prototype.addQueueMeasurement.call(this, eventName, correlationId, resQueueTime, manuallyCompleted);
     };
     return BrowserPerformanceClient;
 }(PerformanceClient));
@@ -15619,6 +15746,7 @@ var internals = /*#__PURE__*/Object.freeze({
     SilentIframeClient: SilentIframeClient,
     SilentCacheClient: SilentCacheClient,
     SilentRefreshClient: SilentRefreshClient,
+    NativeInteractionClient: NativeInteractionClient,
     RedirectHandler: RedirectHandler,
     EventHandler: EventHandler,
     NativeMessageHandler: NativeMessageHandler,
@@ -16013,7 +16141,7 @@ var ClientApplication = /** @class */ (function () {
      */
     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:
@@ -16022,13 +16150,15 @@ var ClientApplication = /** @class */ (function () {
                             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];
@@ -16039,6 +16169,7 @@ var ClientApplication = /** @class */ (function () {
                     case 4:
                         this.initialized = true;
                         this.eventHandler.emitEvent(exports.EventType.INITIALIZE_END);
+                        initMeasurement.endMeasurement({ allowNativeBroker: allowNativeBroker, success: true });
                         return [2 /*return*/];
                 }
             });
@@ -16214,7 +16345,6 @@ var ClientApplication = /** @class */ (function () {
                     isNativeBroker: true,
                     requestId: response.requestId
                 });
-                atPopupMeasurement.flushMeasurement();
                 return response;
             }).catch(function (e) {
                 if (e instanceof NativeAuthError && e.isFatal()) {
@@ -16254,7 +16384,6 @@ var ClientApplication = /** @class */ (function () {
                 success: true,
                 requestId: result.requestId
             });
-            atPopupMeasurement.flushMeasurement();
             return result;
         }).catch(function (e) {
             if (loggedInAccounts.length > 0) {
@@ -16268,7 +16397,6 @@ var ClientApplication = /** @class */ (function () {
                 subErrorCode: e.subError,
                 success: false
             });
-            atPopupMeasurement.flushMeasurement();
             // Since this function is syncronous we need to reject
             return Promise.reject(e);
         });
@@ -16334,7 +16462,7 @@ var ClientApplication = /** @class */ (function () {
                     result = silentIframeClient.acquireToken(validRequest);
                 }
                 return [2 /*return*/, result.then(function (response) {
-                        var _a, _b, _c;
+                        var _a, _b;
                         _this.eventHandler.emitEvent(exports.EventType.SSO_SILENT_SUCCESS, exports.InteractionType.Silent, response);
                         (_a = _this.ssoSilentMeasurement) === null || _a === void 0 ? void 0 : _a.addStaticFields({
                             accessTokenSize: response.accessToken.length,
@@ -16345,17 +16473,15 @@ var ClientApplication = /** @class */ (function () {
                             isNativeBroker: response.fromNativeBroker,
                             requestId: response.requestId
                         });
-                        (_c = _this.ssoSilentMeasurement) === null || _c === void 0 ? void 0 : _c.flushMeasurement();
                         return response;
                     }).catch(function (e) {
-                        var _a, _b;
+                        var _a;
                         _this.eventHandler.emitEvent(exports.EventType.SSO_SILENT_FAILURE, exports.InteractionType.Silent, null, e);
                         (_a = _this.ssoSilentMeasurement) === null || _a === void 0 ? void 0 : _a.endMeasurement({
                             errorCode: e.errorCode,
                             subErrorCode: e.subError,
                             success: false
                         });
-                        (_b = _this.ssoSilentMeasurement) === null || _b === void 0 ? void 0 : _b.flushMeasurement();
                         throw e;
                     }).finally(function () {
                         document.removeEventListener("visibilitychange", _this.trackPageVisibilityWithMeasurement);
@@ -16384,7 +16510,11 @@ var ClientApplication = /** @class */ (function () {
                 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) {
@@ -16402,7 +16532,6 @@ var ClientApplication = /** @class */ (function () {
                                     isNativeBroker: result.fromNativeBroker,
                                     requestId: result.requestId
                                 });
-                                atbcMeasurement.flushMeasurement();
                                 return result;
                             })
                                 .catch(function (error) {
@@ -16413,16 +16542,12 @@ var ClientApplication = /** @class */ (function () {
                                     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];
@@ -17073,7 +17198,6 @@ var PublicClientApplication = /** @class */ (function (_super) {
                             cacheLookupPolicy: request.cacheLookupPolicy,
                             requestId: result.requestId,
                         });
-                        atsMeasurement.flushMeasurement();
                         return result;
                     })
                         .catch(function (error) {
@@ -17083,7 +17207,6 @@ var PublicClientApplication = /** @class */ (function (_super) {
                             subErrorCode: error.subError,
                             success: false
                         });
-                        atsMeasurement.flushMeasurement();
                         throw error;
                     });
                     this.activeSilentTokenRequests.set(silentRequestKey, response);
@@ -17091,9 +17214,6 @@ var PublicClientApplication = /** @class */ (function (_super) {
                 }
                 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];