npm - @azure/msal-browser - Versions diffs - 4.19.0 → 4.21.0 - Mend

@azure/msal-browser 4.19.0 → 4.21.0

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 (279) hide show

package/lib/msal-browser.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v4.19.0 2025-08-05 */
+/*! @azure/msal-browser v4.21.0 2025-08-19 */
 '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.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * 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.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -300,7 +300,7 @@
         unexpectedError: unexpectedError
     });
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -349,7 +349,7 @@
             : AuthErrorMessages[code]);
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -447,7 +447,7 @@
         userTimeoutReached: userTimeoutReached
     });
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -699,7 +699,7 @@
         return new ClientAuthError(errorCode, additionalMessage);
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -738,7 +738,7 @@
         },
     };
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -929,12 +929,12 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /* eslint-disable header/header */
     const name$1 = "@azure/msal-common";
-    const version$1 = "15.10.0";
+    const version$1 = "15.12.0";
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -954,7 +954,7 @@
         AzureUsGovernment: "https://login.microsoftonline.us",
     };
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1010,7 +1010,7 @@
         urlParseError: urlParseError
     });
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1153,7 +1153,7 @@
         return new ClientConfigurationError(errorCode);
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1250,7 +1250,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1294,7 +1294,11 @@
          * @returns
          */
         static createSearchScopes(inputScopeString) {
-            const scopeSet = new ScopeSet(inputScopeString);
+            // Handle empty scopes by using default OIDC scopes for cache lookup
+            const scopesToUse = inputScopeString && inputScopeString.length > 0
+                ? inputScopeString
+                : [...OIDC_DEFAULT_SCOPES];
+            const scopeSet = new ScopeSet(scopesToUse);
             if (!scopeSet.containsOnlyOIDCScopes()) {
                 scopeSet.removeOIDCScopes();
             }
@@ -1441,7 +1445,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1523,7 +1527,7 @@
         return updatedAccountInfo;
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1584,12 +1588,34 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
      */
+    /**
+     * Canonicalizes a URL by making it lowercase and ensuring it ends with /
+     * Inlined version of UrlString.canonicalizeUri to avoid circular dependency
+     * @param url - URL to canonicalize
+     * @returns Canonicalized URL
+     */
+    function canonicalizeUrl(url) {
+        if (!url) {
+            return url;
+        }
+        let lowerCaseUrl = url.toLowerCase();
+        if (StringUtils.endsWith(lowerCaseUrl, "?")) {
+            lowerCaseUrl = lowerCaseUrl.slice(0, -1);
+        }
+        else if (StringUtils.endsWith(lowerCaseUrl, "?/")) {
+            lowerCaseUrl = lowerCaseUrl.slice(0, -2);
+        }
+        if (!StringUtils.endsWith(lowerCaseUrl, "/")) {
+            lowerCaseUrl += "/";
+        }
+        return lowerCaseUrl;
+    }
     /**
      * Parses hash string from given string. Returns empty string if no hash symbol is found.
      * @param hashString
@@ -1647,9 +1673,38 @@
             }
         });
         return queryParameterArray.join("&");
+    }
+    /**
+     * Normalizes URLs for comparison by removing hash, canonicalizing,
+     * and ensuring consistent URL encoding in query parameters.
+     * This fixes redirect loops when URLs contain encoded characters like apostrophes (%27).
+     * @param url - URL to normalize
+     * @returns Normalized URL string for comparison
+     */
+    function normalizeUrlForComparison(url) {
+        if (!url) {
+            return url;
+        }
+        // Remove hash first
+        const urlWithoutHash = url.split("#")[0];
+        try {
+            // Parse the URL to handle encoding consistently
+            const urlObj = new URL(urlWithoutHash);
+            /*
+             * Reconstruct the URL with properly decoded query parameters
+             * This ensures that %27 and ' are treated as equivalent
+             */
+            const normalizedUrl = urlObj.origin + urlObj.pathname + urlObj.search;
+            // Apply canonicalization logic inline to avoid circular dependency
+            return canonicalizeUrl(normalizedUrl);
+        }
+        catch (e) {
+            // Fallback to original logic if URL parsing fails
+            return canonicalizeUrl(urlWithoutHash);
+        }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1813,7 +1868,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1952,7 +2007,7 @@
         return null;
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1960,7 +2015,7 @@
     const cacheQuotaExceeded = "cache_quota_exceeded";
     const cacheErrorUnknown = "cache_error_unknown";
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2005,7 +2060,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2035,6 +2090,11 @@
          * Gets first tenanted AccountInfo object found based on provided filters
          */
         getAccountInfoFilteredBy(accountFilter, correlationId) {
+            if (Object.keys(accountFilter).length === 0 ||
+                Object.values(accountFilter).every((value) => !value)) {
+                this.commonLogger.warning("getAccountInfoFilteredBy: Account filter is empty or invalid, returning null");
+                return null;
+            }
             const allAccounts = this.getAllAccounts(accountFilter, correlationId);
             if (allAccounts.length > 1) {
                 // If one or more accounts are found, prioritize accounts that have an ID token
@@ -3109,7 +3169,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3133,7 +3193,7 @@
         EAR: "EAR",
     };
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3655,7 +3715,7 @@
         "upgradedCacheCount",
     ]);
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3734,7 +3794,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3834,7 +3894,7 @@
         return (config.authOptions.authority.options.protocolMode === ProtocolMode.OIDC);
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3844,7 +3904,7 @@
         UPN: "UPN",
     };
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3884,7 +3944,7 @@
         };
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3934,7 +3994,7 @@
     const EAR_JWK = "ear_jwk";
     const EAR_JWE_CRYPTO = "ear_jwe_crypto";
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4314,7 +4374,7 @@
         });
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4329,7 +4389,7 @@
         Ciam: 3,
     };
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4341,7 +4401,7 @@
             response.hasOwnProperty("jwks_uri"));
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4351,7 +4411,7 @@
             response.hasOwnProperty("metadata"));
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4361,7 +4421,7 @@
             response.hasOwnProperty("error_description"));
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4457,7 +4517,7 @@
         };
     };
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4563,7 +4623,7 @@
         },
     };
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4628,7 +4688,7 @@
         return cachedAtSec > nowSeconds();
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4890,7 +4950,7 @@
         return metadata.expiresAt <= nowSeconds();
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5729,7 +5789,7 @@
         };
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5760,7 +5820,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5779,7 +5839,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5800,7 +5860,7 @@
         };
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5887,7 +5947,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5918,7 +5978,7 @@
         return new NetworkError(error, httpStatus, responseHeaders);
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6066,7 +6126,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6088,7 +6148,7 @@
         return null;
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6303,7 +6363,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6331,7 +6391,7 @@
         uxNotAllowed: uxNotAllowed
     });
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6421,7 +6481,7 @@
         return new InteractionRequiredAuthError(errorCode, InteractionRequiredAuthErrorMessages[errorCode]);
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6493,7 +6553,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6575,7 +6635,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6602,7 +6662,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6933,7 +6993,7 @@
         return baseAccount;
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6951,7 +7011,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7186,7 +7246,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7395,7 +7455,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7493,7 +7553,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7508,7 +7568,7 @@
         },
     };
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7732,7 +7792,7 @@
         return account.loginHint || account.idTokenClaims?.login_hint || null;
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7790,7 +7850,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8053,7 +8113,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -8061,7 +8121,7 @@
     const missingKidError = "missing_kid_error";
     const missingAlgError = "missing_alg_error";
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8086,7 +8146,7 @@
         return new JoseHeaderError(code, JoseHeaderErrorMessages[code]);
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8126,7 +8186,7 @@
         }
     }
-    /*! @azure/msal-common v15.10.0 2025-08-05 */
+    /*! @azure/msal-common v15.12.0 2025-08-19 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -10222,7 +10282,7 @@
     /* eslint-disable header/header */
     const name = "@azure/msal-browser";
-    const version = "4.19.0";
+    const version = "4.21.0";
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -12850,11 +12910,6 @@
      * @returns The first account found in the cache matching the provided filter or null if no account could be found.
      */
     function getAccount(accountFilter, logger, browserStorage, correlationId) {
-        logger.trace("getAccount called");
-        if (Object.keys(accountFilter).length === 0) {
-            logger.warning("getAccount: No accountFilter provided");
-            return null;
-        }
         const account = browserStorage.getAccountInfoFilteredBy(accountFilter, correlationId);
         if (account) {
             logger.verbose("getAccount: Account matching provided filter found, returning");
@@ -13628,7 +13683,6 @@
     const USER_INTERACTION_REQUIRED = "USER_INTERACTION_REQUIRED";
     const USER_CANCEL = "USER_CANCEL";
     const NO_NETWORK = "NO_NETWORK";
-    const PERSISTENT_ERROR = "PERSISTENT_ERROR";
     const DISABLED = "DISABLED";
     const ACCOUNT_UNAVAILABLE = "ACCOUNT_UNAVAILABLE";
     const UX_NOT_ALLOWED = "UX_NOT_ALLOWED";
@@ -13655,8 +13709,7 @@
     function isFatalNativeAuthError(error) {
         if (error.ext &&
             error.ext.status &&
-            (error.ext.status === PERSISTENT_ERROR ||
-                error.ext.status === DISABLED)) {
+            error.ext.status === DISABLED) {
             return true;
         }
         if (error.ext &&
@@ -13780,10 +13833,10 @@
          * @param request
          */
         async acquireToken(request, cacheLookupPolicy) {
-            this.performanceClient.addQueueMeasurement(PerformanceEvents.NativeInteractionClientAcquireToken, request.correlationId);
+            this.performanceClient.addQueueMeasurement(PerformanceEvents.NativeInteractionClientAcquireToken, this.correlationId);
             this.logger.trace("NativeInteractionClient - acquireToken called.");
             // start the perf measurement
-            const nativeATMeasurement = this.performanceClient.startMeasurement(PerformanceEvents.NativeInteractionClientAcquireToken, request.correlationId);
+            const nativeATMeasurement = this.performanceClient.startMeasurement(PerformanceEvents.NativeInteractionClientAcquireToken, this.correlationId);
             const reqTimestamp = nowSeconds();
             const serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
             try {
@@ -13802,6 +13855,10 @@
                 catch (e) {
                     if (cacheLookupPolicy === CacheLookupPolicy.AccessToken) {
                         this.logger.info("MSAL internal Cache does not contain tokens, return error as per cache policy");
+                        nativeATMeasurement.end({
+                            success: false,
+                            brokerErrorCode: "cache_request_failed",
+                        });
                         throw e;
                     }
                     // continue with a native call for any and all errors
@@ -13823,7 +13880,6 @@
                         success: false,
                         errorCode: error.errorCode,
                         subErrorCode: error.subError,
-                        isNativeBroker: true,
                     });
                     throw error;
                 });
@@ -13832,6 +13888,9 @@
                 if (e instanceof NativeAuthError) {
                     serverTelemetryManager.setNativeBrokerErrorCode(e.errorCode);
                 }
+                nativeATMeasurement.end({
+                    success: false,
+                });
                 throw e;
             }
         }
@@ -13953,6 +14012,9 @@
                 const authResult = await this.handleNativeResponse(response, request, reqTimestamp);
                 const serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
                 serverTelemetryManager.clearNativeBrokerErrorCode();
+                if (performanceClient && this.correlationId) {
+                    this.performanceClient.addFields({ isNativeBroker: true }, this.correlationId);
+                }
                 return authResult;
             }
             catch (e) {
@@ -14269,7 +14331,7 @@
                 // generate reqCnf if not provided in the request
                 let reqCnfData;
                 if (!validatedRequest.keyId) {
-                    const generatedReqCnfData = await invokeAsync(popTokenGenerator.generateCnf.bind(popTokenGenerator), PerformanceEvents.PopTokenGenerateCnf, this.logger, this.performanceClient, request.correlationId)(shrParameters, this.logger);
+                    const generatedReqCnfData = await invokeAsync(popTokenGenerator.generateCnf.bind(popTokenGenerator), PerformanceEvents.PopTokenGenerateCnf, this.logger, this.performanceClient, this.correlationId)(shrParameters, this.logger);
                     reqCnfData = generatedReqCnfData.reqCnfString;
                     validatedRequest.keyId = generatedReqCnfData.kid;
                     validatedRequest.signPopToken = true;
@@ -14355,7 +14417,7 @@
             this.performanceClient?.addFields({
                 embeddedClientId: child_client_id,
                 embeddedRedirectUri: child_redirect_uri,
-            }, request.correlationId);
+            }, this.correlationId);
         }
     }
@@ -14386,6 +14448,10 @@
         if (request.platformBroker) {
             // signal ests that this is a WAM call
             addNativeBroker(parameters);
+            // instrument JS-platform bridge specific fields
+            performanceClient.addFields({
+                isPlatformAuthorizeRequest: true,
+            }, request.correlationId);
             // pass the req_cnf for POP
             if (request.authenticationScheme === AuthenticationScheme.POP) {
                 const cryptoOps = new CryptoOps(logger, performanceClient);
@@ -15778,8 +15844,8 @@
                 }
                 // If navigateToLoginRequestUrl is true, get the url where the redirect request was initiated
                 const loginRequestUrl = this.browserStorage.getTemporaryCache(TemporaryCacheKeys.ORIGIN_URI, true) || Constants.EMPTY_STRING;
-                const loginRequestUrlNormalized = UrlString.removeHashFromUrl(loginRequestUrl);
-                const currentUrlNormalized = UrlString.removeHashFromUrl(window.location.href);
+                const loginRequestUrlNormalized = normalizeUrlForComparison(loginRequestUrl);
+                const currentUrlNormalized = normalizeUrlForComparison(window.location.href);
                 if (loginRequestUrlNormalized === currentUrlNormalized &&
                     this.config.auth.navigateToLoginRequestUrl) {
                     // We are on the page we need to navigate to - handle hash
@@ -16908,6 +16974,9 @@
                 if (useNative && this.platformAuthProvider) {
                     rootMeasurement = this.performanceClient.startMeasurement(PerformanceEvents.AcquireTokenRedirect, platformBrokerRequest?.correlationId || "");
                     this.logger.trace("handleRedirectPromise - acquiring token from native platform");
+                    rootMeasurement.add({
+                        isPlatformBrokerRequest: true,
+                    });
                     const nativeClient = new PlatformAuthInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, ApiId.handleRedirectPromise, this.performanceClient, this.platformAuthProvider, platformBrokerRequest.accountId, this.nativeInternalStorage, platformBrokerRequest.correlationId);
                     redirectResponse = invokeAsync(nativeClient.handleRedirectPromise.bind(nativeClient), PerformanceEvents.HandleNativeRedirectPromiseMeasurement, this.logger, this.performanceClient, rootMeasurement.event.correlationId)(this.performanceClient, rootMeasurement.event.correlationId);
                 }
@@ -17001,12 +17070,12 @@
                     const navigate = typeof onRedirectNavigateCb === "function"
                         ? onRedirectNavigateCb(url)
                         : undefined;
-                    if (navigate !== false) {
-                        atrMeasurement.end({ success: true });
-                    }
-                    else {
-                        atrMeasurement.discard();
-                    }
+                    atrMeasurement.add({
+                        navigateCallbackResult: navigate !== false,
+                    });
+                    atrMeasurement.event =
+                        atrMeasurement.end({ success: true }) ||
+                            atrMeasurement.event;
                     return navigate;
                 };
             }
@@ -17016,12 +17085,12 @@
                     const navigate = typeof configOnRedirectNavigateCb === "function"
                         ? configOnRedirectNavigateCb(url)
                         : undefined;
-                    if (navigate !== false) {
-                        atrMeasurement.end({ success: true });
-                    }
-                    else {
-                        atrMeasurement.discard();
-                    }
+                    atrMeasurement.add({
+                        navigateCallbackResult: navigate !== false,
+                    });
+                    atrMeasurement.event =
+                        atrMeasurement.end({ success: true }) ||
+                            atrMeasurement.event;
                     return navigate;
                 };
             }
@@ -17043,9 +17112,13 @@
                     result = nativeClient
                         .acquireTokenRedirect(request, atrMeasurement)
                         .catch((e) => {
+                        atrMeasurement.add({
+                            brokerErrorName: e.name,
+                            brokerErrorCode: e.errorCode,
+                        });
                         if (e instanceof NativeAuthError &&
                             isFatalNativeAuthError(e)) {
-                            this.platformAuthProvider = undefined; // If extension gets uninstalled during session prevent future requests from continuing to attempt
+                            this.platformAuthProvider = undefined; // If extension gets uninstalled during session prevent future requests from continuing to attempt platform broker calls
                             const redirectClient = this.createRedirectClient(correlationId);
                             return redirectClient.acquireToken(request);
                         }
@@ -17065,7 +17138,18 @@
             }
             catch (e) {
                 this.browserStorage.resetRequestCache();
-                atrMeasurement.end({ success: false }, e);
+                /*
+                 * Pre-redirect event completes before navigation occurs.
+                 * Timed out navigation needs to be instrumented separately as a post-redirect event.
+                 */
+                if (atrMeasurement.event.status === 2) {
+                    this.performanceClient
+                        .startMeasurement(PerformanceEvents.AcquireTokenRedirect, correlationId)
+                        .end({ success: false }, e);
+                }
+                else {
+                    atrMeasurement.end({ success: false }, e);
+                }
                 if (isLoggedIn) {
                     this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Redirect, null, e);
                 }
@@ -17111,6 +17195,9 @@
             let result;
             const pkce = this.getPreGeneratedPkceCodes(correlationId);
             if (this.canUsePlatformBroker(request)) {
+                atPopupMeasurement.add({
+                    isPlatformBrokerRequest: true,
+                });
                 result = this.acquireTokenNative({
                     ...request,
                     correlationId,
@@ -17118,15 +17205,18 @@
                     .then((response) => {
                     atPopupMeasurement.end({
                         success: true,
-                        isNativeBroker: true,
                         accountType: getAccountType(response.account),
                     });
                     return response;
                 })
                     .catch((e) => {
+                    atPopupMeasurement.add({
+                        brokerErrorName: e.name,
+                        brokerErrorCode: e.errorCode,
+                    });
                     if (e instanceof NativeAuthError &&
                         isFatalNativeAuthError(e)) {
-                        this.platformAuthProvider = undefined; // If extension gets uninstalled during session prevent future requests from continuing to attempt
+                        this.platformAuthProvider = undefined; // If extension gets uninstalled during session prevent future requests from continuing to continuing to attempt platform broker calls
                         const popupClient = this.createPopupClient(correlationId);
                         return popupClient.acquireToken(request, pkce);
                     }
@@ -17232,7 +17322,14 @@
             this.eventHandler.emitEvent(EventType.SSO_SILENT_START, exports.InteractionType.Silent, validRequest);
             let result;
             if (this.canUsePlatformBroker(validRequest)) {
+                this.ssoSilentMeasurement?.add({
+                    isPlatformBrokerRequest: true,
+                });
                 result = this.acquireTokenNative(validRequest, ApiId.ssoSilent).catch((e) => {
+                    this.ssoSilentMeasurement?.add({
+                        brokerErrorName: e.name,
+                        brokerErrorCode: e.errorCode,
+                    });
                     // If native token acquisition fails for availability reasons fallback to standard flow
                     if (e instanceof NativeAuthError && isFatalNativeAuthError(e)) {
                         this.platformAuthProvider = undefined; // If extension gets uninstalled during session prevent future requests from continuing to attempt
@@ -17251,7 +17348,6 @@
                 this.eventHandler.emitEvent(EventType.SSO_SILENT_SUCCESS, exports.InteractionType.Silent, response);
                 this.ssoSilentMeasurement?.end({
                     success: true,
-                    isNativeBroker: response.fromNativeBroker,
                     accessTokenSize: response.accessToken.length,
                     idTokenSize: response.idToken.length,
                     accountType: getAccountType(response.account),
@@ -17305,7 +17401,6 @@
                             this.hybridAuthCodeResponses.delete(hybridAuthCode);
                             atbcMeasurement.end({
                                 success: true,
-                                isNativeBroker: result.fromNativeBroker,
                                 accessTokenSize: result.accessToken.length,
                                 idTokenSize: result.idToken.length,
                                 accountType: getAccountType(result.account),
@@ -17330,6 +17425,9 @@
                 }
                 else if (request.nativeAccountId) {
                     if (this.canUsePlatformBroker(request, request.nativeAccountId)) {
+                        atbcMeasurement.add({
+                            isPlatformBrokerRequest: true,
+                        });
                         const result = await this.acquireTokenNative({
                             ...request,
                             correlationId,
@@ -17339,6 +17437,10 @@
                                 isFatalNativeAuthError(e)) {
                                 this.platformAuthProvider = undefined; // If extension gets uninstalled during session prevent future requests from continuing to attempt
                             }
+                            atbcMeasurement.add({
+                                brokerErrorName: e.name,
+                                brokerErrorCode: e.errorCode,
+                            });
                             throw e;
                         });
                         atbcMeasurement.end({
@@ -17383,7 +17485,6 @@
                 this.acquireTokenByCodeAsyncMeasurement?.end({
                     success: true,
                     fromCache: response.fromCache,
-                    isNativeBroker: response.fromNativeBroker,
                 });
                 return response;
             })
@@ -17881,7 +17982,6 @@
                 atsMeasurement.end({
                     success: true,
                     fromCache: result.fromCache,
-                    isNativeBroker: result.fromNativeBroker,
                     accessTokenSize: result.accessToken.length,
                     idTokenSize: result.idToken.length,
                 });
@@ -18014,7 +18114,6 @@
                 if (request.correlationId) {
                     this.performanceClient.addFields({
                         fromCache: response.fromCache,
-                        isNativeBroker: response.fromNativeBroker,
                     }, request.correlationId);
                 }
                 return response;
@@ -18038,7 +18137,12 @@
             if (isPlatformAuthAllowed(this.config, this.logger, this.platformAuthProvider, silentRequest.authenticationScheme) &&
                 silentRequest.account.nativeAccountId) {
                 this.logger.verbose("acquireTokenSilent - attempting to acquire token from native platform");
+                this.performanceClient.addFields({ isPlatformBrokerRequest: true }, silentRequest.correlationId);
                 return this.acquireTokenNative(silentRequest, ApiId.acquireTokenSilent_silentFlow, silentRequest.account.nativeAccountId, cacheLookupPolicy).catch(async (e) => {
+                    this.performanceClient.addFields({
+                        brokerErrorName: e.name,
+                        brokerErrorCode: e.errorCode,
+                    }, silentRequest.correlationId);
                     // If native token acquisition fails for availability reasons fallback to web flow
                     if (e instanceof NativeAuthError && isFatalNativeAuthError(e)) {
                         this.logger.verbose("acquireTokenSilent - native platform unavailable, falling back to web flow");