npm - @azure/msal-browser - Versions diffs - 4.27.0 → 4.28.1 - Mend

@azure/msal-browser 4.27.0 → 4.28.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (376) hide show

package/lib/msal-browser.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v4.27.0 2025-12-04 */
+/*! @azure/msal-browser v4.28.1 2026-01-17 */
 'use strict';
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -6,7 +6,7 @@
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.msal = {}));
 })(this, (function (exports) { 'use strict';
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -283,7 +283,7 @@
     // Token renewal offset default in seconds
     const DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -300,7 +300,7 @@
         unexpectedError: unexpectedError
     });
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -349,7 +349,7 @@
             : AuthErrorMessages[code]);
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -449,7 +449,7 @@
         userTimeoutReached: userTimeoutReached
     });
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -706,7 +706,7 @@
         return new ClientAuthError(errorCode, additionalMessage);
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -745,7 +745,7 @@
         },
     };
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -936,12 +936,12 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /* eslint-disable header/header */
     const name$1 = "@azure/msal-common";
-    const version$1 = "15.13.3";
+    const version$1 = "15.14.1";
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -961,7 +961,7 @@
         AzureUsGovernment: "https://login.microsoftonline.us",
     };
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1019,7 +1019,7 @@
         urlParseError: urlParseError
     });
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1167,7 +1167,7 @@
         return new ClientConfigurationError(errorCode);
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1264,7 +1264,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1459,7 +1459,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1499,7 +1499,7 @@
         };
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1581,7 +1581,7 @@
         return updatedAccountInfo;
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1596,7 +1596,7 @@
         Ciam: 3,
     };
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1618,7 +1618,7 @@
         return null;
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1642,7 +1642,7 @@
         EAR: "EAR",
     };
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1676,6 +1676,13 @@
          * Returns the AccountInfo interface for this account.
          */
         static getAccountInfo(accountEntity) {
+            const tenantProfiles = accountEntity.tenantProfiles || [];
+            // Ensure at least the home tenant profile exists
+            if (tenantProfiles.length === 0 &&
+                accountEntity.realm &&
+                accountEntity.localAccountId) {
+                tenantProfiles.push(buildTenantProfile(accountEntity.homeAccountId, accountEntity.localAccountId, accountEntity.realm));
+            }
             return {
                 homeAccountId: accountEntity.homeAccountId,
                 environment: accountEntity.environment,
@@ -1687,7 +1694,7 @@
                 nativeAccountId: accountEntity.nativeAccountId,
                 authorityType: accountEntity.authorityType,
                 // Deserialize tenant profiles array into a Map
-                tenantProfiles: new Map((accountEntity.tenantProfiles || []).map((tenantProfile) => {
+                tenantProfiles: new Map(tenantProfiles.map((tenantProfile) => {
                     return [tenantProfile.tenantId, tenantProfile];
                 })),
                 dataBoundary: accountEntity.dataBoundary,
@@ -1788,7 +1795,14 @@
             account.cloudGraphHostName = cloudGraphHostName;
             account.msGraphHost = msGraphHost;
             // Serialize tenant profiles map into an array
-            account.tenantProfiles = Array.from(accountInfo.tenantProfiles?.values() || []);
+            const tenantProfiles = Array.from(accountInfo.tenantProfiles?.values() || []);
+            // Ensure at least the home tenant profile exists
+            if (tenantProfiles.length === 0 &&
+                accountInfo.tenantId &&
+                accountInfo.localAccountId) {
+                tenantProfiles.push(buildTenantProfile(accountInfo.homeAccountId, accountInfo.localAccountId, accountInfo.tenantId, accountInfo.idTokenClaims));
+            }
+            account.tenantProfiles = tenantProfiles;
             account.dataBoundary = accountInfo.dataBoundary;
             return account;
         }
@@ -1863,7 +1877,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1944,7 +1958,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2060,7 +2074,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2224,7 +2238,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2363,7 +2377,7 @@
         return null;
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2371,7 +2385,7 @@
     const cacheQuotaExceeded = "cache_quota_exceeded";
     const cacheErrorUnknown = "cache_error_unknown";
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2416,7 +2430,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2586,15 +2600,16 @@
          * @param cacheRecord {CacheRecord}
          * @param correlationId {?string} correlation id
          * @param kmsi - Keep Me Signed In
+         * @param apiId - API identifier for telemetry tracking
          * @param storeInCache {?StoreInCache}
          */
-        async saveCacheRecord(cacheRecord, correlationId, kmsi, storeInCache) {
+        async saveCacheRecord(cacheRecord, correlationId, kmsi, apiId, storeInCache) {
             if (!cacheRecord) {
                 throw createClientAuthError(invalidCacheRecord);
             }
             try {
                 if (!!cacheRecord.account) {
-                    await this.setAccount(cacheRecord.account, correlationId, kmsi);
+                    await this.setAccount(cacheRecord.account, correlationId, kmsi, apiId);
                 }
                 if (!!cacheRecord.idToken && storeInCache?.idToken !== false) {
                     await this.setIdTokenCredential(cacheRecord.idToken, correlationId, kmsi);
@@ -3526,7 +3541,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3783,6 +3798,11 @@
         Decrypt: "decrypt",
         GenerateEarKey: "generateEarKey",
         DecryptEarResponse: "decryptEarResponse",
+        LoadExternalTokens: "LoadExternalTokens",
+        LoadAccount: "loadAccount",
+        LoadIdToken: "loadIdToken",
+        LoadAccessToken: "loadAccessToken",
+        LoadRefreshToken: "loadRefreshToken",
     };
     const PerformanceEventAbbreviations = new Map([
         [PerformanceEvents.AcquireTokenByCode, "ATByCode"],
@@ -4048,7 +4068,7 @@
         "upgradedCacheCount",
     ]);
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4127,7 +4147,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4227,7 +4247,7 @@
         return (config.authOptions.authority.options.protocolMode === ProtocolMode.OIDC);
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4237,7 +4257,7 @@
         UPN: "UPN",
     };
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4287,7 +4307,7 @@
     const EAR_JWK = "ear_jwk";
     const EAR_JWE_CRYPTO = "ear_jwe_crypto";
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4667,7 +4687,7 @@
         });
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4679,7 +4699,7 @@
             response.hasOwnProperty("jwks_uri"));
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4689,7 +4709,7 @@
             response.hasOwnProperty("metadata"));
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4699,7 +4719,7 @@
             response.hasOwnProperty("error_description"));
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4795,7 +4815,7 @@
         };
     };
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4901,7 +4921,7 @@
         },
     };
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4966,7 +4986,7 @@
         return cachedAtSec > nowSeconds();
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5228,7 +5248,7 @@
         return metadata.expiresAt <= nowSeconds();
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6067,7 +6087,7 @@
         };
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6098,7 +6118,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6117,7 +6137,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6138,7 +6158,7 @@
         };
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6225,7 +6245,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6256,7 +6276,7 @@
         return new NetworkError(error, httpStatus, responseHeaders);
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6404,7 +6424,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6432,7 +6452,7 @@
         uxNotAllowed: uxNotAllowed
     });
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6522,7 +6542,7 @@
         return new InteractionRequiredAuthError(errorCode, InteractionRequiredAuthErrorMessages[errorCode]);
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6594,7 +6614,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6676,7 +6696,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6703,7 +6723,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6767,7 +6787,7 @@
          * @param serverTokenResponse
          * @param authority
          */
-        async handleServerTokenResponse(serverTokenResponse, authority, reqTimestamp, request, authCodePayload, userAssertionHash, handlingRefreshTokenResponse, forceCacheRefreshTokenResponse, serverRequestId) {
+        async handleServerTokenResponse(serverTokenResponse, authority, reqTimestamp, request, apiId, authCodePayload, userAssertionHash, handlingRefreshTokenResponse, forceCacheRefreshTokenResponse, serverRequestId) {
             this.performanceClient?.addQueueMeasurement(PerformanceEvents.HandleServerTokenResponse, serverTokenResponse.correlation_id);
             // create an idToken object (not entity)
             let idTokenClaims;
@@ -6815,14 +6835,19 @@
                 if (handlingRefreshTokenResponse &&
                     !forceCacheRefreshTokenResponse &&
                     cacheRecord.account) {
-                    const key = this.cacheStorage.generateAccountKey(AccountEntity.getAccountInfo(cacheRecord.account));
-                    const account = this.cacheStorage.getAccount(key, request.correlationId);
-                    if (!account) {
+                    const cachedAccounts = this.cacheStorage.getAllAccounts({
+                        homeAccountId: cacheRecord.account.homeAccountId,
+                        environment: cacheRecord.account.environment,
+                    }, request.correlationId);
+                    if (cachedAccounts.length < 1) {
                         this.logger.warning("Account used to refresh tokens not in persistence, refreshed tokens will not be stored in the cache");
+                        this.performanceClient?.addFields({
+                            acntLoggedOut: true,
+                        }, request.correlationId);
                         return await ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenClaims, requestStateObj, undefined, serverRequestId);
                     }
                 }
-                await this.cacheStorage.saveCacheRecord(cacheRecord, request.correlationId, isKmsi(idTokenClaims || {}), request.storeInCache);
+                await this.cacheStorage.saveCacheRecord(cacheRecord, request.correlationId, isKmsi(idTokenClaims || {}), apiId, request.storeInCache);
             }
             finally {
                 if (this.persistencePlugin &&
@@ -6892,6 +6917,9 @@
                         ? parseInt(serverTokenResponse.refresh_token_expires_in, 10)
                         : serverTokenResponse.refresh_token_expires_in;
                     rtExpiresOn = reqTimestamp + rtExpiresIn;
+                    this.performanceClient?.addFields({
+                        ntwkRtExpiresOnSeconds: rtExpiresOn,
+                    }, request.correlationId);
                 }
                 cachedRefreshToken = createRefreshTokenEntity(this.homeAccountIdentifier, env, serverTokenResponse.refresh_token, this.clientId, serverTokenResponse.foci, userAssertionHash, rtExpiresOn);
             }
@@ -7034,7 +7062,7 @@
         return baseAccount;
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -7052,7 +7080,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7074,8 +7102,9 @@
          * API to acquire a token in exchange of 'authorization_code` acquired by the user in the first leg of the
          * authorization_code_grant
          * @param request
+         * @param apiId - API identifier for telemetry tracking
          */
-        async acquireToken(request, authCodePayload) {
+        async acquireToken(request, apiId, authCodePayload) {
             this.performanceClient?.addQueueMeasurement(PerformanceEvents.AuthClientAcquireToken, request.correlationId);
             if (!request.code) {
                 throw createClientAuthError(requestCannotBeMade);
@@ -7087,7 +7116,7 @@
             const responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin, this.performanceClient);
             // Validate response. This function throws a server error if an error is returned by the server.
             responseHandler.validateTokenResponse(response.body);
-            return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), PerformanceEvents.HandleServerTokenResponse, this.logger, this.performanceClient, request.correlationId)(response.body, this.authority, reqTimestamp, request, authCodePayload, undefined, undefined, undefined, requestId);
+            return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), PerformanceEvents.HandleServerTokenResponse, this.logger, this.performanceClient, request.correlationId)(response.body, this.authority, reqTimestamp, request, apiId, authCodePayload, undefined, undefined, undefined, requestId);
         }
         /**
          * Used to log out the current user, and redirect the user to the postLogoutRedirectUri.
@@ -7287,7 +7316,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7302,7 +7331,7 @@
         constructor(configuration, performanceClient) {
             super(configuration, performanceClient);
         }
-        async acquireToken(request) {
+        async acquireToken(request, apiId) {
             this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
             const reqTimestamp = nowSeconds();
             const response = await invokeAsync(this.executeTokenRequest.bind(this), PerformanceEvents.RefreshTokenClientExecuteTokenRequest, this.logger, this.performanceClient, request.correlationId)(request, this.authority);
@@ -7310,13 +7339,13 @@
             const requestId = response.headers?.[HeaderNames.X_MS_REQUEST_ID];
             const responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin);
             responseHandler.validateTokenResponse(response.body);
-            return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), PerformanceEvents.HandleServerTokenResponse, this.logger, this.performanceClient, request.correlationId)(response.body, this.authority, reqTimestamp, request, undefined, undefined, true, request.forceCache, requestId);
+            return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), PerformanceEvents.HandleServerTokenResponse, this.logger, this.performanceClient, request.correlationId)(response.body, this.authority, reqTimestamp, request, apiId, undefined, undefined, true, request.forceCache, requestId);
         }
         /**
          * Gets cached refresh token and attaches to request, then calls acquireToken API
          * @param request
          */
-        async acquireTokenByRefreshToken(request) {
+        async acquireTokenByRefreshToken(request, apiId) {
             // Cannot renew token if no request object is given.
             if (!request) {
                 throw createClientConfigurationError(tokenRequestEmpty);
@@ -7331,7 +7360,7 @@
             // if the app is part of the family, retrive a Family refresh token if present and make a refreshTokenRequest
             if (isFOCI) {
                 try {
-                    return await invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, true);
+                    return await invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, true, apiId);
                 }
                 catch (e) {
                     const noFamilyRTInCache = e instanceof InteractionRequiredAuthError &&
@@ -7342,7 +7371,7 @@
                         e.subError === Errors.CLIENT_MISMATCH_ERROR;
                     // if family Refresh Token (FRT) cache acquisition fails or if client_mismatch error is seen with FRT, reattempt with application Refresh Token (ART)
                     if (noFamilyRTInCache || clientMismatchErrorWithFamilyRT) {
-                        return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false);
+                        return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false, apiId);
                         // throw in all other cases
                     }
                     else {
@@ -7351,26 +7380,30 @@
                 }
             }
             // fall back to application refresh token acquisition
-            return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false);
+            return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false, apiId);
         }
         /**
          * makes a network call to acquire tokens by exchanging RefreshToken available in userCache; throws if refresh token is not cached
          * @param request
          */
-        async acquireTokenWithCachedRefreshToken(request, foci) {
+        async acquireTokenWithCachedRefreshToken(request, foci, apiId) {
             this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
             // fetches family RT or application RT based on FOCI value
             const refreshToken = invoke(this.cacheManager.getRefreshToken.bind(this.cacheManager), PerformanceEvents.CacheManagerGetRefreshToken, this.logger, this.performanceClient, request.correlationId)(request.account, foci, request.correlationId, undefined, this.performanceClient);
             if (!refreshToken) {
                 throw createInteractionRequiredAuthError(noTokensFound);
             }
-            if (refreshToken.expiresOn &&
-                isTokenExpired(refreshToken.expiresOn, request.refreshTokenExpirationOffsetSeconds ||
-                    DEFAULT_REFRESH_TOKEN_EXPIRATION_OFFSET_SECONDS)) {
-                this.performanceClient?.addFields({ rtExpiresOnMs: Number(refreshToken.expiresOn) }, request.correlationId);
-                throw createInteractionRequiredAuthError(refreshTokenExpired);
+            if (refreshToken.expiresOn) {
+                const offset = request.refreshTokenExpirationOffsetSeconds ||
+                    DEFAULT_REFRESH_TOKEN_EXPIRATION_OFFSET_SECONDS;
+                this.performanceClient?.addFields({
+                    cacheRtExpiresOnSeconds: Number(refreshToken.expiresOn),
+                    rtOffsetSeconds: offset,
+                }, request.correlationId);
+                if (isTokenExpired(refreshToken.expiresOn, offset)) {
+                    throw createInteractionRequiredAuthError(refreshTokenExpired);
+                }
             }
-            // attach cached RT size to the current measurement
             const refreshTokenRequest = {
                 ...request,
                 refreshToken: refreshToken.secret,
@@ -7381,11 +7414,10 @@
                 },
             };
             try {
-                return await invokeAsync(this.acquireToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(refreshTokenRequest);
+                return await invokeAsync(this.acquireToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(refreshTokenRequest, apiId);
             }
             catch (e) {
                 if (e instanceof InteractionRequiredAuthError) {
-                    this.performanceClient?.addFields({ rtExpiresOnMs: Number(refreshToken.expiresOn) }, request.correlationId);
                     if (e.subError === badToken) {
                         // Remove bad refresh token from cache
                         this.logger.verbose("acquireTokenWithRefreshToken: bad refresh token, removing from cache");
@@ -7496,7 +7528,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7594,7 +7626,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7609,7 +7641,7 @@
         },
     };
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7833,7 +7865,7 @@
         return account.loginHint || account.idTokenClaims?.login_hint || null;
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7891,7 +7923,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8154,7 +8186,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -8162,7 +8194,7 @@
     const missingKidError = "missing_kid_error";
     const missingAlgError = "missing_alg_error";
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8187,7 +8219,7 @@
         return new JoseHeaderError(code, JoseHeaderErrorMessages[code]);
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8227,7 +8259,7 @@
         }
     }
-    /*! @azure/msal-common v15.13.3 2025-12-04 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -9315,9 +9347,9 @@
     };
     /**
      * API Codes for Telemetry purposes.
-     * Before adding a new code you must claim it in the MSAL Telemetry tracker as these number spaces are shared across all MSALs
      * 0-99 Silent Flow
      * 800-899 Auth Code Flow
+     * 900-999 Miscellaneous
      */
     const ApiId = {
         acquireTokenRedirect: 861,
@@ -9329,6 +9361,30 @@
         acquireTokenSilent_silentFlow: 61,
         logout: 961,
         logoutPopup: 962,
+        hydrateCache: 963,
+        loadExternalTokens: 964,
+    };
+    /**
+     * API Names for Telemetry purposes.
+     */
+    const ApiName = {
+        861: "acquireTokenRedirect",
+        862: "acquireTokenPopup",
+        863: "ssoSilent",
+        864: "acquireTokenSilent_authCode",
+        865: "handleRedirectPromise",
+        866: "acquireTokenByCode",
+        61: "acquireTokenSilent_silentFlow",
+        961: "logout",
+        962: "logoutPopup",
+        963: "hydrateCache",
+        964: "loadExternalTokens",
+    };
+    const apiIdToName = (id) => {
+        if (typeof id === "number" && id in ApiName) {
+            return ApiName[id];
+        }
+        return "unknown";
     };
     /*
      * Interaction type of the API - used for state and telemetry
@@ -10344,7 +10400,7 @@
     /* eslint-disable header/header */
     const name = "@azure/msal-browser";
-    const version = "4.27.0";
+    const version = "4.28.1";
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -12364,17 +12420,21 @@
             if (!parsedAccount || !AccountEntity.isAccountEntity(parsedAccount)) {
                 return null;
             }
+            this.performanceClient.addFields({
+                accountCachedBy: apiIdToName(parsedAccount.cachedByApiId),
+            }, correlationId);
             return CacheManager.toObject(new AccountEntity(), parsedAccount);
         }
         /**
          * set account entity in the platform cache
          * @param account
          */
-        async setAccount(account, correlationId, kmsi) {
+        async setAccount(account, correlationId, kmsi, apiId) {
             this.logger.trace("BrowserCacheManager.setAccount called");
             const key = this.generateAccountKey(AccountEntity.getAccountInfo(account));
             const timestamp = Date.now().toString();
             account.lastUpdatedAt = timestamp;
+            account.cachedByApiId = apiId;
             await this.setUserData(key, JSON.stringify(account), correlationId, timestamp, kmsi);
             const wasAdded = this.addAccountKeyToMap(key, correlationId);
             this.performanceClient.addFields({ kmsi: kmsi }, correlationId);
@@ -13129,7 +13189,7 @@
          * @param request
          */
         async hydrateCache(result, request) {
-            const idTokenEntity = createIdTokenEntity(result.account?.homeAccountId, result.account?.environment, result.idToken, this.clientId, result.tenantId);
+            const idTokenEntity = createIdTokenEntity(result.account.homeAccountId, result.account.environment, result.idToken, this.clientId, result.tenantId);
             let claimsHash;
             if (request.claims) {
                 claimsHash = await this.cryptoImpl.hashString(request.claims);
@@ -13141,7 +13201,7 @@
              *
              * The next MSAL VFuture should map these both to same value if possible
              */
-            const accessTokenEntity = createAccessTokenEntity(result.account?.homeAccountId, result.account.environment, result.accessToken, this.clientId, result.tenantId, result.scopes.join(" "),
+            const accessTokenEntity = createAccessTokenEntity(result.account.homeAccountId, result.account.environment, result.accessToken, this.clientId, result.tenantId, result.scopes.join(" "),
             // Access token expiresOn stored in seconds, converting from AuthenticationResult expiresOn stored as Date
             result.expiresOn
                 ? toSecondsFromDate(result.expiresOn)
@@ -13154,7 +13214,7 @@
                 idToken: idTokenEntity,
                 accessToken: accessTokenEntity,
             };
-            return this.saveCacheRecord(cacheRecord, result.correlationId, isKmsi(extractTokenClaims(result.idToken, base64Decode)));
+            return this.saveCacheRecord(cacheRecord, result.correlationId, isKmsi(extractTokenClaims(result.idToken, base64Decode)), ApiId.hydrateCache);
         }
         /**
          * saves a cache record
@@ -13162,9 +13222,9 @@
          * @param storeInCache {?StoreInCache}
          * @param correlationId {?string} correlation id
          */
-        async saveCacheRecord(cacheRecord, correlationId, kmsi, storeInCache) {
+        async saveCacheRecord(cacheRecord, correlationId, kmsi, apiId, storeInCache) {
             try {
-                await super.saveCacheRecord(cacheRecord, correlationId, kmsi, storeInCache);
+                await super.saveCacheRecord(cacheRecord, correlationId, kmsi, apiId, storeInCache);
             }
             catch (e) {
                 if (e instanceof CacheError &&
@@ -13923,7 +13983,7 @@
          * Function to handle response parameters from hash.
          * @param locationHash
          */
-        async handleCodeResponse(response, request) {
+        async handleCodeResponse(response, request, apiId) {
             this.performanceClient.addQueueMeasurement(PerformanceEvents.HandleCodeResponse, request.correlationId);
             let authCodeResponse;
             try {
@@ -13939,7 +13999,7 @@
                     throw e;
                 }
             }
-            return invokeAsync(this.handleCodeResponseFromServer.bind(this), PerformanceEvents.HandleCodeResponseFromServer, this.logger, this.performanceClient, request.correlationId)(authCodeResponse, request);
+            return invokeAsync(this.handleCodeResponseFromServer.bind(this), PerformanceEvents.HandleCodeResponseFromServer, this.logger, this.performanceClient, request.correlationId)(authCodeResponse, request, apiId);
         }
         /**
          * Process auth code response from AAD
@@ -13949,7 +14009,7 @@
          * @param networkModule
          * @returns
          */
-        async handleCodeResponseFromServer(authCodeResponse, request, validateNonce = true) {
+        async handleCodeResponseFromServer(authCodeResponse, request, apiId, validateNonce = true) {
             this.performanceClient.addQueueMeasurement(PerformanceEvents.HandleCodeResponseFromServer, request.correlationId);
             this.logger.trace("InteractionHandler.handleCodeResponseFromServer called");
             // Assign code to request
@@ -13975,7 +14035,7 @@
                 }
             }
             // Acquire token with retrieved code.
-            const tokenResponse = (await invokeAsync(this.authModule.acquireToken.bind(this.authModule), PerformanceEvents.AuthClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(this.authCodeRequest, authCodeResponse));
+            const tokenResponse = (await invokeAsync(this.authModule.acquireToken.bind(this.authModule), PerformanceEvents.AuthClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(this.authCodeRequest, apiId, authCodeResponse));
             return tokenResponse;
         }
         /**
@@ -14523,7 +14583,7 @@
          */
         async cacheAccount(accountEntity, correlationId, kmsi) {
             // Store the account info and hence `nativeAccountId` in browser cache
-            await this.browserStorage.setAccount(accountEntity, this.correlationId, kmsi);
+            await this.browserStorage.setAccount(accountEntity, this.correlationId, kmsi, this.apiId);
             // Remove any existing cached tokens for this account in browser storage
             this.browserStorage.removeAccountContext(AccountEntity.getAccountInfo(accountEntity), correlationId);
         }
@@ -14552,7 +14612,7 @@
                 idToken: cachedIdToken,
                 accessToken: cachedAccessToken,
             };
-            return this.nativeStorageManager.saveCacheRecord(nativeCacheRecord, this.correlationId, isKmsi(idTokenClaims), request.storeInCache);
+            return this.nativeStorageManager.saveCacheRecord(nativeCacheRecord, this.correlationId, isKmsi(idTokenClaims), this.apiId, request.storeInCache);
         }
         getExpiresInValue(tokenType, expiresIn) {
             return tokenType === AuthenticationScheme.POP
@@ -14927,7 +14987,7 @@
         // Create popup interaction handler.
         const interactionHandler = new InteractionHandler(authClient, browserStorage, authCodeRequest, logger, performanceClient);
         // Handle response from hash string.
-        const result = await invokeAsync(interactionHandler.handleCodeResponse.bind(interactionHandler), PerformanceEvents.HandleCodeResponse, logger, performanceClient, request.correlationId)(response, request);
+        const result = await invokeAsync(interactionHandler.handleCodeResponse.bind(interactionHandler), PerformanceEvents.HandleCodeResponse, logger, performanceClient, request.correlationId)(response, request, apiId);
         return result;
     }
     /**
@@ -14974,7 +15034,7 @@
             cloud_instance_name: decryptedData.cloud_instance_name,
             msgraph_host: decryptedData.msgraph_host,
         };
-        return (await invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), PerformanceEvents.HandleServerTokenResponse, logger, performanceClient, request.correlationId)(decryptedData, authority, nowSeconds(), request, additionalData, undefined, undefined, undefined, undefined));
+        return (await invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), PerformanceEvents.HandleServerTokenResponse, logger, performanceClient, request.correlationId)(decryptedData, authority, nowSeconds(), request, apiId, additionalData, undefined, undefined, undefined, undefined));
     }
     /*
@@ -16788,7 +16848,7 @@
                 account: silentRequest.account,
             });
             // Send request to renew token. Auth module will throw errors if token cannot be renewed.
-            return invokeAsync(refreshTokenClient.acquireTokenByRefreshToken.bind(refreshTokenClient), PerformanceEvents.RefreshTokenClientAcquireTokenByRefreshToken, this.logger, this.performanceClient, request.correlationId)(silentRequest).catch((e) => {
+            return invokeAsync(refreshTokenClient.acquireTokenByRefreshToken.bind(refreshTokenClient), PerformanceEvents.RefreshTokenClientAcquireTokenByRefreshToken, this.logger, this.performanceClient, request.correlationId)(silentRequest, ApiId.acquireTokenSilent_silentFlow).catch((e) => {
                 e.setCorrelationId(this.correlationId);
                 serverTelemetryManager.cacheFailedRequest(e);
                 throw e;
@@ -16832,12 +16892,13 @@
      * Token cache manager
      */
     class TokenCache {
-        constructor(configuration, storage, logger, cryptoObj) {
+        constructor(configuration, storage, logger, cryptoObj, performanceClient) {
             this.isBrowserEnvironment = typeof window !== "undefined";
             this.config = configuration;
             this.storage = storage;
             this.logger = logger;
             this.cryptoObj = cryptoObj;
+            this.performanceClient = performanceClient;
         }
         // Move getAllAccounts here and cache utility APIs
         /**
@@ -16852,30 +16913,37 @@
                 throw createBrowserAuthError(nonBrowserEnvironment);
             }
             const correlationId = request.correlationId || createNewGuid();
-            const idTokenClaims = response.id_token
-                ? extractTokenClaims(response.id_token, base64Decode)
-                : undefined;
-            const kmsi = isKmsi(idTokenClaims || {});
-            const authorityOptions = {
-                protocolMode: this.config.auth.protocolMode,
-                knownAuthorities: this.config.auth.knownAuthorities,
-                cloudDiscoveryMetadata: this.config.auth.cloudDiscoveryMetadata,
-                authorityMetadata: this.config.auth.authorityMetadata,
-                skipAuthorityMetadataCache: this.config.auth.skipAuthorityMetadataCache,
-            };
-            const authority = request.authority
-                ? new Authority(Authority.generateAuthority(request.authority, request.azureCloudOptions), this.config.system.networkClient, this.storage, authorityOptions, this.logger, request.correlationId || createNewGuid())
-                : undefined;
-            const cacheRecordAccount = await this.loadAccount(request, options.clientInfo || response.client_info || "", correlationId, idTokenClaims, authority);
-            const idToken = await this.loadIdToken(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, correlationId, kmsi);
-            const accessToken = await this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, options, correlationId, kmsi);
-            const refreshToken = await this.loadRefreshToken(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, correlationId, kmsi);
-            return this.generateAuthenticationResult(request, {
-                account: cacheRecordAccount,
-                idToken,
-                accessToken,
-                refreshToken,
-            }, idTokenClaims, authority);
+            const rootMeasurement = this.performanceClient.startMeasurement(PerformanceEvents.LoadExternalTokens, correlationId);
+            try {
+                const idTokenClaims = response.id_token
+                    ? extractTokenClaims(response.id_token, base64Decode)
+                    : undefined;
+                const kmsi = isKmsi(idTokenClaims || {});
+                const authorityOptions = {
+                    protocolMode: this.config.auth.protocolMode,
+                    knownAuthorities: this.config.auth.knownAuthorities,
+                    cloudDiscoveryMetadata: this.config.auth.cloudDiscoveryMetadata,
+                    authorityMetadata: this.config.auth.authorityMetadata,
+                    skipAuthorityMetadataCache: this.config.auth.skipAuthorityMetadataCache,
+                };
+                const authorityString = request.authority || this.config.auth.authority;
+                const authority = await createDiscoveredInstance(Authority.generateAuthority(authorityString, request.azureCloudOptions), this.config.system.networkClient, this.storage, authorityOptions, this.logger, correlationId, this.performanceClient);
+                const cacheRecordAccount = await invokeAsync(this.loadAccount.bind(this), PerformanceEvents.LoadAccount, this.logger, this.performanceClient, correlationId)(request, options.clientInfo || response.client_info || "", correlationId, authority, idTokenClaims);
+                const idToken = await invokeAsync(this.loadIdToken.bind(this), PerformanceEvents.LoadIdToken, this.logger, this.performanceClient, correlationId)(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, correlationId, kmsi);
+                const accessToken = await invokeAsync(this.loadAccessToken.bind(this), PerformanceEvents.LoadAccessToken, this.logger, this.performanceClient, correlationId)(request, response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, options, correlationId, kmsi);
+                const refreshToken = await invokeAsync(this.loadRefreshToken.bind(this), PerformanceEvents.LoadRefreshToken, this.logger, this.performanceClient, correlationId)(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, correlationId, kmsi);
+                rootMeasurement.end({ success: true }, undefined, AccountEntity.getAccountInfo(cacheRecordAccount));
+                return this.generateAuthenticationResult(request, {
+                    account: cacheRecordAccount,
+                    idToken,
+                    accessToken,
+                    refreshToken,
+                }, authority, idTokenClaims);
+            }
+            catch (error) {
+                rootMeasurement.end({ success: false }, error);
+                throw error;
+            }
         }
         /**
          * Helper function to load account to msal-browser cache
@@ -16886,23 +16954,23 @@
          * @param requestHomeAccountId
          * @returns `AccountEntity`
          */
-        async loadAccount(request, clientInfo, correlationId, idTokenClaims, authority) {
+        async loadAccount(request, clientInfo, correlationId, authority, idTokenClaims) {
             this.logger.verbose("TokenCache - loading account");
             if (request.account) {
                 const accountEntity = AccountEntity.createFromAccountInfo(request.account);
-                await this.storage.setAccount(accountEntity, correlationId, isKmsi(idTokenClaims || {}));
+                await this.storage.setAccount(accountEntity, correlationId, isKmsi(idTokenClaims || {}), ApiId.loadExternalTokens);
                 return accountEntity;
             }
-            else if (!authority || (!clientInfo && !idTokenClaims)) {
-                this.logger.error("TokenCache - if an account is not provided on the request, authority and either clientInfo or idToken must be provided instead.");
+            else if (!clientInfo && !idTokenClaims) {
+                this.logger.error("TokenCache - if an account is not provided on the request, clientInfo or idToken must be provided instead.");
                 throw createBrowserAuthError(unableToLoadToken);
             }
             const homeAccountId = AccountEntity.generateHomeAccountId(clientInfo, authority.authorityType, this.logger, this.cryptoObj, idTokenClaims);
             const claimsTenantId = idTokenClaims?.tid;
-            const cachedAccount = buildAccountToCache(this.storage, authority, homeAccountId, base64Decode, correlationId, idTokenClaims, clientInfo, authority.hostnameAndPort, claimsTenantId, undefined, // authCodePayload
+            const cachedAccount = buildAccountToCache(this.storage, authority, homeAccountId, base64Decode, correlationId, idTokenClaims, clientInfo, authority.getPreferredCache(), claimsTenantId, undefined, // authCodePayload
             undefined, // nativeAccountId
             this.logger);
-            await this.storage.setAccount(cachedAccount, correlationId, isKmsi(idTokenClaims || {}));
+            await this.storage.setAccount(cachedAccount, correlationId, isKmsi(idTokenClaims || {}), ApiId.loadExternalTokens);
             return cachedAccount;
         }
         /**
@@ -16971,9 +17039,15 @@
                 this.logger.verbose("TokenCache - no refresh token found in response");
                 return null;
             }
+            const expiresOn = response.refresh_token_expires_in
+                ? response.refresh_token_expires_in + nowSeconds()
+                : undefined;
+            this.performanceClient.addFields({
+                extRtExpiresOnSeconds: expiresOn,
+            }, correlationId);
             this.logger.verbose("TokenCache - loading refresh token");
             const refreshTokenEntity = createRefreshTokenEntity(homeAccountId, environment, response.refresh_token, this.config.auth.clientId, response.foci, undefined, // userAssertionHash
-            response.refresh_token_expires_in);
+            expiresOn);
             await this.storage.setRefreshTokenCredential(refreshTokenEntity, correlationId, kmsi);
             return refreshTokenEntity;
         }
@@ -16985,7 +17059,7 @@
          * @param authority
          * @returns `AuthenticationResult`
          */
-        generateAuthenticationResult(request, cacheRecord, idTokenClaims, authority) {
+        generateAuthenticationResult(request, cacheRecord, authority, idTokenClaims) {
             let accessToken = "";
             let responseScopes = [];
             let expiresOn = null;
@@ -17078,7 +17152,7 @@
                     msgraph_host: request.msGraphHost,
                     cloud_graph_host_name: request.cloudGraphHostName,
                     cloud_instance_host_name: request.cloudInstanceHostName,
-                }, silentRequest, false);
+                }, silentRequest, this.apiId, false);
             }
             catch (e) {
                 if (e instanceof AuthError) {
@@ -17191,7 +17265,7 @@
             };
             this.nativeInternalStorage = new BrowserCacheManager(this.config.auth.clientId, nativeCacheOptions, this.browserCrypto, this.logger, this.performanceClient, this.eventHandler);
             // Initialize the token cache
-            this.tokenCache = new TokenCache(this.config, this.browserStorage, this.logger, this.browserCrypto);
+            this.tokenCache = new TokenCache(this.config, this.browserStorage, this.logger, this.browserCrypto, this.performanceClient);
             this.activeSilentTokenRequests = new Map();
             // Register listener functions
             this.trackPageVisibility = this.trackPageVisibility.bind(this);
@@ -18021,7 +18095,7 @@
             this.logger.verbose("hydrateCache called");
             // Account gets saved to browser storage regardless of native or not
             const accountEntity = AccountEntity.createFromAccountInfo(result.account, result.cloudGraphHostName, result.msGraphHost);
-            await this.browserStorage.setAccount(accountEntity, result.correlationId, isKmsi(result.idTokenClaims));
+            await this.browserStorage.setAccount(accountEntity, result.correlationId, isKmsi(result.idTokenClaims), ApiId.hydrateCache);
             if (result.fromNativeBroker) {
                 this.logger.verbose("Response was from native broker, storing in-memory");
                 // Tokens from native broker are stored in-memory
@@ -19299,7 +19373,7 @@
         async hydrateCache(result, request) {
             this.logger.verbose("hydrateCache called");
             const accountEntity = AccountEntity.createFromAccountInfo(result.account, result.cloudGraphHostName, result.msGraphHost);
-            await this.browserStorage.setAccount(accountEntity, result.correlationId, isKmsi(result.idTokenClaims));
+            await this.browserStorage.setAccount(accountEntity, result.correlationId, isKmsi(result.idTokenClaims), ApiId.hydrateCache);
             return this.browserStorage.hydrateCache(result, request);
         }
     }