@azure/msal-browser 5.4.0 → 5.4.1

package/lib/custom-auth-path/msal-custom-auth.cjs

@@ -1,8 +1,8 @@
-/*! @azure/msal-browser v5.4.0 2026-03-02 */
+/*! @azure/msal-browser v5.4.1 2026-04-01 */
 'use strict';
 'use strict';
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -229,7 +229,7 @@ const JsonWebTokenTypes = {
 // Token renewal offset default in seconds
 const DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -279,7 +279,7 @@ const INSTANCE_AWARE = "instance_aware";
 const EAR_JWK = "ear_jwk";
 const EAR_JWE_CRYPTO = "ear_jwe_crypto";
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -310,7 +310,7 @@ function createAuthError(code, additionalMessage) {
     return new AuthError(code, additionalMessage || getDefaultErrorMessage$1(code));
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -330,7 +330,7 @@ function createClientConfigurationError(errorCode) {
     return new ClientConfigurationError(errorCode);
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -410,7 +410,7 @@ class StringUtils {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -433,7 +433,7 @@ function createClientAuthError(errorCode, additionalMessage) {
     return new ClientAuthError(errorCode, additionalMessage);
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -457,7 +457,7 @@ const cannotAllowPlatformBroker = "cannot_allow_platform_broker";
 const authorityMismatch = "authority_mismatch";
 const invalidRequestMethodForEAR = "invalid_request_method_for_EAR";
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -494,7 +494,7 @@ const endSessionEndpointNotSupported = "end_session_endpoint_not_supported";
 const keyIdMissing = "key_id_missing";
 const methodNotImplemented = "method_not_implemented";
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -689,7 +689,7 @@ class ScopeSet {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1056,7 +1056,7 @@ function addEARParameters(parameters, jwk) {
     parameters.set(EAR_JWE_CRYPTO, jweCryptoB64Encoded);
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1165,7 +1165,7 @@ function normalizeUrlForComparison(url) {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1204,7 +1204,7 @@ const DEFAULT_CRYPTO_IMPLEMENTATION = {
     },
 };
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1465,12 +1465,12 @@ class Logger {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /* eslint-disable header/header */
 const name$1 = "@azure/msal-common";
-const version$1 = "16.2.0";
+const version$1 = "16.2.1";
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1479,7 +1479,7 @@ const AzureCloudInstance = {
     // AzureCloudInstance is not specified.
     None: "none"};
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1561,7 +1561,7 @@ function updateAccountTenantProfileData(baseAccountInfo, tenantProfile, idTokenC
     return updatedAccountInfo;
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1641,7 +1641,7 @@ function checkMaxAge(authTime, maxAge) {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1798,7 +1798,7 @@ class UrlString {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1955,7 +1955,7 @@ function getCloudDiscoveryMetadataFromNetworkResponse(response, authorityHost) {
     return null;
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1963,7 +1963,7 @@ function getCloudDiscoveryMetadataFromNetworkResponse(response, authorityHost) {
 const cacheQuotaExceeded = "cache_quota_exceeded";
 const cacheErrorUnknown = "cache_error_unknown";
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2001,7 +2001,7 @@ function createCacheError(e) {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2039,7 +2039,7 @@ function buildClientInfoFromHomeAccountId(homeAccountId) {
     };
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -2054,7 +2054,7 @@ const AuthorityType = {
     Ciam: 3,
 };
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -2076,7 +2076,7 @@ function getTenantIdFromIdTokenClaims(idTokenClaims) {
     return null;
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -2100,7 +2100,7 @@ const ProtocolMode = {
     EAR: "EAR",
 };
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /**
  * Returns the AccountInfo interface for this account.
  */
@@ -2275,7 +2275,7 @@ function isAccountEntity(entity) {
         entity.hasOwnProperty("authorityType"));
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3371,7 +3371,7 @@ class DefaultStorageClass extends CacheManager {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3385,7 +3385,7 @@ class DefaultStorageClass extends CacheManager {
 const PerformanceEventStatus = {
     InProgress: 1};
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3440,7 +3440,7 @@ class StubPerformanceClient {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3534,278 +3534,358 @@ function isOidcProtocolMode(config) {
     return (config.authOptions.authority.options.protocolMode === ProtocolMode.OIDC);
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
-
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
 /**
- * Error thrown when there is an error with the server code, for example, unavailability.
- */
-class ServerError extends AuthError {
-    constructor(errorCode, errorMessage, subError, errorNo, status) {
-        super(errorCode, errorMessage, subError);
-        this.name = "ServerError";
-        this.errorNo = errorNo;
-        this.status = status;
-        Object.setPrototypeOf(this, ServerError.prototype);
+ * This class instance helps track the memory changes facilitating
+ * decisions to read from and write to the persistent cache
+ */ class TokenCacheContext {
+    constructor(tokenCache, hasChanged) {
+        this.cache = tokenCache;
+        this.hasChanged = hasChanged;
+    }
+    /**
+     * boolean which indicates the changes in cache
+     */
+    get cacheHasChanged() {
+        return this.hasChanged;
+    }
+    /**
+     * function to retrieve the token cache
+     */
+    get tokenCache() {
+        return this.cache;
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
 /**
- * MSAL-defined interaction required error code indicating no tokens are found in cache.
- * @public
- */
-const noTokensFound = "no_tokens_found";
-/**
- * MSAL-defined error code indicating a native account is unavailable on the platform.
- * @public
+ * Utility functions for managing date and time operations.
  */
-const nativeAccountUnavailable = "native_account_unavailable";
 /**
- * MSAL-defined error code indicating the refresh token has expired and user interaction is needed.
- * @public
- */
-const refreshTokenExpired = "refresh_token_expired";
-/**
- * MSAL-defined error code indicating UI/UX is not allowed (e.g., blocked by policy), requiring alternate interaction.
- * @public
+ * return the current time in Unix time (seconds).
  */
-const uxNotAllowed = "ux_not_allowed";
+function nowSeconds() {
+    // Date.getTime() returns in milliseconds.
+    return Math.round(new Date().getTime() / 1000.0);
+}
 /**
- * Server-originated error code indicating interaction is required to complete the request.
- * @public
+ * Converts JS Date object to seconds
+ * @param date Date
  */
-const interactionRequired = "interaction_required";
+function toSecondsFromDate(date) {
+    // Convert date to seconds
+    return date.getTime() / 1000;
+}
 /**
- * Server-originated error code indicating user consent is required.
- * @public
+ * Convert seconds to JS Date object. Seconds can be in a number or string format or undefined (will still return a date).
+ * @param seconds
  */
-const consentRequired = "consent_required";
+function toDateFromSeconds(seconds) {
+    if (seconds) {
+        return new Date(Number(seconds) * 1000);
+    }
+    return new Date();
+}
 /**
- * Server-originated error code indicating user login is required.
- * @public
+ * check if a token is expired based on given UTC time in seconds.
+ * @param expiresOn
  */
-const loginRequired = "login_required";
+function isTokenExpired(expiresOn, offset) {
+    // check for access token expiry
+    const expirationSec = Number(expiresOn) || 0;
+    const offsetCurrentTimeSec = nowSeconds() + offset;
+    // If current time + offset is greater than token expiration time, then token is expired.
+    return offsetCurrentTimeSec > expirationSec;
+}
 /**
- * Server-originated error code indicating the token is invalid or corrupted.
- * @public
+ * Checks if a cache entry is expired based on the last updated time and cache retention days.
+ * @param lastUpdatedAt
+ * @param cacheRetentionDays
+ * @returns
  */
-const badToken = "bad_token";
+function isCacheExpired(lastUpdatedAt, cacheRetentionDays) {
+    const cacheExpirationTimestamp = Number(lastUpdatedAt) + cacheRetentionDays * 24 * 60 * 60 * 1000;
+    return Date.now() > cacheExpirationTimestamp;
+}
 /**
- * Server-originated error code indicating the user is in an interrupted state and interaction is required.
- * @public
+ * If the current time is earlier than the time that a token was cached at, we must discard the token
+ * i.e. The system clock was turned back after acquiring the cached token
+ * @param cachedAt
+ * @param offset
  */
-const interruptedUser = "interrupted_user";
+function wasClockTurnedBack(cachedAt) {
+    const cachedAtSec = Number(cachedAt);
+    return cachedAtSec > nowSeconds();
+}
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
 /**
- * InteractionRequiredServerErrorMessage contains string constants used by error codes and messages returned by the server indicating interaction is required
+ * Create IdTokenEntity
+ * @param homeAccountId
+ * @param authenticationResult
+ * @param clientId
+ * @param authority
  */
-const InteractionRequiredServerErrorMessage = [
-    interactionRequired,
-    consentRequired,
-    loginRequired,
-    badToken,
-    uxNotAllowed,
-    interruptedUser,
-];
-const InteractionRequiredAuthSubErrorMessage = [
-    "message_only",
-    "additional_action",
-    "basic_action",
-    "user_password_expired",
-    "consent_required",
-    "bad_token",
-    "ux_not_allowed",
-    "interrupted_user",
-];
+function createIdTokenEntity(homeAccountId, environment, idToken, clientId, tenantId) {
+    const idTokenEntity = {
+        credentialType: CredentialType.ID_TOKEN,
+        homeAccountId: homeAccountId,
+        environment: environment,
+        clientId: clientId,
+        secret: idToken,
+        realm: tenantId,
+        lastUpdatedAt: Date.now().toString(), // Set the last updated time to now
+    };
+    return idTokenEntity;
+}
 /**
- * Error thrown when user interaction is required.
+ * Create AccessTokenEntity
+ * @param homeAccountId
+ * @param environment
+ * @param accessToken
+ * @param clientId
+ * @param tenantId
+ * @param scopes
+ * @param expiresOn
+ * @param extExpiresOn
  */
-class InteractionRequiredAuthError extends AuthError {
-    constructor(errorCode, errorMessage, subError, timestamp, traceId, correlationId, claims, errorNo) {
-        super(errorCode, errorMessage, subError);
-        Object.setPrototypeOf(this, InteractionRequiredAuthError.prototype);
-        this.timestamp = timestamp || "";
-        this.traceId = traceId || "";
-        this.correlationId = correlationId || "";
-        this.claims = claims || "";
-        this.name = "InteractionRequiredAuthError";
-        this.errorNo = errorNo;
+function createAccessTokenEntity(homeAccountId, environment, accessToken, clientId, tenantId, scopes, expiresOn, extExpiresOn, base64Decode, refreshOn, tokenType, userAssertionHash, keyId) {
+    const atEntity = {
+        homeAccountId: homeAccountId,
+        credentialType: CredentialType.ACCESS_TOKEN,
+        secret: accessToken,
+        cachedAt: nowSeconds().toString(),
+        expiresOn: expiresOn.toString(),
+        extendedExpiresOn: extExpiresOn.toString(),
+        environment: environment,
+        clientId: clientId,
+        realm: tenantId,
+        target: scopes,
+        tokenType: tokenType || AuthenticationScheme.BEARER,
+        lastUpdatedAt: Date.now().toString(), // Set the last updated time to now
+    };
+    if (userAssertionHash) {
+        atEntity.userAssertionHash = userAssertionHash;
+    }
+    if (refreshOn) {
+        atEntity.refreshOn = refreshOn.toString();
+    }
+    /*
+     * Create Access Token With Auth Scheme instead of regular access token
+     * Cast to lower to handle "bearer" from ADFS
+     */
+    if (atEntity.tokenType?.toLowerCase() !==
+        AuthenticationScheme.BEARER.toLowerCase()) {
+        atEntity.credentialType =
+            CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME;
+        switch (atEntity.tokenType) {
+            case AuthenticationScheme.POP:
+                // Make sure keyId is present and add it to credential
+                const tokenClaims = extractTokenClaims(accessToken, base64Decode);
+                if (!tokenClaims?.cnf?.kid) {
+                    throw createClientAuthError(tokenClaimsCnfRequiredForSignedJwt);
+                }
+                atEntity.keyId = tokenClaims.cnf.kid;
+                break;
+            case AuthenticationScheme.SSH:
+                atEntity.keyId = keyId;
+        }
     }
+    return atEntity;
 }
 /**
- * Helper function used to determine if an error thrown by the server requires interaction to resolve
- * @param errorCode
- * @param errorString
- * @param subError
+ * Create RefreshTokenEntity
+ * @param homeAccountId
+ * @param authenticationResult
+ * @param clientId
+ * @param authority
  */
-function isInteractionRequiredError(errorCode, errorString, subError) {
-    const isInteractionRequiredErrorCode = !!errorCode &&
-        InteractionRequiredServerErrorMessage.indexOf(errorCode) > -1;
-    const isInteractionRequiredSubError = !!subError &&
-        InteractionRequiredAuthSubErrorMessage.indexOf(subError) > -1;
-    const isInteractionRequiredErrorDesc = !!errorString &&
-        InteractionRequiredServerErrorMessage.some((irErrorCode) => {
-            return errorString.indexOf(irErrorCode) > -1;
-        });
-    return (isInteractionRequiredErrorCode ||
-        isInteractionRequiredErrorDesc ||
-        isInteractionRequiredSubError);
+function createRefreshTokenEntity(homeAccountId, environment, refreshToken, clientId, familyId, userAssertionHash, expiresOn) {
+    const rtEntity = {
+        credentialType: CredentialType.REFRESH_TOKEN,
+        homeAccountId: homeAccountId,
+        environment: environment,
+        clientId: clientId,
+        secret: refreshToken,
+        lastUpdatedAt: Date.now().toString(),
+    };
+    if (userAssertionHash) {
+        rtEntity.userAssertionHash = userAssertionHash;
+    }
+    if (familyId) {
+        rtEntity.familyId = familyId;
+    }
+    if (expiresOn) {
+        rtEntity.expiresOn = expiresOn.toString();
+    }
+    return rtEntity;
+}
+function isCredentialEntity(entity) {
+    return (entity.hasOwnProperty("homeAccountId") &&
+        entity.hasOwnProperty("environment") &&
+        entity.hasOwnProperty("credentialType") &&
+        entity.hasOwnProperty("clientId") &&
+        entity.hasOwnProperty("secret"));
 }
 /**
- * Creates an InteractionRequiredAuthError
- */
-function createInteractionRequiredAuthError(errorCode, errorMessage) {
-    return new InteractionRequiredAuthError(errorCode, errorMessage);
-}
-
-/*! @azure/msal-common v16.2.0 2026-03-02 */
-
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-/**
- * Appends user state with random guid, or returns random guid.
- * @param cryptoObj
- * @param userState
- * @param meta
+ * Validates an entity: checks for all expected params
+ * @param entity
  */
-function setRequestState(cryptoObj, userState, meta) {
-    const libraryState = generateLibraryState(cryptoObj, meta);
-    return userState
-        ? `${libraryState}${RESOURCE_DELIM}${userState}`
-        : libraryState;
+function isAccessTokenEntity(entity) {
+    if (!entity) {
+        return false;
+    }
+    return (isCredentialEntity(entity) &&
+        entity.hasOwnProperty("realm") &&
+        entity.hasOwnProperty("target") &&
+        (entity["credentialType"] === CredentialType.ACCESS_TOKEN ||
+            entity["credentialType"] ===
+                CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME));
 }
 /**
- * Generates the state value used by the common library.
- * @param cryptoObj
- * @param meta
+ * Validates an entity: checks for all expected params
+ * @param entity
  */
-function generateLibraryState(cryptoObj, meta) {
-    if (!cryptoObj) {
-        throw createClientAuthError(noCryptoObject);
-    }
-    // Create a state object containing a unique id and the timestamp of the request creation
-    const stateObj = {
-        id: cryptoObj.createNewGuid(),
-    };
-    if (meta) {
-        stateObj.meta = meta;
+function isIdTokenEntity(entity) {
+    if (!entity) {
+        return false;
     }
-    const stateString = JSON.stringify(stateObj);
-    return cryptoObj.base64Encode(stateString);
+    return (isCredentialEntity(entity) &&
+        entity.hasOwnProperty("realm") &&
+        entity["credentialType"] === CredentialType.ID_TOKEN);
 }
 /**
- * Parses the state into the RequestStateObject, which contains the LibraryState info and the state passed by the user.
- * @param base64Decode
- * @param state
+ * Validates an entity: checks for all expected params
+ * @param entity
  */
-function parseRequestState(base64Decode, state) {
-    if (!base64Decode) {
-        throw createClientAuthError(noCryptoObject);
-    }
-    if (!state) {
-        throw createClientAuthError(invalidState);
-    }
-    try {
-        // Split the state between library state and user passed state and decode them separately
-        const splitState = state.split(RESOURCE_DELIM);
-        const libraryState = splitState[0];
-        const userState = splitState.length > 1
-            ? splitState.slice(1).join(RESOURCE_DELIM)
-            : "";
-        const libraryStateString = base64Decode(libraryState);
-        const libraryStateObj = JSON.parse(libraryStateString);
-        return {
-            userRequestState: userState || "",
-            libraryState: libraryStateObj,
-        };
-    }
-    catch (e) {
-        throw createClientAuthError(invalidState);
+function isRefreshTokenEntity(entity) {
+    if (!entity) {
+        return false;
     }
-}
-
-/*! @azure/msal-common v16.2.0 2026-03-02 */
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
+    return (isCredentialEntity(entity) &&
+        entity["credentialType"] === CredentialType.REFRESH_TOKEN);
+}
 /**
- * Utility functions for managing date and time operations.
+ * validates if a given cache entry is "Telemetry", parses <key,value>
+ * @param key
+ * @param entity
  */
+function isServerTelemetryEntity(key, entity) {
+    const validateKey = key.indexOf(SERVER_TELEM_CACHE_KEY) === 0;
+    let validateEntity = true;
+    if (entity) {
+        validateEntity =
+            entity.hasOwnProperty("failedRequests") &&
+                entity.hasOwnProperty("errors") &&
+                entity.hasOwnProperty("cacheHits");
+    }
+    return validateKey && validateEntity;
+}
 /**
- * return the current time in Unix time (seconds).
+ * validates if a given cache entry is "Throttling", parses <key,value>
+ * @param key
+ * @param entity
  */
-function nowSeconds() {
-    // Date.getTime() returns in milliseconds.
-    return Math.round(new Date().getTime() / 1000.0);
+function isThrottlingEntity(key, entity) {
+    let validateKey = false;
+    if (key) {
+        validateKey = key.indexOf(THROTTLING_PREFIX) === 0;
+    }
+    let validateEntity = true;
+    if (entity) {
+        validateEntity = entity.hasOwnProperty("throttleTime");
+    }
+    return validateKey && validateEntity;
 }
 /**
- * Converts JS Date object to seconds
- * @param date Date
+ * Generate AppMetadata Cache Key as per the schema: appmetadata-<environment>-<client_id>
  */
-function toSecondsFromDate(date) {
-    // Convert date to seconds
-    return date.getTime() / 1000;
+function generateAppMetadataKey({ environment, clientId, }) {
+    const appMetaDataKeyArray = [
+        APP_METADATA,
+        environment,
+        clientId,
+    ];
+    return appMetaDataKeyArray
+        .join(CACHE_KEY_SEPARATOR$1)
+        .toLowerCase();
 }
-/**
- * Convert seconds to JS Date object. Seconds can be in a number or string format or undefined (will still return a date).
- * @param seconds
+/*
+ * Validates an entity: checks for all expected params
+ * @param entity
  */
-function toDateFromSeconds(seconds) {
-    if (seconds) {
-        return new Date(Number(seconds) * 1000);
+function isAppMetadataEntity(key, entity) {
+    if (!entity) {
+        return false;
     }
-    return new Date();
+    return (key.indexOf(APP_METADATA) === 0 &&
+        entity.hasOwnProperty("clientId") &&
+        entity.hasOwnProperty("environment"));
 }
 /**
- * check if a token is expired based on given UTC time in seconds.
- * @param expiresOn
+ * Validates an entity: checks for all expected params
+ * @param entity
  */
-function isTokenExpired(expiresOn, offset) {
-    // check for access token expiry
-    const expirationSec = Number(expiresOn) || 0;
-    const offsetCurrentTimeSec = nowSeconds() + offset;
-    // If current time + offset is greater than token expiration time, then token is expired.
-    return offsetCurrentTimeSec > expirationSec;
+function isAuthorityMetadataEntity(key, entity) {
+    if (!entity) {
+        return false;
+    }
+    return (key.indexOf(AUTHORITY_METADATA_CACHE_KEY) === 0 &&
+        entity.hasOwnProperty("aliases") &&
+        entity.hasOwnProperty("preferred_cache") &&
+        entity.hasOwnProperty("preferred_network") &&
+        entity.hasOwnProperty("canonical_authority") &&
+        entity.hasOwnProperty("authorization_endpoint") &&
+        entity.hasOwnProperty("token_endpoint") &&
+        entity.hasOwnProperty("issuer") &&
+        entity.hasOwnProperty("aliasesFromNetwork") &&
+        entity.hasOwnProperty("endpointsFromNetwork") &&
+        entity.hasOwnProperty("expiresAt") &&
+        entity.hasOwnProperty("jwks_uri"));
 }
 /**
- * Checks if a cache entry is expired based on the last updated time and cache retention days.
- * @param lastUpdatedAt
- * @param cacheRetentionDays
- * @returns
+ * Reset the exiresAt value
  */
-function isCacheExpired(lastUpdatedAt, cacheRetentionDays) {
-    const cacheExpirationTimestamp = Number(lastUpdatedAt) + cacheRetentionDays * 24 * 60 * 60 * 1000;
-    return Date.now() > cacheExpirationTimestamp;
+function generateAuthorityMetadataExpiresAt() {
+    return (nowSeconds() +
+        AUTHORITY_METADATA_REFRESH_TIME_SECONDS);
+}
+function updateAuthorityEndpointMetadata(authorityMetadata, updatedValues, fromNetwork) {
+    authorityMetadata.authorization_endpoint =
+        updatedValues.authorization_endpoint;
+    authorityMetadata.token_endpoint = updatedValues.token_endpoint;
+    authorityMetadata.end_session_endpoint = updatedValues.end_session_endpoint;
+    authorityMetadata.issuer = updatedValues.issuer;
+    authorityMetadata.endpointsFromNetwork = fromNetwork;
+    authorityMetadata.jwks_uri = updatedValues.jwks_uri;
+}
+function updateCloudDiscoveryMetadata(authorityMetadata, updatedValues, fromNetwork) {
+    authorityMetadata.aliases = updatedValues.aliases;
+    authorityMetadata.preferred_cache = updatedValues.preferred_cache;
+    authorityMetadata.preferred_network = updatedValues.preferred_network;
+    authorityMetadata.aliasesFromNetwork = fromNetwork;
 }
 /**
- * If the current time is earlier than the time that a token was cached at, we must discard the token
- * i.e. The system clock was turned back after acquiring the cached token
- * @param cachedAt
- * @param offset
+ * Returns whether or not the data needs to be refreshed
  */
-function wasClockTurnedBack(cachedAt) {
-    const cachedAtSec = Number(cachedAt);
-    return cachedAtSec > nowSeconds();
+function isAuthorityMetadataExpired(metadata) {
+    return metadata.expiresAt <= nowSeconds();
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3876,7 +3956,7 @@ const RegionDiscoveryGetCurrentVersion = "regionDiscoveryGetCurrentVersion";
 const CacheManagerGetRefreshToken = "cacheManagerGetRefreshToken";
 const SetUserData = "setUserData";
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3969,7 +4049,7 @@ const invokeAsync = (callback, eventName, logger, telemetryClient, correlationId
     };
 };
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4049,293 +4129,213 @@ class PopTokenGenerator {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
 /**
- * This class instance helps track the memory changes facilitating
- * decisions to read from and write to the persistent cache
- */ class TokenCacheContext {
-    constructor(tokenCache, hasChanged) {
-        this.cache = tokenCache;
-        this.hasChanged = hasChanged;
-    }
-    /**
-     * boolean which indicates the changes in cache
-     */
-    get cacheHasChanged() {
-        return this.hasChanged;
-    }
-    /**
-     * function to retrieve the token cache
-     */
-    get tokenCache() {
-        return this.cache;
-    }
-}
-
-/*! @azure/msal-common v16.2.0 2026-03-02 */
-
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
+ * MSAL-defined interaction required error code indicating no tokens are found in cache.
+ * @public
  */
+const noTokensFound = "no_tokens_found";
 /**
- * Create IdTokenEntity
- * @param homeAccountId
- * @param authenticationResult
- * @param clientId
- * @param authority
+ * MSAL-defined error code indicating a native account is unavailable on the platform.
+ * @public
  */
-function createIdTokenEntity(homeAccountId, environment, idToken, clientId, tenantId) {
-    const idTokenEntity = {
-        credentialType: CredentialType.ID_TOKEN,
-        homeAccountId: homeAccountId,
-        environment: environment,
-        clientId: clientId,
-        secret: idToken,
-        realm: tenantId,
-        lastUpdatedAt: Date.now().toString(), // Set the last updated time to now
-    };
-    return idTokenEntity;
-}
+const nativeAccountUnavailable = "native_account_unavailable";
 /**
- * Create AccessTokenEntity
- * @param homeAccountId
- * @param environment
- * @param accessToken
- * @param clientId
- * @param tenantId
- * @param scopes
- * @param expiresOn
- * @param extExpiresOn
+ * MSAL-defined error code indicating the refresh token has expired and user interaction is needed.
+ * @public
  */
-function createAccessTokenEntity(homeAccountId, environment, accessToken, clientId, tenantId, scopes, expiresOn, extExpiresOn, base64Decode, refreshOn, tokenType, userAssertionHash, keyId) {
-    const atEntity = {
-        homeAccountId: homeAccountId,
-        credentialType: CredentialType.ACCESS_TOKEN,
-        secret: accessToken,
-        cachedAt: nowSeconds().toString(),
-        expiresOn: expiresOn.toString(),
-        extendedExpiresOn: extExpiresOn.toString(),
-        environment: environment,
-        clientId: clientId,
-        realm: tenantId,
-        target: scopes,
-        tokenType: tokenType || AuthenticationScheme.BEARER,
-        lastUpdatedAt: Date.now().toString(), // Set the last updated time to now
-    };
-    if (userAssertionHash) {
-        atEntity.userAssertionHash = userAssertionHash;
-    }
-    if (refreshOn) {
-        atEntity.refreshOn = refreshOn.toString();
-    }
-    /*
-     * Create Access Token With Auth Scheme instead of regular access token
-     * Cast to lower to handle "bearer" from ADFS
-     */
-    if (atEntity.tokenType?.toLowerCase() !==
-        AuthenticationScheme.BEARER.toLowerCase()) {
-        atEntity.credentialType =
-            CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME;
-        switch (atEntity.tokenType) {
-            case AuthenticationScheme.POP:
-                // Make sure keyId is present and add it to credential
-                const tokenClaims = extractTokenClaims(accessToken, base64Decode);
-                if (!tokenClaims?.cnf?.kid) {
-                    throw createClientAuthError(tokenClaimsCnfRequiredForSignedJwt);
-                }
-                atEntity.keyId = tokenClaims.cnf.kid;
-                break;
-            case AuthenticationScheme.SSH:
-                atEntity.keyId = keyId;
-        }
-    }
-    return atEntity;
-}
+const refreshTokenExpired = "refresh_token_expired";
 /**
- * Create RefreshTokenEntity
- * @param homeAccountId
- * @param authenticationResult
- * @param clientId
- * @param authority
+ * MSAL-defined error code indicating UI/UX is not allowed (e.g., blocked by policy), requiring alternate interaction.
+ * @public
  */
-function createRefreshTokenEntity(homeAccountId, environment, refreshToken, clientId, familyId, userAssertionHash, expiresOn) {
-    const rtEntity = {
-        credentialType: CredentialType.REFRESH_TOKEN,
-        homeAccountId: homeAccountId,
-        environment: environment,
-        clientId: clientId,
-        secret: refreshToken,
-        lastUpdatedAt: Date.now().toString(),
-    };
-    if (userAssertionHash) {
-        rtEntity.userAssertionHash = userAssertionHash;
-    }
-    if (familyId) {
-        rtEntity.familyId = familyId;
-    }
-    if (expiresOn) {
-        rtEntity.expiresOn = expiresOn.toString();
-    }
-    return rtEntity;
-}
-function isCredentialEntity(entity) {
-    return (entity.hasOwnProperty("homeAccountId") &&
-        entity.hasOwnProperty("environment") &&
-        entity.hasOwnProperty("credentialType") &&
-        entity.hasOwnProperty("clientId") &&
-        entity.hasOwnProperty("secret"));
-}
+const uxNotAllowed = "ux_not_allowed";
+/**
+ * Server-originated error code indicating interaction is required to complete the request.
+ * @public
+ */
+const interactionRequired = "interaction_required";
+/**
+ * Server-originated error code indicating user consent is required.
+ * @public
+ */
+const consentRequired = "consent_required";
+/**
+ * Server-originated error code indicating user login is required.
+ * @public
+ */
+const loginRequired = "login_required";
 /**
- * Validates an entity: checks for all expected params
- * @param entity
+ * Server-originated error code indicating the token is invalid or corrupted.
+ * @public
  */
-function isAccessTokenEntity(entity) {
-    if (!entity) {
-        return false;
-    }
-    return (isCredentialEntity(entity) &&
-        entity.hasOwnProperty("realm") &&
-        entity.hasOwnProperty("target") &&
-        (entity["credentialType"] === CredentialType.ACCESS_TOKEN ||
-            entity["credentialType"] ===
-                CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME));
-}
+const badToken = "bad_token";
 /**
- * Validates an entity: checks for all expected params
- * @param entity
+ * Server-originated error code indicating the user is in an interrupted state and interaction is required.
+ * @public
+ */
+const interruptedUser = "interrupted_user";
+
+/*! @azure/msal-common v16.2.1 2026-04-01 */
+
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
-function isIdTokenEntity(entity) {
-    if (!entity) {
-        return false;
-    }
-    return (isCredentialEntity(entity) &&
-        entity.hasOwnProperty("realm") &&
-        entity["credentialType"] === CredentialType.ID_TOKEN);
-}
 /**
- * Validates an entity: checks for all expected params
- * @param entity
+ * InteractionRequiredServerErrorMessage contains string constants used by error codes and messages returned by the server indicating interaction is required
  */
-function isRefreshTokenEntity(entity) {
-    if (!entity) {
-        return false;
-    }
-    return (isCredentialEntity(entity) &&
-        entity["credentialType"] === CredentialType.REFRESH_TOKEN);
-}
+const InteractionRequiredServerErrorMessage = [
+    interactionRequired,
+    consentRequired,
+    loginRequired,
+    badToken,
+    uxNotAllowed,
+    interruptedUser,
+];
+const InteractionRequiredAuthSubErrorMessage = [
+    "message_only",
+    "additional_action",
+    "basic_action",
+    "user_password_expired",
+    "consent_required",
+    "bad_token",
+    "ux_not_allowed",
+    "interrupted_user",
+];
 /**
- * validates if a given cache entry is "Telemetry", parses <key,value>
- * @param key
- * @param entity
+ * Error thrown when user interaction is required.
  */
-function isServerTelemetryEntity(key, entity) {
-    const validateKey = key.indexOf(SERVER_TELEM_CACHE_KEY) === 0;
-    let validateEntity = true;
-    if (entity) {
-        validateEntity =
-            entity.hasOwnProperty("failedRequests") &&
-                entity.hasOwnProperty("errors") &&
-                entity.hasOwnProperty("cacheHits");
+class InteractionRequiredAuthError extends AuthError {
+    constructor(errorCode, errorMessage, subError, timestamp, traceId, correlationId, claims, errorNo) {
+        super(errorCode, errorMessage, subError);
+        Object.setPrototypeOf(this, InteractionRequiredAuthError.prototype);
+        this.timestamp = timestamp || "";
+        this.traceId = traceId || "";
+        this.correlationId = correlationId || "";
+        this.claims = claims || "";
+        this.name = "InteractionRequiredAuthError";
+        this.errorNo = errorNo;
     }
-    return validateKey && validateEntity;
 }
 /**
- * validates if a given cache entry is "Throttling", parses <key,value>
- * @param key
- * @param entity
+ * Helper function used to determine if an error thrown by the server requires interaction to resolve
+ * @param errorCode
+ * @param errorString
+ * @param subError
  */
-function isThrottlingEntity(key, entity) {
-    let validateKey = false;
-    if (key) {
-        validateKey = key.indexOf(THROTTLING_PREFIX) === 0;
-    }
-    let validateEntity = true;
-    if (entity) {
-        validateEntity = entity.hasOwnProperty("throttleTime");
-    }
-    return validateKey && validateEntity;
+function isInteractionRequiredError(errorCode, errorString, subError) {
+    const isInteractionRequiredErrorCode = !!errorCode &&
+        InteractionRequiredServerErrorMessage.indexOf(errorCode) > -1;
+    const isInteractionRequiredSubError = !!subError &&
+        InteractionRequiredAuthSubErrorMessage.indexOf(subError) > -1;
+    const isInteractionRequiredErrorDesc = !!errorString &&
+        InteractionRequiredServerErrorMessage.some((irErrorCode) => {
+            return errorString.indexOf(irErrorCode) > -1;
+        });
+    return (isInteractionRequiredErrorCode ||
+        isInteractionRequiredErrorDesc ||
+        isInteractionRequiredSubError);
 }
 /**
- * Generate AppMetadata Cache Key as per the schema: appmetadata-<environment>-<client_id>
+ * Creates an InteractionRequiredAuthError
  */
-function generateAppMetadataKey({ environment, clientId, }) {
-    const appMetaDataKeyArray = [
-        APP_METADATA,
-        environment,
-        clientId,
-    ];
-    return appMetaDataKeyArray
-        .join(CACHE_KEY_SEPARATOR$1)
-        .toLowerCase();
-}
+function createInteractionRequiredAuthError(errorCode, errorMessage) {
+    return new InteractionRequiredAuthError(errorCode, errorMessage);
+}
+
+/*! @azure/msal-common v16.2.1 2026-04-01 */
+
 /*
- * Validates an entity: checks for all expected params
- * @param entity
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
-function isAppMetadataEntity(key, entity) {
-    if (!entity) {
-        return false;
-    }
-    return (key.indexOf(APP_METADATA) === 0 &&
-        entity.hasOwnProperty("clientId") &&
-        entity.hasOwnProperty("environment"));
-}
 /**
- * Validates an entity: checks for all expected params
- * @param entity
+ * Error thrown when there is an error with the server code, for example, unavailability.
  */
-function isAuthorityMetadataEntity(key, entity) {
-    if (!entity) {
-        return false;
+class ServerError extends AuthError {
+    constructor(errorCode, errorMessage, subError, errorNo, status) {
+        super(errorCode, errorMessage, subError);
+        this.name = "ServerError";
+        this.errorNo = errorNo;
+        this.status = status;
+        Object.setPrototypeOf(this, ServerError.prototype);
     }
-    return (key.indexOf(AUTHORITY_METADATA_CACHE_KEY) === 0 &&
-        entity.hasOwnProperty("aliases") &&
-        entity.hasOwnProperty("preferred_cache") &&
-        entity.hasOwnProperty("preferred_network") &&
-        entity.hasOwnProperty("canonical_authority") &&
-        entity.hasOwnProperty("authorization_endpoint") &&
-        entity.hasOwnProperty("token_endpoint") &&
-        entity.hasOwnProperty("issuer") &&
-        entity.hasOwnProperty("aliasesFromNetwork") &&
-        entity.hasOwnProperty("endpointsFromNetwork") &&
-        entity.hasOwnProperty("expiresAt") &&
-        entity.hasOwnProperty("jwks_uri"));
-}
+}
+
+/*! @azure/msal-common v16.2.1 2026-04-01 */
+
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
 /**
- * Reset the exiresAt value
+ * Appends user state with random guid, or returns random guid.
+ * @param cryptoObj
+ * @param userState
+ * @param meta
  */
-function generateAuthorityMetadataExpiresAt() {
-    return (nowSeconds() +
-        AUTHORITY_METADATA_REFRESH_TIME_SECONDS);
-}
-function updateAuthorityEndpointMetadata(authorityMetadata, updatedValues, fromNetwork) {
-    authorityMetadata.authorization_endpoint =
-        updatedValues.authorization_endpoint;
-    authorityMetadata.token_endpoint = updatedValues.token_endpoint;
-    authorityMetadata.end_session_endpoint = updatedValues.end_session_endpoint;
-    authorityMetadata.issuer = updatedValues.issuer;
-    authorityMetadata.endpointsFromNetwork = fromNetwork;
-    authorityMetadata.jwks_uri = updatedValues.jwks_uri;
+function setRequestState(cryptoObj, userState, meta) {
+    const libraryState = generateLibraryState(cryptoObj, meta);
+    return userState
+        ? `${libraryState}${RESOURCE_DELIM}${userState}`
+        : libraryState;
 }
-function updateCloudDiscoveryMetadata(authorityMetadata, updatedValues, fromNetwork) {
-    authorityMetadata.aliases = updatedValues.aliases;
-    authorityMetadata.preferred_cache = updatedValues.preferred_cache;
-    authorityMetadata.preferred_network = updatedValues.preferred_network;
-    authorityMetadata.aliasesFromNetwork = fromNetwork;
+/**
+ * Generates the state value used by the common library.
+ * @param cryptoObj
+ * @param meta
+ */
+function generateLibraryState(cryptoObj, meta) {
+    if (!cryptoObj) {
+        throw createClientAuthError(noCryptoObject);
+    }
+    // Create a state object containing a unique id and the timestamp of the request creation
+    const stateObj = {
+        id: cryptoObj.createNewGuid(),
+    };
+    if (meta) {
+        stateObj.meta = meta;
+    }
+    const stateString = JSON.stringify(stateObj);
+    return cryptoObj.base64Encode(stateString);
 }
 /**
- * Returns whether or not the data needs to be refreshed
+ * Parses the state into the RequestStateObject, which contains the LibraryState info and the state passed by the user.
+ * @param base64Decode
+ * @param state
  */
-function isAuthorityMetadataExpired(metadata) {
-    return metadata.expiresAt <= nowSeconds();
+function parseRequestState(base64Decode, state) {
+    if (!base64Decode) {
+        throw createClientAuthError(noCryptoObject);
+    }
+    if (!state) {
+        throw createClientAuthError(invalidState);
+    }
+    try {
+        // Split the state between library state and user passed state and decode them separately
+        const splitState = state.split(RESOURCE_DELIM);
+        const libraryState = splitState[0];
+        const userState = splitState.length > 1
+            ? splitState.slice(1).join(RESOURCE_DELIM)
+            : "";
+        const libraryStateString = base64Decode(libraryState);
+        const libraryStateObj = JSON.parse(libraryStateString);
+        return {
+            userRequestState: userState || "",
+            libraryState: libraryStateObj,
+        };
+    }
+    catch (e) {
+        throw createClientAuthError(invalidState);
+    }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4491,7 +4491,7 @@ class ResponseHandler {
         if (serverTokenResponse.id_token && !!idTokenClaims) {
             cachedIdToken = createIdTokenEntity(this.homeAccountIdentifier, env, serverTokenResponse.id_token, this.clientId, claimsTenantId || "");
             cachedAccount = buildAccountToCache(this.cacheStorage, authority, this.homeAccountIdentifier, this.cryptoObj.base64Decode, request.correlationId, idTokenClaims, serverTokenResponse.client_info, env, claimsTenantId, authCodePayload, undefined, // nativeAccountId
-            this.logger);
+            this.logger, this.performanceClient);
         }
         // AccessToken
         let cachedAccessToken = null;
@@ -4637,17 +4637,24 @@ class ResponseHandler {
         };
     }
 }
-function buildAccountToCache(cacheStorage, authority, homeAccountId, base64Decode, correlationId, idTokenClaims, clientInfo, environment, claimsTenantId, authCodePayload, nativeAccountId, logger) {
+function buildAccountToCache(cacheStorage, authority, homeAccountId, base64Decode, correlationId, idTokenClaims, clientInfo, environment, claimsTenantId, authCodePayload, nativeAccountId, logger, performanceClient) {
     logger?.verbose("09jz0t", correlationId);
-    // Check if base account is already cached
-    const accountKeys = cacheStorage.getAccountKeys();
-    const baseAccountKey = accountKeys.find((accountKey) => {
-        return accountKey.startsWith(homeAccountId);
-    });
-    let cachedAccount = null;
-    if (baseAccountKey) {
-        cachedAccount = cacheStorage.getAccount(baseAccountKey, correlationId);
+    /*
+     * Check if base account is already cached. Filter by homeAccountId (identifies
+     * the user's home identity) and environment (identifies the cloud) — the two
+     * tenant-agnostic properties that uniquely locate a base AccountEntity.
+     */
+    const accountEnvironment = environment || authority.getPreferredCache();
+    const matchedAccounts = cacheStorage.getAccountsFilteredBy({ homeAccountId, environment: accountEnvironment }, correlationId);
+    performanceClient?.addFields({ cacheMatchedAccounts: matchedAccounts.length }, correlationId);
+    if (matchedAccounts.length > 1) {
+        /*
+         * Base accounts are expected to be unique for a given homeAccountId in normal cache usage.
+         * If multiple matches exist, ignore the cache hit rather than arbitrarily choosing one.
+         */
+        logger?.warning("0x7ad1", correlationId);
     }
+    const cachedAccount = matchedAccounts.length === 1 ? matchedAccounts[0] : null;
     const baseAccount = cachedAccount ||
         createAccountEntity({
             homeAccountId,
@@ -4671,7 +4678,7 @@ function buildAccountToCache(cacheStorage, authority, homeAccountId, base64Decod
     return baseAccount;
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4681,7 +4688,7 @@ const CcsCredentialType = {
     UPN: "UPN",
 };
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4699,7 +4706,7 @@ async function getClientAssertion(clientAssertion, clientId, tokenEndpoint) {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4720,7 +4727,7 @@ function getRequestThumbprint(clientId, request, homeAccountId) {
     };
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4806,7 +4813,7 @@ class ThrottlingUtils {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4837,7 +4844,7 @@ function createNetworkError(error, httpStatus, responseHeaders, additionalError)
     return new NetworkError(error, httpStatus, responseHeaders);
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4951,7 +4958,7 @@ async function sendPostRequest(thumbprint, tokenEndpoint, options, correlationId
     return response;
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4963,7 +4970,7 @@ function isOpenIdConfigResponse(response) {
         response.hasOwnProperty("jwks_uri"));
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4973,7 +4980,7 @@ function isCloudInstanceDiscoveryResponse(response) {
         response.hasOwnProperty("metadata"));
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4983,7 +4990,7 @@ function isCloudInstanceDiscoveryErrorResponse(response) {
         response.hasOwnProperty("error_description"));
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5088,7 +5095,7 @@ RegionDiscovery.IMDS_OPTIONS = {
     },
 };
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5908,7 +5915,7 @@ function buildStaticAuthorityOptions(authOptions) {
     };
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5942,7 +5949,7 @@ async function createDiscoveredInstance(authorityUri, networkClient, cacheManage
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6202,7 +6209,7 @@ class AuthorizationCodeClient {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6427,7 +6434,7 @@ class RefreshTokenClient {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6536,7 +6543,7 @@ class SilentFlowClient {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6551,7 +6558,7 @@ const StubbedNetworkModule = {
     },
 };
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6775,7 +6782,7 @@ function extractLoginHint(account) {
     return account.loginHint || account.idTokenClaims?.login_hint || null;
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6785,7 +6792,7 @@ function extractLoginHint(account) {
  */
 const unexpectedError = "unexpected_error";
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7046,7 +7053,7 @@ class ServerTelemetryManager {
     }
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7067,7 +7074,7 @@ function createJoseHeaderError(code) {
     return new JoseHeaderError(code);
 }
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -7075,7 +7082,7 @@ function createJoseHeaderError(code) {
 const missingKidError = "missing_kid_error";
 const missingAlgError = "missing_alg_error";
 
-/*! @azure/msal-common v16.2.0 2026-03-02 */
+/*! @azure/msal-common v16.2.1 2026-04-01 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7510,7 +7517,7 @@ function ensureArgumentIsJSONString(argName, argValue, correlationId) {
 
 /* eslint-disable header/header */
 const name = "@azure/msal-browser";
-const version = "5.4.0";
+const version = "5.4.1";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -16632,9 +16639,9 @@ class PlatformAuthInteractionClient extends BaseInteractionClient {
         }
         // Get the preferred_cache domain for the given authority
         const authority = await getDiscoveredAuthority(this.config, this.correlationId, this.performanceClient, this.browserStorage, this.logger, request.authority);
-        const baseAccount = buildAccountToCache(this.browserStorage, authority, homeAccountIdentifier, base64Decode, this.correlationId, idTokenClaims, response.client_info, undefined, // environment
+        const baseAccount = buildAccountToCache(this.browserStorage, authority, homeAccountIdentifier, base64Decode, this.correlationId, idTokenClaims, response.client_info, authority.getPreferredCache(), // environment
         idTokenClaims.tid, undefined, // auth code payload
-        response.account.id);
+        response.account.id, this.logger, this.performanceClient);
         // Ensure expires_in is in number format
         response.expires_in = Number(response.expires_in);
         // generate authenticationResult