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

@azure/msal-browser 4.28.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 (267) hide show

package/lib/custom-auth-path/msal-custom-auth.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v4.28.0 2026-01-13 */
+/*! @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.msalCustomAuth = {}));
 })(this, (function (exports) { 'use strict';
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -280,7 +280,7 @@
     // Token renewal offset default in seconds
     const DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -291,7 +291,7 @@
     const unexpectedError = "unexpected_error";
     const postRequestFailed$1 = "post_request_failed";
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -326,7 +326,7 @@
             : AuthErrorMessages[code]);
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -377,7 +377,7 @@
     const nestedAppAuthBridgeDisabled = "nested_app_auth_bridge_disabled";
     const platformBrokerError = "platform_broker_error";
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -452,7 +452,7 @@
         return new ClientAuthError(errorCode, additionalMessage);
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -491,7 +491,7 @@
         },
     };
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -682,12 +682,12 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /* eslint-disable header/header */
     const name$1 = "@azure/msal-common";
-    const version$1 = "15.14.0";
+    const version$1 = "15.14.1";
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -696,7 +696,7 @@
         // AzureCloudInstance is not specified.
         None: "none"};
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -726,7 +726,7 @@
     const invalidAuthorizePostBodyParameters = "invalid_authorize_post_body_parameters";
     const invalidPlatformBrokerConfiguration = "invalid_platform_broker_configuration";
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -772,7 +772,7 @@
         return new ClientConfigurationError(errorCode);
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -869,7 +869,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1064,7 +1064,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1104,7 +1104,7 @@
         };
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1186,7 +1186,7 @@
         return updatedAccountInfo;
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1201,7 +1201,7 @@
         Ciam: 3,
     };
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1223,7 +1223,7 @@
         return null;
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1247,7 +1247,7 @@
         EAR: "EAR",
     };
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1281,6 +1281,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,
@@ -1292,7 +1299,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,
@@ -1393,7 +1400,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;
         }
@@ -1468,7 +1482,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1549,7 +1563,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1665,7 +1679,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1829,7 +1843,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1968,7 +1982,7 @@
         return null;
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1976,7 +1990,7 @@
     const cacheQuotaExceeded = "cache_quota_exceeded";
     const cacheErrorUnknown = "cache_error_unknown";
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2021,7 +2035,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3131,7 +3145,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3403,7 +3417,7 @@
     const PerformanceEventStatus = {
         InProgress: 1};
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3482,7 +3496,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3582,7 +3596,7 @@
         return (config.authOptions.authority.options.protocolMode === ProtocolMode.OIDC);
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3592,7 +3606,7 @@
         UPN: "UPN",
     };
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3642,7 +3656,7 @@
     const EAR_JWK = "ear_jwk";
     const EAR_JWE_CRYPTO = "ear_jwe_crypto";
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4022,7 +4036,7 @@
         });
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4034,7 +4048,7 @@
             response.hasOwnProperty("jwks_uri"));
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4044,7 +4058,7 @@
             response.hasOwnProperty("metadata"));
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4054,7 +4068,7 @@
             response.hasOwnProperty("error_description"));
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4150,7 +4164,7 @@
         };
     };
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4256,7 +4270,7 @@
         },
     };
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4321,7 +4335,7 @@
         return cachedAtSec > nowSeconds();
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4583,7 +4597,7 @@
         return metadata.expiresAt <= nowSeconds();
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5422,7 +5436,7 @@
         };
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5453,7 +5467,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5472,7 +5486,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5493,7 +5507,7 @@
         };
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5580,7 +5594,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5611,7 +5625,7 @@
         return new NetworkError(error, httpStatus, responseHeaders);
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5759,7 +5773,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5775,7 +5789,7 @@
     const loginRequired = "login_required";
     const badToken = "bad_token";
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5847,7 +5861,7 @@
         return new InteractionRequiredAuthError(errorCode, InteractionRequiredAuthErrorMessages[errorCode]);
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5919,7 +5933,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6001,7 +6015,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6028,7 +6042,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6140,10 +6154,15 @@
                 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);
                     }
                 }
@@ -6362,7 +6381,7 @@
         return baseAccount;
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6380,7 +6399,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6616,7 +6635,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6828,7 +6847,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6926,7 +6945,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6941,7 +6960,7 @@
         },
     };
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7165,7 +7184,7 @@
         return account.loginHint || account.idTokenClaims?.login_hint || null;
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7428,7 +7447,7 @@
         }
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -7436,7 +7455,7 @@
     const missingKidError = "missing_kid_error";
     const missingAlgError = "missing_alg_error";
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7461,7 +7480,7 @@
         return new JoseHeaderError(code, JoseHeaderErrorMessages[code]);
     }
-    /*! @azure/msal-common v15.14.0 2026-01-13 */
+    /*! @azure/msal-common v15.14.1 2026-01-17 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7896,7 +7915,7 @@
     /* eslint-disable header/header */
     const name = "@azure/msal-browser";
-    const version = "4.28.0";
+    const version = "4.28.1";
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -16036,7 +16055,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);
@@ -16048,7 +16067,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)
@@ -19651,10 +19670,9 @@
                     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 invokeAsync(this.loadAccount.bind(this), PerformanceEvents.LoadAccount, this.logger, this.performanceClient, correlationId)(request, options.clientInfo || response.client_info || "", correlationId, idTokenClaims, authority);
+                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);
@@ -19664,7 +19682,7 @@
                     idToken,
                     accessToken,
                     refreshToken,
-                }, idTokenClaims, authority);
+                }, authority, idTokenClaims);
             }
             catch (error) {
                 rootMeasurement.end({ success: false }, error);
@@ -19680,20 +19698,20 @@
          * @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 || {}), 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 || {}), ApiId.loadExternalTokens);
@@ -19765,9 +19783,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;
         }
@@ -19779,7 +19803,7 @@
          * @param authority
          * @returns `AuthenticationResult`
          */
-        generateAuthenticationResult(request, cacheRecord, idTokenClaims, authority) {
+        generateAuthenticationResult(request, cacheRecord, authority, idTokenClaims) {
             let accessToken = "";
             let responseScopes = [];
             let expiresOn = null;