@azure/msal-browser 3.21.0 → 3.22.0

package/lib/msal-browser.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v3.21.0 2024-08-13 */
+/*! @azure/msal-browser v3.22.0 2024-08-28 */
 '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 v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -315,7 +315,7 @@
     // Token renewal offset default in seconds
     const DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -332,7 +332,7 @@
         unexpectedError: unexpectedError
     });
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -381,7 +381,7 @@
             : AuthErrorMessages[code]);
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -479,7 +479,7 @@
         userTimeoutReached: userTimeoutReached
     });
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -731,7 +731,7 @@
         return new ClientAuthError(errorCode, additionalMessage);
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -792,7 +792,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -807,7 +807,7 @@
         Ciam: 3,
     };
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -819,7 +819,7 @@
             response.hasOwnProperty("jwks_uri"));
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -873,7 +873,7 @@
         urlParseError: urlParseError
     });
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1011,7 +1011,7 @@
         return new ClientConfigurationError(errorCode);
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1108,7 +1108,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1155,7 +1155,7 @@
         return null;
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1319,7 +1319,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1459,7 +1459,7 @@
         return null;
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1472,7 +1472,7 @@
         OIDC: "OIDC",
     };
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1492,7 +1492,7 @@
         AzureUsGovernment: "https://login.microsoftonline.us",
     };
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1502,7 +1502,7 @@
             response.hasOwnProperty("metadata"));
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1512,7 +1512,7 @@
             response.hasOwnProperty("error_description"));
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1669,10 +1669,6 @@
          */
         InitializeSilentRequest: "initializeSilentRequest",
         InitializeClientApplication: "initializeClientApplication",
-        /**
-         * Helper function in PopupClient class (msal-browser).
-         */
-        PopupClientTokenHelper: "popupClientTokenHelper",
         /**
          * Helper function in SilentIframeClient class (msal-browser).
          */
@@ -1998,7 +1994,7 @@
         "multiMatchedRT",
     ]);
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2094,7 +2090,7 @@
         };
     };
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2203,7 +2199,7 @@
         },
     };
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2240,7 +2236,7 @@
         return cachedAtSec > nowSeconds();
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2567,7 +2563,7 @@
         return metadata.expiresAt <= nowSeconds();
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3406,7 +3402,7 @@
         };
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3437,7 +3433,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3455,7 +3451,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3503,7 +3499,7 @@
     const DOMAIN_HINT = "domain_hint";
     const X_CLIENT_EXTRA_SKU = "x-client-xtra-sku";
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3542,7 +3538,7 @@
         },
     };
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3733,12 +3729,12 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /* eslint-disable header/header */
     const name$1 = "@azure/msal-common";
-    const version$1 = "14.14.1";
+    const version$1 = "14.14.2";
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3938,7 +3934,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3978,7 +3974,7 @@
         };
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4057,7 +4053,7 @@
         return updatedAccountInfo;
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4079,7 +4075,7 @@
         return null;
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4322,7 +4318,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4330,7 +4326,7 @@
     const cacheQuotaExceededErrorCode = "cache_quota_exceeded";
     const cacheUnknownErrorCode = "cache_error_unknown";
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4357,7 +4353,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5609,7 +5605,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5707,7 +5703,7 @@
         return (config.authOptions.authority.options.protocolMode === ProtocolMode.OIDC);
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5726,7 +5722,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5824,7 +5820,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5861,7 +5857,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5871,7 +5867,7 @@
         UPN: "UPN",
     };
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5938,7 +5934,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6323,7 +6319,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6426,7 +6422,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6452,7 +6448,7 @@
         refreshTokenExpired: refreshTokenExpired
     });
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6540,7 +6536,7 @@
         return new InteractionRequiredAuthError(errorCode, InteractionRequiredAuthErrorMessages[errorCode]);
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6612,7 +6608,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6696,7 +6692,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6723,7 +6719,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7100,7 +7096,7 @@
         return baseAccount;
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7523,7 +7519,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7737,7 +7733,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7873,7 +7869,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7888,7 +7884,7 @@
         },
     };
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -7896,7 +7892,7 @@
     const missingKidError = "missing_kid_error";
     const missingAlgError = "missing_alg_error";
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7921,7 +7917,7 @@
         return new JoseHeaderError(code, JoseHeaderErrorMessages[code]);
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7961,7 +7957,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8019,7 +8015,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8282,7 +8278,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8361,7 +8357,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.14.1 2024-08-13 */
+    /*! @azure/msal-common v14.14.2 2024-08-28 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -9000,8 +8996,7 @@
     const uninitializedPublicClientApplication = "uninitialized_public_client_application";
     const nativePromptNotSupported = "native_prompt_not_supported";
     const invalidBase64String = "invalid_base64_string";
-    const invalidPopTokenRequest = "invalid_pop_token_request";
-    const failedToRetry = "failed_to_retry";
+    const invalidPopTokenRequest = "invalid_pop_token_request";
 
     var BrowserAuthErrorCodes = /*#__PURE__*/Object.freeze({
         __proto__: null,
@@ -9017,7 +9012,6 @@
         emptyNavigateUri: emptyNavigateUri,
         emptyWindowError: emptyWindowError,
         failedToParseResponse: failedToParseResponse,
-        failedToRetry: failedToRetry,
         getRequestFailed: getRequestFailed,
         hashDoesNotContainKnownProperties: hashDoesNotContainKnownProperties,
         hashEmptyError: hashEmptyError,
@@ -9109,7 +9103,6 @@
         [nativePromptNotSupported]: "The provided prompt is not supported by the native platform. This request should be routed to the web based flow.",
         [invalidBase64String]: "Invalid base64 encoded string.",
         [invalidPopTokenRequest]: "Invalid PoP token request. The request should not have both a popKid value and signPopToken set to true.",
-        [failedToRetry]: "Unable to retry failed auth code redemption due to usage of the onRedirectNavigate request parameter. Please set onRedirectNavigate on the PublicClientApplication configuration instead or call loginRedirect again.",
     };
     /**
      * BrowserAuthErrorMessage class containing string constants used by error codes and messages.
@@ -9398,8 +9391,6 @@
         CORRELATION_ID: "request.correlationId",
         NATIVE_REQUEST: "request.native",
         REDIRECT_CONTEXT: "request.redirect.context",
-        REDIRECT_REQUEST: "request.redirect",
-        REQUEST_RETRY: "request.retry",
     };
     const StaticCacheKeys = {
         ACCOUNT_KEYS: "msal.account.keys",
@@ -10237,7 +10228,7 @@
 
     /* eslint-disable header/header */
     const name = "@azure/msal-browser";
-    const version = "3.21.0";
+    const version = "3.22.0";
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -10349,169 +10340,6 @@
         NestedAppAuthUnavailable: "NESTED_APP_AUTH_UNAVAILABLE", // NAA is unavailable in the current context, can retry with standard browser based auth
     };
 
-    /*
-     * Copyright (c) Microsoft Corporation. All rights reserved.
-     * Licensed under the MIT License.
-     */
-    /**
-     * Returns browser performance measurement module if session flag is enabled. Returns undefined otherwise.
-     */
-    function getPerfMeasurementModule() {
-        let sessionStorage;
-        try {
-            sessionStorage = window[BrowserCacheLocation.SessionStorage];
-            const perfEnabled = sessionStorage?.getItem(BROWSER_PERF_ENABLED_KEY);
-            if (Number(perfEnabled) === 1) {
-                return Promise.resolve().then(function () { return BrowserPerformanceMeasurement$1; });
-            }
-            // Mute errors if it's a non-browser environment or cookies are blocked.
-        }
-        catch (e) { }
-        return undefined;
-    }
-    /**
-     * Returns boolean, indicating whether browser supports window.performance.now() function.
-     */
-    function supportsBrowserPerformanceNow() {
-        return (typeof window !== "undefined" &&
-            typeof window.performance !== "undefined" &&
-            typeof window.performance.now === "function");
-    }
-    /**
-     * Returns event duration in milliseconds using window performance API if available. Returns undefined otherwise.
-     * @param startTime {DOMHighResTimeStamp | undefined}
-     * @returns {number | undefined}
-     */
-    function getPerfDurationMs(startTime) {
-        if (!startTime || !supportsBrowserPerformanceNow()) {
-            return undefined;
-        }
-        return Math.round(window.performance.now() - startTime);
-    }
-    class BrowserPerformanceClient extends PerformanceClient {
-        constructor(configuration, intFields, abbreviations) {
-            super(configuration.auth.clientId, configuration.auth.authority || `${Constants.DEFAULT_AUTHORITY}`, new Logger(configuration.system?.loggerOptions || {}, name, version), name, version, configuration.telemetry?.application || {
-                appName: "",
-                appVersion: "",
-            }, intFields, abbreviations);
-        }
-        generateId() {
-            return createNewGuid();
-        }
-        getPageVisibility() {
-            return document.visibilityState?.toString() || null;
-        }
-        deleteIncompleteSubMeasurements(inProgressEvent) {
-            void getPerfMeasurementModule()?.then((module) => {
-                const rootEvent = this.eventsByCorrelationId.get(inProgressEvent.event.correlationId);
-                const isRootEvent = rootEvent &&
-                    rootEvent.eventId === inProgressEvent.event.eventId;
-                const incompleteMeasurements = [];
-                if (isRootEvent && rootEvent?.incompleteSubMeasurements) {
-                    rootEvent.incompleteSubMeasurements.forEach((subMeasurement) => {
-                        incompleteMeasurements.push({ ...subMeasurement });
-                    });
-                }
-                // Clean up remaining marks for incomplete sub-measurements
-                module.BrowserPerformanceMeasurement.flushMeasurements(inProgressEvent.event.correlationId, incompleteMeasurements);
-            });
-        }
-        /**
-         * Starts measuring performance for a given operation. Returns a function that should be used to end the measurement.
-         * Also captures browser page visibilityState.
-         *
-         * @param {PerformanceEvents} measureName
-         * @param {?string} [correlationId]
-         * @returns {((event?: Partial<PerformanceEvent>) => PerformanceEvent| null)}
-         */
-        startMeasurement(measureName, correlationId) {
-            // Capture page visibilityState and then invoke start/end measurement
-            const startPageVisibility = this.getPageVisibility();
-            const inProgressEvent = super.startMeasurement(measureName, correlationId);
-            const startTime = supportsBrowserPerformanceNow()
-                ? window.performance.now()
-                : undefined;
-            const browserMeasurement = getPerfMeasurementModule()?.then((module) => {
-                return new module.BrowserPerformanceMeasurement(measureName, inProgressEvent.event.correlationId);
-            });
-            void browserMeasurement?.then((measurement) => measurement.startMeasurement());
-            return {
-                ...inProgressEvent,
-                end: (event, error) => {
-                    const res = inProgressEvent.end({
-                        ...event,
-                        startPageVisibility,
-                        endPageVisibility: this.getPageVisibility(),
-                        durationMs: getPerfDurationMs(startTime),
-                    }, error);
-                    void browserMeasurement?.then((measurement) => measurement.endMeasurement());
-                    this.deleteIncompleteSubMeasurements(inProgressEvent);
-                    return res;
-                },
-                discard: () => {
-                    inProgressEvent.discard();
-                    void browserMeasurement?.then((measurement) => measurement.flushMeasurement());
-                    this.deleteIncompleteSubMeasurements(inProgressEvent);
-                },
-            };
-        }
-        /**
-         * Adds pre-queue time to preQueueTimeByCorrelationId map.
-         * @param {PerformanceEvents} eventName
-         * @param {?string} correlationId
-         * @returns
-         */
-        setPreQueueTime(eventName, correlationId) {
-            if (!supportsBrowserPerformanceNow()) {
-                this.logger.trace(`BrowserPerformanceClient: window performance API not available, unable to set telemetry queue time for ${eventName}`);
-                return;
-            }
-            if (!correlationId) {
-                this.logger.trace(`BrowserPerformanceClient: correlationId for ${eventName} not provided, unable to set telemetry queue time`);
-                return;
-            }
-            const preQueueEvent = this.preQueueTimeByCorrelationId.get(correlationId);
-            /**
-             * Manually complete queue measurement if there is an incomplete pre-queue event.
-             * Incomplete pre-queue events are instrumentation bugs that should be fixed.
-             */
-            if (preQueueEvent) {
-                this.logger.trace(`BrowserPerformanceClient: Incomplete pre-queue ${preQueueEvent.name} found`, correlationId);
-                this.addQueueMeasurement(preQueueEvent.name, correlationId, undefined, true);
-            }
-            this.preQueueTimeByCorrelationId.set(correlationId, {
-                name: eventName,
-                time: window.performance.now(),
-            });
-        }
-        /**
-         * Calculates and adds queue time measurement for given performance event.
-         *
-         * @param {PerformanceEvents} eventName
-         * @param {?string} correlationId
-         * @param {?number} queueTime
-         * @param {?boolean} manuallyCompleted - indicator for manually completed queue measurements
-         * @returns
-         */
-        addQueueMeasurement(eventName, correlationId, queueTime, manuallyCompleted) {
-            if (!supportsBrowserPerformanceNow()) {
-                this.logger.trace(`BrowserPerformanceClient: window performance API not available, unable to add queue measurement for ${eventName}`);
-                return;
-            }
-            if (!correlationId) {
-                this.logger.trace(`BrowserPerformanceClient: correlationId for ${eventName} not provided, unable to add queue measurement`);
-                return;
-            }
-            const preQueueTime = super.getPreQueueTime(eventName, correlationId);
-            if (!preQueueTime) {
-                return;
-            }
-            const currentTime = window.performance.now();
-            const resQueueTime = queueTime || super.calculateQueuedTime(preQueueTime, currentTime);
-            return super.addQueueMeasurement(eventName, correlationId, resQueueTime, manuallyCompleted);
-        }
-    }
-
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -10555,9 +10383,7 @@
                         messageType: "NestedAppAuthRequest",
                         method: "GetInitContext",
                         requestId: createNewGuid(),
-                        sendTime: supportsBrowserPerformanceNow()
-                            ? window.performance.now()
-                            : Date.now(),
+                        sendTime: Date.now(),
                     };
                     const request = {
                         requestId: message.requestId,
@@ -10616,9 +10442,7 @@
                 messageType: "NestedAppAuthRequest",
                 method: method,
                 requestId: createNewGuid(),
-                sendTime: supportsBrowserPerformanceNow()
-                    ? window.performance.now()
-                    : Date.now(),
+                sendTime: Date.now(),
                 ...requestParams,
             };
             const promise = new Promise((resolve, reject) => {
@@ -12462,7 +12286,6 @@
             this.removeTemporaryItem(this.generateCacheKey(TemporaryCacheKeys.CORRELATION_ID));
             this.removeTemporaryItem(this.generateCacheKey(TemporaryCacheKeys.CCS_CREDENTIAL));
             this.removeTemporaryItem(this.generateCacheKey(TemporaryCacheKeys.NATIVE_REQUEST));
-            this.removeTemporaryItem(this.generateCacheKey(TemporaryCacheKeys.REDIRECT_REQUEST));
             this.setInteractionInProgress(false);
         }
         /**
@@ -12509,75 +12332,6 @@
             this.clearMsalCookies();
             this.setInteractionInProgress(false);
         }
-        /**
-         * Create request retry key to cache retry status
-         */
-        generateRequestRetriedKey() {
-            return `${Constants.CACHE_PREFIX}.${TemporaryCacheKeys.REQUEST_RETRY}.${this.clientId}`;
-        }
-        /**
-         * Gets the request retry value from the cache
-         */
-        getRequestRetried() {
-            const requestRetriedKey = this.generateRequestRetriedKey();
-            const cachedRetryNumber = this.getTemporaryCache(requestRetriedKey);
-            if (!cachedRetryNumber) {
-                return null;
-            }
-            return parseInt(cachedRetryNumber);
-        }
-        /**
-         * Sets the request retry value to "retried" in the cache
-         */
-        setRequestRetried() {
-            this.logger.trace("BrowserCacheManager.setRequestRetried called");
-            const requestRetriedKey = this.generateRequestRetriedKey();
-            this.setTemporaryCache(requestRetriedKey, "1", false);
-        }
-        /**
-         * Removes all request retry values in the cache
-         */
-        removeRequestRetried() {
-            const requestRetriedKey = this.generateRequestRetriedKey();
-            this.removeTemporaryItem(requestRetriedKey);
-        }
-        /**
-         * Caches the redirectRequest in the cache
-         * @param redirectRequest
-         */
-        cacheRedirectRequest(redirectRequest) {
-            this.logger.trace("BrowserCacheManager.cacheRedirectRequest called");
-            const { ...restParams } = redirectRequest;
-            delete restParams.onRedirectNavigate;
-            const encodedValue = JSON.stringify(restParams);
-            this.setTemporaryCache(TemporaryCacheKeys.REDIRECT_REQUEST, encodedValue, true);
-        }
-        /**
-         * Gets redirect request from the cache. Logs an error and returns undefined if nothing is found.
-         */
-        getCachedRedirectRequest() {
-            this.logger.trace("BrowserCacheManager.getCachedRedirectRequest called");
-            const cachedRedirectRequest = this.getTemporaryCache(TemporaryCacheKeys.REDIRECT_REQUEST, true);
-            if (!cachedRedirectRequest) {
-                this.logger.error(`No cached redirect request found.`);
-            }
-            else {
-                this.removeTemporaryItem(this.generateCacheKey(TemporaryCacheKeys.REDIRECT_REQUEST));
-                let parsedRequest;
-                try {
-                    parsedRequest = JSON.parse(cachedRedirectRequest);
-                }
-                catch (e) {
-                    this.logger.errorPii(`Attempted to parse: ${cachedRedirectRequest}`);
-                    this.logger.error(`Parsing cached redirect request threw with error: ${e}`);
-                    return;
-                }
-                if (parsedRequest) {
-                    return parsedRequest;
-                }
-            }
-            return;
-        }
         cacheCodeRequest(authCodeRequest) {
             this.logger.trace("BrowserCacheManager.cacheCodeRequest called");
             const encodedValue = base64Encode(JSON.stringify(authCodeRequest));
@@ -14681,7 +14435,7 @@
             }
         }
         /**
-         * Helper which initializes authorization clients and requests
+         * Helper which obtains an access_token for your API via opening a popup window in the user's browser
          * @param validRequest
          * @param popupName
          * @param popup
@@ -14694,13 +14448,61 @@
             const serverTelemetryManager = this.initializeServerTelemetryManager(ApiId.acquireTokenPopup);
             const validRequest = await invokeAsync(this.initializeAuthorizationRequest.bind(this), PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest, this.logger, this.performanceClient, this.correlationId)(request, exports.InteractionType.Popup);
             preconnect(validRequest.authority);
-            let authClient;
             try {
                 // Create auth code request and generate PKCE params
                 const authCodeRequest = await invokeAsync(this.initializeAuthorizationCodeRequest.bind(this), PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest, this.logger, this.performanceClient, this.correlationId)(validRequest);
                 // Initialize the client
-                authClient = await invokeAsync(this.createAuthCodeClient.bind(this), PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, this.logger, this.performanceClient, this.correlationId)(serverTelemetryManager, validRequest.authority, validRequest.azureCloudOptions, validRequest.account);
-                return await invokeAsync(this.acquireTokenPopupAsyncHelper.bind(this), PerformanceEvents.PopupClientTokenHelper, this.logger, this.performanceClient, this.correlationId)(authClient, authCodeRequest, validRequest, request, popupName, popupWindowAttributes, popup);
+                const authClient = await invokeAsync(this.createAuthCodeClient.bind(this), PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, this.logger, this.performanceClient, this.correlationId)(serverTelemetryManager, validRequest.authority, validRequest.azureCloudOptions, validRequest.account);
+                const isNativeBroker = NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeMessageHandler, request.authenticationScheme);
+                // Start measurement for server calls with native brokering enabled
+                let fetchNativeAccountIdMeasurement;
+                if (isNativeBroker) {
+                    fetchNativeAccountIdMeasurement =
+                        this.performanceClient.startMeasurement(PerformanceEvents.FetchAccountIdWithNativeBroker, request.correlationId);
+                }
+                // Create acquire token url.
+                const navigateUrl = await authClient.getAuthCodeUrl({
+                    ...validRequest,
+                    nativeBroker: isNativeBroker,
+                });
+                // Create popup interaction handler.
+                const interactionHandler = new InteractionHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.performanceClient);
+                // Show the UI once the url has been created. Get the window handle for the popup.
+                const popupParameters = {
+                    popup,
+                    popupName,
+                    popupWindowAttributes,
+                };
+                const popupWindow = this.initiateAuthRequest(navigateUrl, popupParameters);
+                this.eventHandler.emitEvent(EventType.POPUP_OPENED, exports.InteractionType.Popup, { popupWindow }, null);
+                // Monitor the window for the hash. Return the string value and close the popup when the hash is received. Default timeout is 60 seconds.
+                const responseString = await this.monitorPopupForHash(popupWindow);
+                const serverParams = invoke(deserializeResponse, PerformanceEvents.DeserializeResponse, this.logger, this.performanceClient, this.correlationId)(responseString, this.config.auth.OIDCOptions.serverResponseType, this.logger);
+                // Remove throttle if it exists
+                ThrottlingUtils.removeThrottle(this.browserStorage, this.config.auth.clientId, authCodeRequest);
+                if (serverParams.accountId) {
+                    this.logger.verbose("Account id found in hash, calling WAM for token");
+                    // end measurement for server call with native brokering enabled
+                    if (fetchNativeAccountIdMeasurement) {
+                        fetchNativeAccountIdMeasurement.end({
+                            success: true,
+                            isNativeBroker: true,
+                        });
+                    }
+                    if (!this.nativeMessageHandler) {
+                        throw createBrowserAuthError(nativeConnectionNotEstablished);
+                    }
+                    const nativeInteractionClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, ApiId.acquireTokenPopup, this.performanceClient, this.nativeMessageHandler, serverParams.accountId, this.nativeStorage, validRequest.correlationId);
+                    const { userRequestState } = ProtocolUtils.parseRequestState(this.browserCrypto, validRequest.state);
+                    return await nativeInteractionClient.acquireToken({
+                        ...validRequest,
+                        state: userRequestState,
+                        prompt: undefined, // Server should handle the prompt, ideally native broker can do this part silently
+                    });
+                }
+                // Handle response from hash string.
+                const result = await interactionHandler.handleCodeResponse(serverParams, validRequest);
+                return result;
             }
             catch (e) {
                 if (popup) {
@@ -14711,82 +14513,8 @@
                     e.setCorrelationId(this.correlationId);
                     serverTelemetryManager.cacheFailedRequest(e);
                 }
-                if (!authClient ||
-                    !(e instanceof ServerError) ||
-                    e.errorCode !== BrowserConstants.INVALID_GRANT_ERROR) {
-                    throw e;
-                }
-                this.performanceClient.addFields({
-                    retryError: e.errorCode,
-                }, this.correlationId);
-                const retryAuthCodeRequest = await invokeAsync(this.initializeAuthorizationCodeRequest.bind(this), PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest, this.logger, this.performanceClient, this.correlationId)(validRequest);
-                return await invokeAsync(this.acquireTokenPopupAsyncHelper.bind(this), PerformanceEvents.PopupClientTokenHelper, this.logger, this.performanceClient, this.correlationId)(authClient, retryAuthCodeRequest, validRequest, request, popupName, popupWindowAttributes, popup);
-            }
-        }
-        /**
-         * Helper which obtains an access_token for your API via opening a popup window in the user's browser
-         * @param authClient
-         * @param authCodeRequest
-         * @param validRequest
-         * @param request
-         * @param popupName
-         * @param popupWindowAttributes
-         * @param popup
-         * @returns A promise that is fulfilled when this function has completed, or rejected if an error was raised.
-         */
-        async acquireTokenPopupAsyncHelper(authClient, authCodeRequest, validRequest, request, popupName, popupWindowAttributes, popup) {
-            const correlationId = validRequest.correlationId;
-            this.performanceClient.addQueueMeasurement(PerformanceEvents.PopupClientTokenHelper, correlationId);
-            const isNativeBroker = NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeMessageHandler, request.authenticationScheme);
-            // Start measurement for server calls with native brokering enabled
-            let fetchNativeAccountIdMeasurement;
-            if (isNativeBroker) {
-                fetchNativeAccountIdMeasurement =
-                    this.performanceClient.startMeasurement(PerformanceEvents.FetchAccountIdWithNativeBroker, request.correlationId);
-            }
-            // Create acquire token url.
-            const navigateUrl = await authClient.getAuthCodeUrl({
-                ...validRequest,
-                nativeBroker: isNativeBroker,
-            });
-            // Create popup interaction handler.
-            const interactionHandler = new InteractionHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.performanceClient);
-            // Show the UI once the url has been created. Get the window handle for the popup.
-            const popupParameters = {
-                popup,
-                popupName,
-                popupWindowAttributes,
-            };
-            const popupWindow = this.initiateAuthRequest(navigateUrl, popupParameters);
-            this.eventHandler.emitEvent(EventType.POPUP_OPENED, exports.InteractionType.Popup, { popupWindow }, null);
-            // Monitor the window for the hash. Return the string value and close the popup when the hash is received. Default timeout is 60 seconds.
-            const responseString = await this.monitorPopupForHash(popupWindow);
-            const serverParams = invoke(deserializeResponse, PerformanceEvents.DeserializeResponse, this.logger, this.performanceClient, this.correlationId)(responseString, this.config.auth.OIDCOptions.serverResponseType, this.logger);
-            // Remove throttle if it exists
-            ThrottlingUtils.removeThrottle(this.browserStorage, this.config.auth.clientId, authCodeRequest);
-            if (serverParams.accountId) {
-                this.logger.verbose("Account id found in hash, calling WAM for token");
-                // end measurement for server call with native brokering enabled
-                if (fetchNativeAccountIdMeasurement) {
-                    fetchNativeAccountIdMeasurement.end({
-                        success: true,
-                        isNativeBroker: true,
-                    });
-                }
-                if (!this.nativeMessageHandler) {
-                    throw createBrowserAuthError(nativeConnectionNotEstablished);
-                }
-                const nativeInteractionClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, ApiId.acquireTokenPopup, this.performanceClient, this.nativeMessageHandler, serverParams.accountId, this.nativeStorage, validRequest.correlationId);
-                const { userRequestState } = ProtocolUtils.parseRequestState(this.browserCrypto, validRequest.state);
-                return nativeInteractionClient.acquireToken({
-                    ...validRequest,
-                    state: userRequestState,
-                    prompt: undefined, // Server should handle the prompt, ideally native broker can do this part silently
-                });
+                throw e;
             }
-            // Handle response from hash string.
-            const result = await interactionHandler.handleCodeResponse(serverParams, validRequest);
-            return result;
         }
         /**
          *
@@ -15188,7 +14916,6 @@
             // Acquire token with retrieved code.
             const tokenResponse = (await this.authModule.acquireToken(this.authCodeRequest, authCodeResponse));
             this.browserStorage.cleanRequestByState(state);
-            this.browserStorage.removeRequestRetried();
             return tokenResponse;
         }
         /**
@@ -15224,12 +14951,6 @@
          * @param request
          */
         async acquireToken(request) {
-            if (request.onRedirectNavigate) {
-                this.logger.warning("Unable to cache redirect request, onRedirectNavigate request option has been deprecated. Please set onRedirectNavigate on PublicClientApplication config instead.");
-            }
-            else {
-                this.browserStorage.cacheRedirectRequest(request);
-            }
             const validRequest = await invokeAsync(this.initializeAuthorizationRequest.bind(this), PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest, this.logger, this.performanceClient, this.correlationId)(request, exports.InteractionType.Redirect);
             this.browserStorage.updateCacheEntries(validRequest.state, validRequest.nonce, validRequest.authority, validRequest.loginHint || "", validRequest.account || null);
             const serverTelemetryManager = this.initializeServerTelemetryManager(ApiId.acquireTokenRedirect);
@@ -15361,33 +15082,8 @@
                     e.setCorrelationId(this.correlationId);
                     serverTelemetryManager.cacheFailedRequest(e);
                 }
-                if (e instanceof ServerError &&
-                    e.errorCode === BrowserConstants.INVALID_GRANT_ERROR) {
-                    this.performanceClient.addFields({
-                        retryError: e.errorCode,
-                    }, this.correlationId);
-                    const requestRetried = this.browserStorage.getRequestRetried();
-                    if (requestRetried) {
-                        this.logger.error("Retried request already detected. Throwing error.");
-                        this.browserStorage.removeRequestRetried();
-                        throw e;
-                    }
-                    const redirectRequest = this.browserStorage.getCachedRedirectRequest();
-                    if (!redirectRequest) {
-                        this.logger.error("Unable to retry. Please retry with redirect request");
-                        this.browserStorage.setRequestRetried();
-                        throw createBrowserAuthError(failedToRetry);
-                    }
-                    this.browserStorage.setRequestRetried();
-                    await this.acquireToken(redirectRequest);
-                    return null;
-                }
-                this.browserStorage.removeTemporaryItem(this.browserStorage.generateCacheKey(TemporaryCacheKeys.REDIRECT_REQUEST));
-                this.browserStorage.removeRequestRetried();
-                throw e;
-            }
-            finally {
                 this.browserStorage.cleanRequestByInteractionType(exports.InteractionType.Redirect);
+                throw e;
             }
         }
         /**
@@ -15742,7 +15438,7 @@
                     serverTelemetryManager.cacheFailedRequest(e);
                 }
                 if (!authClient ||
-                    !(e instanceof ServerError) ||
+                    !(e instanceof AuthError) ||
                     e.errorCode !== BrowserConstants.INVALID_GRANT_ERROR) {
                     throw e;
                 }
@@ -19397,6 +19093,169 @@
         }
     }
 
+    /*
+     * Copyright (c) Microsoft Corporation. All rights reserved.
+     * Licensed under the MIT License.
+     */
+    /**
+     * Returns browser performance measurement module if session flag is enabled. Returns undefined otherwise.
+     */
+    function getPerfMeasurementModule() {
+        let sessionStorage;
+        try {
+            sessionStorage = window[BrowserCacheLocation.SessionStorage];
+            const perfEnabled = sessionStorage?.getItem(BROWSER_PERF_ENABLED_KEY);
+            if (Number(perfEnabled) === 1) {
+                return Promise.resolve().then(function () { return BrowserPerformanceMeasurement$1; });
+            }
+            // Mute errors if it's a non-browser environment or cookies are blocked.
+        }
+        catch (e) { }
+        return undefined;
+    }
+    /**
+     * Returns boolean, indicating whether browser supports window.performance.now() function.
+     */
+    function supportsBrowserPerformanceNow() {
+        return (typeof window !== "undefined" &&
+            typeof window.performance !== "undefined" &&
+            typeof window.performance.now === "function");
+    }
+    /**
+     * Returns event duration in milliseconds using window performance API if available. Returns undefined otherwise.
+     * @param startTime {DOMHighResTimeStamp | undefined}
+     * @returns {number | undefined}
+     */
+    function getPerfDurationMs(startTime) {
+        if (!startTime || !supportsBrowserPerformanceNow()) {
+            return undefined;
+        }
+        return Math.round(window.performance.now() - startTime);
+    }
+    class BrowserPerformanceClient extends PerformanceClient {
+        constructor(configuration, intFields, abbreviations) {
+            super(configuration.auth.clientId, configuration.auth.authority || `${Constants.DEFAULT_AUTHORITY}`, new Logger(configuration.system?.loggerOptions || {}, name, version), name, version, configuration.telemetry?.application || {
+                appName: "",
+                appVersion: "",
+            }, intFields, abbreviations);
+        }
+        generateId() {
+            return createNewGuid();
+        }
+        getPageVisibility() {
+            return document.visibilityState?.toString() || null;
+        }
+        deleteIncompleteSubMeasurements(inProgressEvent) {
+            void getPerfMeasurementModule()?.then((module) => {
+                const rootEvent = this.eventsByCorrelationId.get(inProgressEvent.event.correlationId);
+                const isRootEvent = rootEvent &&
+                    rootEvent.eventId === inProgressEvent.event.eventId;
+                const incompleteMeasurements = [];
+                if (isRootEvent && rootEvent?.incompleteSubMeasurements) {
+                    rootEvent.incompleteSubMeasurements.forEach((subMeasurement) => {
+                        incompleteMeasurements.push({ ...subMeasurement });
+                    });
+                }
+                // Clean up remaining marks for incomplete sub-measurements
+                module.BrowserPerformanceMeasurement.flushMeasurements(inProgressEvent.event.correlationId, incompleteMeasurements);
+            });
+        }
+        /**
+         * Starts measuring performance for a given operation. Returns a function that should be used to end the measurement.
+         * Also captures browser page visibilityState.
+         *
+         * @param {PerformanceEvents} measureName
+         * @param {?string} [correlationId]
+         * @returns {((event?: Partial<PerformanceEvent>) => PerformanceEvent| null)}
+         */
+        startMeasurement(measureName, correlationId) {
+            // Capture page visibilityState and then invoke start/end measurement
+            const startPageVisibility = this.getPageVisibility();
+            const inProgressEvent = super.startMeasurement(measureName, correlationId);
+            const startTime = supportsBrowserPerformanceNow()
+                ? window.performance.now()
+                : undefined;
+            const browserMeasurement = getPerfMeasurementModule()?.then((module) => {
+                return new module.BrowserPerformanceMeasurement(measureName, inProgressEvent.event.correlationId);
+            });
+            void browserMeasurement?.then((measurement) => measurement.startMeasurement());
+            return {
+                ...inProgressEvent,
+                end: (event, error) => {
+                    const res = inProgressEvent.end({
+                        ...event,
+                        startPageVisibility,
+                        endPageVisibility: this.getPageVisibility(),
+                        durationMs: getPerfDurationMs(startTime),
+                    }, error);
+                    void browserMeasurement?.then((measurement) => measurement.endMeasurement());
+                    this.deleteIncompleteSubMeasurements(inProgressEvent);
+                    return res;
+                },
+                discard: () => {
+                    inProgressEvent.discard();
+                    void browserMeasurement?.then((measurement) => measurement.flushMeasurement());
+                    this.deleteIncompleteSubMeasurements(inProgressEvent);
+                },
+            };
+        }
+        /**
+         * Adds pre-queue time to preQueueTimeByCorrelationId map.
+         * @param {PerformanceEvents} eventName
+         * @param {?string} correlationId
+         * @returns
+         */
+        setPreQueueTime(eventName, correlationId) {
+            if (!supportsBrowserPerformanceNow()) {
+                this.logger.trace(`BrowserPerformanceClient: window performance API not available, unable to set telemetry queue time for ${eventName}`);
+                return;
+            }
+            if (!correlationId) {
+                this.logger.trace(`BrowserPerformanceClient: correlationId for ${eventName} not provided, unable to set telemetry queue time`);
+                return;
+            }
+            const preQueueEvent = this.preQueueTimeByCorrelationId.get(correlationId);
+            /**
+             * Manually complete queue measurement if there is an incomplete pre-queue event.
+             * Incomplete pre-queue events are instrumentation bugs that should be fixed.
+             */
+            if (preQueueEvent) {
+                this.logger.trace(`BrowserPerformanceClient: Incomplete pre-queue ${preQueueEvent.name} found`, correlationId);
+                this.addQueueMeasurement(preQueueEvent.name, correlationId, undefined, true);
+            }
+            this.preQueueTimeByCorrelationId.set(correlationId, {
+                name: eventName,
+                time: window.performance.now(),
+            });
+        }
+        /**
+         * Calculates and adds queue time measurement for given performance event.
+         *
+         * @param {PerformanceEvents} eventName
+         * @param {?string} correlationId
+         * @param {?number} queueTime
+         * @param {?boolean} manuallyCompleted - indicator for manually completed queue measurements
+         * @returns
+         */
+        addQueueMeasurement(eventName, correlationId, queueTime, manuallyCompleted) {
+            if (!supportsBrowserPerformanceNow()) {
+                this.logger.trace(`BrowserPerformanceClient: window performance API not available, unable to add queue measurement for ${eventName}`);
+                return;
+            }
+            if (!correlationId) {
+                this.logger.trace(`BrowserPerformanceClient: correlationId for ${eventName} not provided, unable to add queue measurement`);
+                return;
+            }
+            const preQueueTime = super.getPreQueueTime(eventName, correlationId);
+            if (!preQueueTime) {
+                return;
+            }
+            const currentTime = window.performance.now();
+            const resQueueTime = queueTime || super.calculateQueuedTime(preQueueTime, currentTime);
+            return super.addQueueMeasurement(eventName, correlationId, resQueueTime, manuallyCompleted);
+        }
+    }
+
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.