@azure/msal-browser 2.29.0 → 2.31.0

package/lib/msal-browser.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v2.29.0 2022-10-03 */
+/*! @azure/msal-browser v2.31.0 2022-11-07 */
 'use strict';
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -119,7 +119,7 @@
         return ar;
     }
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
 
@@ -206,7 +206,7 @@
         return r;
     }
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -587,7 +587,7 @@
         JsonTypes["Jwk"] = "JWK";
     })(JsonTypes || (JsonTypes = {}));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -643,7 +643,7 @@
         return AuthError;
     }(Error));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -718,7 +718,7 @@
         }
     };
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1213,7 +1213,7 @@
         return ClientAuthError;
     }(AuthError));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1338,7 +1338,7 @@
         return StringUtils;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1518,12 +1518,12 @@
         return Logger;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /* eslint-disable header/header */
     var name$1 = "@azure/msal-common";
-    var version$1 = "7.5.0";
+    var version$1 = "8.0.0";
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1544,7 +1544,7 @@
         AzureCloudInstance["AzureUsGovernment"] = "https://login.microsoftonline.us";
     })(exports.AzureCloudInstance || (exports.AzureCloudInstance = {}));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1703,7 +1703,7 @@
         return CredentialEntity;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1958,7 +1958,7 @@
         return ClientConfigurationError;
     }(ClientAuthError));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2142,7 +2142,7 @@
         return ScopeSet;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2180,7 +2180,7 @@
         };
     }
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2195,7 +2195,7 @@
         AuthorityType[AuthorityType["Dsts"] = 2] = "Dsts";
     })(AuthorityType || (AuthorityType = {}));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2434,7 +2434,7 @@
         return AccountEntity;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2486,7 +2486,7 @@
         return AuthToken;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2688,7 +2688,11 @@
                 if (!!userAssertionHash && !_this.matchUserAssertionHash(entity, userAssertionHash)) {
                     return;
                 }
-                if (!!homeAccountId && !_this.matchHomeAccountId(entity, homeAccountId)) {
+                /*
+                 * homeAccountId can undefined, and we want to filter out cached items that have a homeAccountId of ""
+                 * because we don't want a client_credential request to return a cached token that has a homeAccountId
+                 */
+                if ((typeof homeAccountId === "string") && !_this.matchHomeAccountId(entity, homeAccountId)) {
                     return;
                 }
                 if (!!environment && !_this.matchEnvironment(entity, environment)) {
@@ -3107,7 +3111,7 @@
          * @param homeAccountId
          */
         CacheManager.prototype.matchHomeAccountId = function (entity, homeAccountId) {
-            return !!(entity.homeAccountId && homeAccountId === entity.homeAccountId);
+            return !!((typeof entity.homeAccountId === "string") && (homeAccountId === entity.homeAccountId));
         };
         /**
          * helper to match assertion
@@ -3361,7 +3365,7 @@
         return DefaultStorageClass;
     }(CacheManager));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3455,7 +3459,7 @@
         return __assign({ clientCapabilities: [], azureCloudOptions: DEFAULT_AZURE_CLOUD_OPTIONS, skipAuthorityMetadataCache: false }, authOptions);
     }
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3475,7 +3479,7 @@
         return ServerError;
     }(AuthError));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3571,7 +3575,7 @@
         return ThrottlingUtils;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3620,7 +3624,7 @@
         return NetworkManager;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3631,7 +3635,7 @@
         CcsCredentialType["UPN"] = "UPN";
     })(CcsCredentialType || (CcsCredentialType = {}));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3722,7 +3726,7 @@
         return BaseClient;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3808,7 +3812,7 @@
         return RequestValidator;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4186,7 +4190,7 @@
         return RequestParameterBuilder;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4250,7 +4254,7 @@
         return IdTokenEntity;
     }(CredentialEntity));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4300,7 +4304,7 @@
         return TimeUtils;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4414,7 +4418,7 @@
         return AccessTokenEntity;
     }(CredentialEntity));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4481,7 +4485,7 @@
         return RefreshTokenEntity;
     }(CredentialEntity));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4556,7 +4560,7 @@
         return InteractionRequiredAuthError;
     }(AuthError));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4572,7 +4576,7 @@
         return CacheRecord;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4643,7 +4647,7 @@
         return ProtocolUtils;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4877,7 +4881,7 @@
         return UrlString;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4978,7 +4982,7 @@
         return PopTokenGenerator;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5048,7 +5052,7 @@
         return AppMetadataEntity;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5084,7 +5088,7 @@
         return TokenCacheContext;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5364,7 +5368,7 @@
         return ResponseHandler;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5817,7 +5821,7 @@
         return AuthorizationCodeClient;
     }(BaseClient));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5942,7 +5946,7 @@
         PerformanceEventStatus[PerformanceEventStatus["Completed"] = 2] = "Completed";
     })(PerformanceEventStatus || (PerformanceEventStatus = {}));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5957,27 +5961,28 @@
             return _super.call(this, configuration, performanceClient) || this;
         }
         RefreshTokenClient.prototype.acquireToken = function (request) {
-            var _a, _b;
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
                 var atsMeasurement, reqTimestamp, response, requestId, responseHandler;
                 var _this = this;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             atsMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
                             this.logger.verbose("RefreshTokenClientAcquireToken called", request.correlationId);
                             reqTimestamp = TimeUtils.nowSeconds();
                             return [4 /*yield*/, this.executeTokenRequest(request, this.authority)];
                         case 1:
-                            response = _c.sent();
-                            requestId = (_b = response.headers) === null || _b === void 0 ? void 0 : _b[HeaderNames.X_MS_REQUEST_ID];
+                            response = _d.sent();
+                            atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.addStaticFields({
+                                refreshTokenSize: ((_b = response.body.refresh_token) === null || _b === void 0 ? void 0 : _b.length) || 0
+                            });
+                            requestId = (_c = response.headers) === null || _c === void 0 ? void 0 : _c[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);
                             return [2 /*return*/, responseHandler.handleServerTokenResponse(response.body, this.authority, reqTimestamp, request, undefined, undefined, true, request.forceCache, requestId).then(function (result) {
-                                    var _a;
                                     atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.endMeasurement({
-                                        success: true,
-                                        refreshTokenSize: ((_a = response.body.refresh_token) === null || _a === void 0 ? void 0 : _a.length) || 0
+                                        success: true
                                     });
                                     return result;
                                 })
@@ -5986,8 +5991,7 @@
                                     atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.endMeasurement({
                                         errorCode: error.errorCode,
                                         subErrorCode: error.subError,
-                                        success: false,
-                                        refreshTokenSize: undefined
+                                        success: false
                                     });
                                     throw error;
                                 })];
@@ -6207,7 +6211,7 @@
         return RefreshTokenClient;
     }(BaseClient));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6331,7 +6335,7 @@
         return SilentFlowClient;
     }(BaseClient));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6343,7 +6347,7 @@
             response.hasOwnProperty("jwks_uri"));
     }
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6352,7 +6356,7 @@
     var EndpointMetadata = rawMetdataJSON.endpointMetadata;
     var InstanceDiscoveryMetadata = rawMetdataJSON.instanceDiscoveryMetadata;
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6366,7 +6370,7 @@
         ProtocolMode["OIDC"] = "OIDC";
     })(exports.ProtocolMode || (exports.ProtocolMode = {}));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6443,7 +6447,7 @@
         return AuthorityMetadataEntity;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6453,7 +6457,7 @@
             response.hasOwnProperty("metadata"));
     }
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6575,7 +6579,7 @@
         return RegionDiscovery;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7247,7 +7251,7 @@
         return Authority;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7308,7 +7312,7 @@
         return AuthorityFactory;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7339,7 +7343,7 @@
         return ServerTelemetryEntity;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7367,7 +7371,7 @@
         return ThrottlingEntity;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7384,7 +7388,7 @@
         }
     };
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7429,7 +7433,7 @@
         return JoseHeaderError;
     }(AuthError));
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7469,7 +7473,7 @@
         return JoseHeader;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7528,7 +7532,7 @@
         return AuthenticationHeaderParser;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7690,7 +7694,7 @@
         return ServerTelemetryManager;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7717,6 +7721,7 @@
             this.logger = logger;
             this.callbacks = new Map();
             this.eventsByCorrelationId = new Map();
+            this.staticFieldsByCorrelationId = new Map();
             this.measurementsById = new Map();
         }
         /**
@@ -7743,8 +7748,6 @@
                 authority: this.authority,
                 libraryName: this.libraryName,
                 libraryVersion: this.libraryVersion,
-                appName: (_a = this.applicationTelemetry) === null || _a === void 0 ? void 0 : _a.appName,
-                appVersion: (_b = this.applicationTelemetry) === null || _b === void 0 ? void 0 : _b.appVersion,
                 clientId: this.clientId,
                 name: measureName,
                 startTimeMs: Date.now(),
@@ -7752,6 +7755,11 @@
             };
             // 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);
             // Return the event and functions the caller can use to properly end/flush the measurement
             return {
@@ -7769,6 +7777,9 @@
                 discardMeasurement: function () {
                     return _this.discardMeasurements(inProgressEvent.correlationId);
                 },
+                addStaticFields: function (fields) {
+                    return _this.addStaticFields(fields, inProgressEvent.correlationId);
+                },
                 measurement: performanceMeasurement,
                 event: inProgressEvent
             };
@@ -7804,6 +7815,22 @@
             }
             return null;
         };
+        /**
+         * Saves extra information to be emitted when the measurements are flushed
+         * @param fields
+         * @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));
+            }
+            else {
+                this.logger.trace("PerformanceClient: Adding static fields");
+                this.staticFieldsByCorrelationId.set(correlationId, fields);
+            }
+        };
         /**
          * Upserts event into event cache.
          * First key is the correlation id, second key is the event id.
@@ -7893,19 +7920,12 @@
                             else {
                                 _this.logger.verbose("PerformanceClient: Submeasurement for " + measureName + " already exists for " + current.name + ", ignoring", correlationId);
                             }
-                            if (current.accessTokenSize) {
-                                previous.accessTokenSize = current.accessTokenSize;
-                            }
-                            if (current.idTokenSize) {
-                                previous.idTokenSize = current.idTokenSize;
-                            }
-                            if (current.refreshTokenSize) {
-                                previous.refreshTokenSize = current.refreshTokenSize;
-                            }
                         }
                         return previous;
                     }, topLevelEvent);
-                    this.emitEvents([eventToEmit], eventToEmit.correlationId);
+                    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);
@@ -7969,7 +7989,7 @@
         return PerformanceClient;
     }());
 
-    /*! @azure/msal-common v7.5.0 2022-10-03 */
+    /*! @azure/msal-common v8.0.0 2022-11-07 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8507,7 +8527,7 @@
         /**
          * Default popup monitor poll interval in milliseconds
          */
-        POLL_INTERVAL_MS: 50,
+        DEFAULT_POLL_INTERVAL_MS: 30,
         /**
          * Msal-browser SKU
          */
@@ -9844,7 +9864,7 @@
 
     /* eslint-disable header/header */
     var name = "@azure/msal-browser";
-    var version = "2.29.0";
+    var version = "2.31.0";
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -11225,7 +11245,7 @@
                             result = _a.sent();
                             nativeATMeasurement.endMeasurement({
                                 success: true,
-                                isNativeBroker: true,
+                                isNativeBroker: false,
                                 fromCache: true
                             });
                             return [2 /*return*/, result];
@@ -11367,7 +11387,7 @@
          */
         NativeInteractionClient.prototype.handleRedirectPromise = function () {
             return __awaiter$1(this, void 0, void 0, function () {
-                var cachedRequest, messageBody, reqTimestamp, response, result, e_4;
+                var cachedRequest, prompt, request, messageBody, reqTimestamp, response, result, e_4;
                 return __generator$1(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -11381,10 +11401,14 @@
                                 this.logger.verbose("NativeInteractionClient - handleRedirectPromise called but there is no cached request, returning null.");
                                 return [2 /*return*/, null];
                             }
+                            prompt = cachedRequest.prompt, request = __rest(cachedRequest, ["prompt"]);
+                            if (prompt) {
+                                this.logger.verbose("NativeInteractionClient - handleRedirectPromise called and prompt was included in the original request, removing prompt from cached request to prevent second interaction with native broker window.");
+                            }
                             this.browserStorage.removeItem(this.browserStorage.generateCacheKey(TemporaryCacheKeys.NATIVE_REQUEST));
                             messageBody = {
                                 method: NativeExtensionMethod.GetToken,
-                                request: cachedRequest
+                                request: request
                             };
                             reqTimestamp = TimeUtils.nowSeconds();
                             _a.label = 1;
@@ -11395,7 +11419,7 @@
                         case 2:
                             response = _a.sent();
                             this.validateNativeResponse(response);
-                            result = this.handleNativeResponse(response, cachedRequest, reqTimestamp);
+                            result = this.handleNativeResponse(response, request, reqTimestamp);
                             this.browserStorage.setInteractionInProgress(false);
                             return [2 /*return*/, result];
                         case 3:
@@ -11423,12 +11447,30 @@
          */
         NativeInteractionClient.prototype.handleNativeResponse = function (response, request, reqTimestamp) {
             return __awaiter$1(this, void 0, void 0, function () {
-                var idTokenObj, authority, authorityPreferredCache, homeAccountIdentifier, accountEntity, responseScopes, accountProperties, uid, tid, responseAccessToken, responseTokenType, _a, popTokenGenerator, shrParameters, mats, result, idTokenEntity, expiresIn, tokenExpirationSeconds, accessTokenEntity;
+                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) {
                         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();
@@ -11484,7 +11526,6 @@
                             }
                             _b.label = 5;
                         case 5:
-                            mats = this.getMATSFromResponse(response);
                             result = {
                                 authority: authority.canonicalAuthority,
                                 uniqueId: uid,
@@ -11816,6 +11857,7 @@
                     clearTimeout(this.timeoutId); // Clear setTimeout
                     window.removeEventListener("message", this.windowListener, false); // Remove 'No extension' listener
                     this.extensionId = request.extensionId;
+                    this.extensionVersion = request.body.version;
                     this.logger.verbose("NativeMessageHandler - Received HandshakeResponse from extension: " + this.extensionId);
                     handshakeResolver.resolve();
                     this.handshakeResolvers.delete(request.responseId);
@@ -11834,6 +11876,20 @@
                 }
             }
         };
+        /**
+         * Returns the Id for the browser extension this handler is communicating with
+         * @returns
+         */
+        NativeMessageHandler.prototype.getExtensionId = function () {
+            return this.extensionId;
+        };
+        /**
+         * Returns the version for the browser extension this handler is communicating with
+         * @returns
+         */
+        NativeMessageHandler.prototype.getExtensionVersion = function () {
+            return this.extensionVersion;
+        };
         /**
          * Returns boolean indicating whether or not the request should attempt to use native broker
          * @param logger
@@ -12464,7 +12520,7 @@
                  * Polling for popups needs to be tick-based,
                  * since a non-trivial amount of time can be spent on interaction (which should not count against the timeout).
                  */
-                var maxTicks = _this.config.system.windowHashTimeout / BrowserConstants.POLL_INTERVAL_MS;
+                var maxTicks = _this.config.system.windowHashTimeout / _this.config.system.pollIntervalMilliseconds;
                 var ticks = 0;
                 _this.logger.verbose("PopupHandler.monitorPopupForHash - polling started");
                 var intervalId = setInterval(function () {
@@ -12517,7 +12573,7 @@
                         clearInterval(intervalId);
                         reject(BrowserAuthError.createMonitorPopupTimeoutError());
                     }
-                }, BrowserConstants.POLL_INTERVAL_MS);
+                }, _this.config.system.pollIntervalMilliseconds);
             });
         };
         /**
@@ -12555,7 +12611,7 @@
                     clearInterval(intervalId);
                     _this.cleanPopup(popupWindow);
                     resolve();
-                }, BrowserConstants.POLL_INTERVAL_MS);
+                }, _this.config.system.pollIntervalMilliseconds);
             });
         };
         /**
@@ -12788,7 +12844,7 @@
         // Default system options for browser
         var DEFAULT_BROWSER_SYSTEM_OPTIONS = __assign$1(__assign$1({}, DEFAULT_SYSTEM_OPTIONS), { loggerOptions: DEFAULT_LOGGER_OPTIONS, networkClient: isBrowserEnvironment ? BrowserUtils.getBrowserNetworkClient() : StubbedNetworkModule, navigationClient: new NavigationClient(), loadFrameTimeout: 0, 
             // If loadFrameTimeout is provided, use that as default.
-            windowHashTimeout: (userInputSystem === null || userInputSystem === void 0 ? void 0 : userInputSystem.loadFrameTimeout) || DEFAULT_POPUP_TIMEOUT_MS, iframeHashTimeout: (userInputSystem === null || userInputSystem === void 0 ? void 0 : userInputSystem.loadFrameTimeout) || DEFAULT_IFRAME_TIMEOUT_MS, navigateFrameWait: isBrowserEnvironment && BrowserUtils.detectIEOrEdge() ? 500 : 0, redirectNavigationTimeout: DEFAULT_REDIRECT_TIMEOUT_MS, asyncPopups: false, allowRedirectInIframe: false, allowNativeBroker: false, nativeBrokerHandshakeTimeout: (userInputSystem === null || userInputSystem === void 0 ? void 0 : userInputSystem.nativeBrokerHandshakeTimeout) || DEFAULT_NATIVE_BROKER_HANDSHAKE_TIMEOUT_MS, cryptoOptions: {
+            windowHashTimeout: (userInputSystem === null || userInputSystem === void 0 ? void 0 : userInputSystem.loadFrameTimeout) || DEFAULT_POPUP_TIMEOUT_MS, iframeHashTimeout: (userInputSystem === null || userInputSystem === void 0 ? void 0 : userInputSystem.loadFrameTimeout) || DEFAULT_IFRAME_TIMEOUT_MS, navigateFrameWait: isBrowserEnvironment && BrowserUtils.detectIEOrEdge() ? 500 : 0, redirectNavigationTimeout: DEFAULT_REDIRECT_TIMEOUT_MS, asyncPopups: false, allowRedirectInIframe: false, allowNativeBroker: false, nativeBrokerHandshakeTimeout: (userInputSystem === null || userInputSystem === void 0 ? void 0 : userInputSystem.nativeBrokerHandshakeTimeout) || DEFAULT_NATIVE_BROKER_HANDSHAKE_TIMEOUT_MS, pollIntervalMilliseconds: BrowserConstants.DEFAULT_POLL_INTERVAL_MS, cryptoOptions: {
                 useMsrCrypto: false,
                 entropy: undefined
             } });
@@ -12813,9 +12869,10 @@
      */
     var SilentHandler = /** @class */ (function (_super) {
         __extends$1(SilentHandler, _super);
-        function SilentHandler(authCodeModule, storageImpl, authCodeRequest, logger, navigateFrameWait) {
+        function SilentHandler(authCodeModule, storageImpl, authCodeRequest, logger, systemOptions) {
             var _this = _super.call(this, authCodeModule, storageImpl, authCodeRequest, logger) || this;
-            _this.navigateFrameWait = navigateFrameWait;
+            _this.navigateFrameWait = systemOptions.navigateFrameWait;
+            _this.pollIntervalMilliseconds = systemOptions.pollIntervalMilliseconds;
             return _this;
         }
         /**
@@ -12893,7 +12950,7 @@
                         resolve(contentHash);
                         return;
                     }
-                }, BrowserConstants.POLL_INTERVAL_MS);
+                }, _this.pollIntervalMilliseconds);
             });
         };
         /**
@@ -13058,7 +13115,7 @@
                             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.navigateFrameWait);
+                            silentHandler = new SilentHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.config.system);
                             return [4 /*yield*/, silentHandler.initiateAuthRequest(navigateUrl)];
                         case 3:
                             msalFrame = _a.sent();
@@ -14867,15 +14924,19 @@
          * @param request
          * @param response
          * @param options
+         * @returns `AuthenticationResult` for the response that was loaded.
          */
         TokenCache.prototype.loadExternalTokens = function (request, response, options) {
             this.logger.info("TokenCache - loadExternalTokens called");
             if (!response.id_token) {
                 throw BrowserAuthError.createUnableToLoadTokenError("Please ensure server response includes id token.");
             }
+            var idToken = new AuthToken(response.id_token, this.cryptoObj);
+            var cacheRecord;
+            var authority;
             if (request.account) {
-                this.loadIdToken(response.id_token, request.account.homeAccountId, request.account.environment, request.account.tenantId, options);
-                this.loadAccessToken(request, response, request.account.homeAccountId, request.account.environment, request.account.tenantId, options);
+                var cacheRecordAccount = this.loadAccount(idToken, request.account.environment, undefined, undefined, request.account.homeAccountId);
+                cacheRecord = new CacheRecord(cacheRecordAccount, this.loadIdToken(idToken, cacheRecordAccount.homeAccountId, request.account.environment, request.account.tenantId), this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, request.account.environment, request.account.tenantId, options), this.loadRefreshToken(request, response, cacheRecordAccount.homeAccountId, request.account.environment));
             }
             else if (request.authority) {
                 var authorityUrl = Authority.generateAuthority(request.authority, request.azureCloudOptions);
@@ -14886,17 +14947,17 @@
                     authorityMetadata: this.config.auth.authorityMetadata,
                     skipAuthorityMetadataCache: this.config.auth.skipAuthorityMetadataCache,
                 };
-                var authority = new Authority(authorityUrl, this.config.system.networkClient, this.storage, authorityOptions);
+                authority = new Authority(authorityUrl, this.config.system.networkClient, this.storage, authorityOptions);
                 // "clientInfo" from options takes precedence over "clientInfo" in response
                 if (options.clientInfo) {
                     this.logger.trace("TokenCache - homeAccountId from options");
-                    this.loadIdToken(response.id_token, options.clientInfo, authority.hostnameAndPort, authority.tenant, options);
-                    this.loadAccessToken(request, response, options.clientInfo, authority.hostnameAndPort, authority.tenant, options);
+                    var cacheRecordAccount = this.loadAccount(idToken, authority.hostnameAndPort, options.clientInfo, authority.authorityType);
+                    cacheRecord = new CacheRecord(cacheRecordAccount, this.loadIdToken(idToken, cacheRecordAccount.homeAccountId, authority.hostnameAndPort, authority.tenant), this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, authority.hostnameAndPort, authority.tenant, options), this.loadRefreshToken(request, response, cacheRecordAccount.homeAccountId, authority.hostnameAndPort));
                 }
                 else if (response.client_info) {
                     this.logger.trace("TokenCache - homeAccountId from response");
-                    this.loadIdToken(response.id_token, response.client_info, authority.hostnameAndPort, authority.tenant, options);
-                    this.loadAccessToken(request, response, response.client_info, authority.hostnameAndPort, authority.tenant, options);
+                    var cacheRecordAccount = this.loadAccount(idToken, authority.hostnameAndPort, response.client_info, authority.authorityType);
+                    cacheRecord = new CacheRecord(cacheRecordAccount, this.loadIdToken(idToken, cacheRecordAccount.homeAccountId, authority.hostnameAndPort, authority.tenant), this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, authority.hostnameAndPort, authority.tenant, options), this.loadRefreshToken(request, response, cacheRecordAccount.homeAccountId, authority.hostnameAndPort));
                 }
                 else {
                     throw BrowserAuthError.createUnableToLoadTokenError("Please provide clientInfo in the response or options.");
@@ -14905,6 +14966,39 @@
             else {
                 throw BrowserAuthError.createUnableToLoadTokenError("Please provide a request with an account or a request with authority.");
             }
+            return this.generateAuthenticationResult(request, idToken, cacheRecord, authority);
+        };
+        /**
+         * Helper function to load account to msal-browser cache
+         * @param idToken
+         * @param environment
+         * @param clientInfo
+         * @param authorityType
+         * @param requestHomeAccountId
+         * @returns `AccountEntity`
+         */
+        TokenCache.prototype.loadAccount = function (idToken, environment, clientInfo, authorityType, requestHomeAccountId) {
+            var homeAccountId;
+            if (requestHomeAccountId) {
+                homeAccountId = requestHomeAccountId;
+            }
+            else if (authorityType !== undefined && clientInfo) {
+                homeAccountId = AccountEntity.generateHomeAccountId(clientInfo, authorityType, this.logger, this.cryptoObj, idToken);
+            }
+            if (!homeAccountId) {
+                throw BrowserAuthError.createUnableToLoadTokenError("Unexpected missing homeAccountId");
+            }
+            var accountEntity = clientInfo ?
+                AccountEntity.createAccount(clientInfo, homeAccountId, idToken, undefined, undefined, undefined, environment) :
+                AccountEntity.createGenericAccount(homeAccountId, idToken, undefined, undefined, undefined, environment);
+            if (this.isBrowserEnvironment) {
+                this.logger.verbose("TokenCache - loading account");
+                this.storage.setAccount(accountEntity);
+                return accountEntity;
+            }
+            else {
+                throw BrowserAuthError.createUnableToLoadTokenError("loadExternalTokens is designed to work in browser environments only.");
+            }
         };
         /**
          * Helper function to load id tokens to msal-browser cache
@@ -14912,18 +15006,14 @@
          * @param homeAccountId
          * @param environment
          * @param tenantId
-         * @param options
+         * @returns `IdTokenEntity`
          */
-        TokenCache.prototype.loadIdToken = function (idToken, homeAccountId, environment, tenantId, options) {
-            var idTokenEntity = IdTokenEntity.createIdTokenEntity(homeAccountId, environment, idToken, this.config.auth.clientId, tenantId);
-            var idAuthToken = new AuthToken(idToken, this.cryptoObj);
-            var accountEntity = options.clientInfo ?
-                AccountEntity.createAccount(options.clientInfo, homeAccountId, idAuthToken, undefined, undefined, undefined, environment) :
-                AccountEntity.createGenericAccount(homeAccountId, idAuthToken, undefined, undefined, undefined, environment);
+        TokenCache.prototype.loadIdToken = function (idToken, homeAccountId, environment, tenantId) {
+            var idTokenEntity = IdTokenEntity.createIdTokenEntity(homeAccountId, environment, idToken.rawToken, this.config.auth.clientId, tenantId);
             if (this.isBrowserEnvironment) {
                 this.logger.verbose("TokenCache - loading id token");
-                this.storage.setAccount(accountEntity);
                 this.storage.setIdTokenCredential(idTokenEntity);
+                return idTokenEntity;
             }
             else {
                 throw BrowserAuthError.createUnableToLoadTokenError("loadExternalTokens is designed to work in browser environments only.");
@@ -14933,16 +15023,15 @@
          * Helper function to load access tokens to msal-browser cache
          * @param request
          * @param response
-         * @param options
          * @param homeAccountId
          * @param environment
          * @param tenantId
-         * @returns
+         * @returns `AccessTokenEntity`
          */
         TokenCache.prototype.loadAccessToken = function (request, response, homeAccountId, environment, tenantId, options) {
             if (!response.access_token) {
                 this.logger.verbose("TokenCache - No access token provided for caching");
-                return;
+                return null;
             }
             if (!response.expires_in) {
                 throw BrowserAuthError.createUnableToLoadTokenError("Please ensure server response includes expires_in value.");
@@ -14957,11 +15046,80 @@
             if (this.isBrowserEnvironment) {
                 this.logger.verbose("TokenCache - loading access token");
                 this.storage.setAccessTokenCredential(accessTokenEntity);
+                return accessTokenEntity;
+            }
+            else {
+                throw BrowserAuthError.createUnableToLoadTokenError("loadExternalTokens is designed to work in browser environments only.");
+            }
+        };
+        /**
+         * Helper function to load refresh tokens to msal-browser cache
+         * @param request
+         * @param response
+         * @param homeAccountId
+         * @param environment
+         * @returns `RefreshTokenEntity`
+         */
+        TokenCache.prototype.loadRefreshToken = function (request, response, homeAccountId, environment) {
+            if (!response.refresh_token) {
+                this.logger.verbose("TokenCache - No refresh token provided for caching");
+                return null;
+            }
+            var refreshTokenEntity = RefreshTokenEntity.createRefreshTokenEntity(homeAccountId, environment, response.refresh_token, this.config.auth.clientId);
+            if (this.isBrowserEnvironment) {
+                this.logger.verbose("TokenCache - loading refresh token");
+                this.storage.setRefreshTokenCredential(refreshTokenEntity);
+                return refreshTokenEntity;
             }
             else {
                 throw BrowserAuthError.createUnableToLoadTokenError("loadExternalTokens is designed to work in browser environments only.");
             }
         };
+        /**
+         * Helper function to generate an `AuthenticationResult` for the result.
+         * @param request
+         * @param idTokenObj
+         * @param cacheRecord
+         * @param authority
+         * @returns `AuthenticationResult`
+         */
+        TokenCache.prototype.generateAuthenticationResult = function (request, idTokenObj, cacheRecord, authority) {
+            var _a, _b, _c;
+            var accessToken = Constants.EMPTY_STRING;
+            var responseScopes = [];
+            var expiresOn = null;
+            var extExpiresOn;
+            if (cacheRecord === null || cacheRecord === void 0 ? void 0 : cacheRecord.accessToken) {
+                accessToken = cacheRecord.accessToken.secret;
+                responseScopes = ScopeSet.fromString(cacheRecord.accessToken.target).asArray();
+                expiresOn = new Date(Number(cacheRecord.accessToken.expiresOn) * 1000);
+                extExpiresOn = new Date(Number(cacheRecord.accessToken.extendedExpiresOn) * 1000);
+            }
+            var uid = (idTokenObj === null || idTokenObj === void 0 ? void 0 : idTokenObj.claims.oid) || (idTokenObj === null || idTokenObj === void 0 ? void 0 : idTokenObj.claims.sub) || Constants.EMPTY_STRING;
+            var tid = (idTokenObj === null || idTokenObj === void 0 ? void 0 : idTokenObj.claims.tid) || Constants.EMPTY_STRING;
+            return {
+                authority: authority ? authority.canonicalAuthority : Constants.EMPTY_STRING,
+                uniqueId: uid,
+                tenantId: tid,
+                scopes: responseScopes,
+                account: (cacheRecord === null || cacheRecord === void 0 ? void 0 : cacheRecord.account) ? cacheRecord.account.getAccountInfo() : null,
+                idToken: idTokenObj ? idTokenObj.rawToken : Constants.EMPTY_STRING,
+                idTokenClaims: idTokenObj ? idTokenObj.claims : {},
+                accessToken: accessToken,
+                fromCache: true,
+                expiresOn: expiresOn,
+                correlationId: request.correlationId || Constants.EMPTY_STRING,
+                requestId: Constants.EMPTY_STRING,
+                extExpiresOn: extExpiresOn,
+                familyId: Constants.EMPTY_STRING,
+                tokenType: ((_a = cacheRecord === null || cacheRecord === void 0 ? void 0 : cacheRecord.accessToken) === null || _a === void 0 ? void 0 : _a.tokenType) || Constants.EMPTY_STRING,
+                state: Constants.EMPTY_STRING,
+                cloudGraphHostName: ((_b = cacheRecord === null || cacheRecord === void 0 ? void 0 : cacheRecord.account) === null || _b === void 0 ? void 0 : _b.cloudGraphHostName) || Constants.EMPTY_STRING,
+                msGraphHost: ((_c = cacheRecord === null || cacheRecord === void 0 ? void 0 : cacheRecord.account) === null || _c === void 0 ? void 0 : _c.msGraphHost) || Constants.EMPTY_STRING,
+                code: undefined,
+                fromNativeBroker: false
+            };
+        };
         return TokenCache;
     }());
 
@@ -15019,7 +15177,7 @@
                             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.navigateFrameWait);
+                            silentHandler = new SilentHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.config.system);
                             // Handle auth code parameters from request
                             return [2 /*return*/, silentHandler.handleCodeResponseFromServer({
                                     code: request.code,
@@ -15425,8 +15583,6 @@
                     atPopupMeasurement.endMeasurement({
                         success: true,
                         isNativeBroker: true,
-                        accessTokenSize: response.accessToken.length,
-                        idTokenSize: response.idToken.length,
                         requestId: response.requestId
                     });
                     atPopupMeasurement.flushMeasurement();
@@ -15461,10 +15617,12 @@
                 else {
                     _this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Popup, result);
                 }
+                atPopupMeasurement.addStaticFields({
+                    accessTokenSize: result.accessToken.length,
+                    idTokenSize: result.idToken.length
+                });
                 atPopupMeasurement.endMeasurement({
                     success: true,
-                    accessTokenSize: result.accessToken.length,
-                    idTokenSize: result.idToken.length,
                     requestId: result.requestId
                 });
                 atPopupMeasurement.flushMeasurement();
@@ -15533,11 +15691,13 @@
                     }
                     return [2 /*return*/, result.then(function (response) {
                             _this.eventHandler.emitEvent(exports.EventType.SSO_SILENT_SUCCESS, exports.InteractionType.Silent, response);
+                            ssoSilentMeasurement.addStaticFields({
+                                accessTokenSize: response.accessToken.length,
+                                idTokenSize: response.idToken.length
+                            });
                             ssoSilentMeasurement.endMeasurement({
                                 success: true,
                                 isNativeBroker: response.fromNativeBroker,
-                                accessTokenSize: response.accessToken.length,
-                                idTokenSize: response.idToken.length,
                                 requestId: response.requestId
                             });
                             ssoSilentMeasurement.flushMeasurement();
@@ -15585,10 +15745,12 @@
                                     .then(function (result) {
                                     _this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_BY_CODE_SUCCESS, exports.InteractionType.Silent, result);
                                     _this.hybridAuthCodeResponses.delete(hybridAuthCode_1);
+                                    atbcMeasurement.addStaticFields({
+                                        accessTokenSize: result.accessToken.length,
+                                        idTokenSize: result.idToken.length
+                                    });
                                     atbcMeasurement.endMeasurement({
                                         success: true,
-                                        accessTokenSize: result.accessToken.length,
-                                        idTokenSize: result.idToken.length,
                                         isNativeBroker: result.fromNativeBroker,
                                         requestId: result.requestId
                                     });
@@ -16189,6 +16351,9 @@
                 return __generator$1(this, function (_a) {
                     correlationId = this.getRequestCorrelationId(request);
                     atsMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.AcquireTokenSilent, correlationId);
+                    atsMeasurement.addStaticFields({
+                        cacheLookupPolicy: request.cacheLookupPolicy
+                    });
                     this.preflightBrowserEnvironmentCheck(exports.InteractionType.Silent);
                     this.logger.verbose("acquireTokenSilent called", correlationId);
                     account = request.account || this.getActiveAccount();
@@ -16214,13 +16379,14 @@
                         response = this.acquireTokenSilentAsync(__assign$1(__assign$1({}, request), { correlationId: correlationId }), account)
                             .then(function (result) {
                             _this.activeSilentTokenRequests.delete(silentRequestKey);
+                            atsMeasurement.addStaticFields({
+                                accessTokenSize: result.accessToken.length,
+                                idTokenSize: result.idToken.length
+                            });
                             atsMeasurement.endMeasurement({
                                 success: true,
                                 fromCache: result.fromCache,
-                                accessTokenSize: result.accessToken.length,
-                                idTokenSize: result.idToken.length,
                                 isNativeBroker: result.fromNativeBroker,
-                                cacheLookupPolicy: request.cacheLookupPolicy,
                                 requestId: result.requestId
                             });
                             atsMeasurement.flushMeasurement();
@@ -16321,8 +16487,6 @@
                                 astsAsyncMeasurement.endMeasurement({
                                     success: true,
                                     fromCache: response.fromCache,
-                                    accessTokenSize: response.accessToken.length,
-                                    idTokenSize: response.idToken.length,
                                     isNativeBroker: response.fromNativeBroker,
                                     requestId: response.requestId
                                 });