plugin-data-source-mssql 2.0.2 → 2.0.4

package/dist/tedious/node_modules/@azure/msal-browser/src/interaction_client/PopupClient.ts

@@ -8,20 +8,22 @@ import {
     CommonEndSessionRequest,
     UrlString,
     AuthError,
-    OIDC_DEFAULT_SCOPES,
-    PerformanceEvents,
     IPerformanceClient,
     Logger,
     ICrypto,
     ProtocolMode,
-    ServerResponseType,
+    PerformanceEvents,
+    Constants,
     invokeAsync,
     invoke,
     PkceCodes,
     CommonAuthorizationUrlRequest,
-    HttpMethod,
 } from "@azure/msal-common/browser";
-import { StandardInteractionClient } from "./StandardInteractionClient.js";
+import {
+    initializeAuthorizationRequest,
+    StandardInteractionClient,
+} from "./StandardInteractionClient.js";
+import * as BrowserPerformanceEvents from "../telemetry/BrowserPerformanceEvents.js";
 import { EventType } from "../event/EventType.js";
 import {
     InteractionType,
@@ -49,6 +51,11 @@ import { generatePkceCodes } from "../crypto/PkceGenerator.js";
 import { isPlatformAuthAllowed } from "../broker/nativeBroker/PlatformAuthProvider.js";
 import { generateEarKey } from "../crypto/BrowserCrypto.js";
 import { IPlatformAuthHandler } from "../broker/nativeBroker/IPlatformAuthHandler.js";
+import {
+    clearCacheOnLogout,
+    getDiscoveredAuthority,
+    initializeServerTelemetryManager,
+} from "./BaseInteractionClient.js";
 import { validateRequestMethod } from "../request/RequestHelpers.js";
 
 export type PopupParams = {
@@ -71,8 +78,8 @@ export class PopupClient extends StandardInteractionClient {
         navigationClient: INavigationClient,
         performanceClient: IPerformanceClient,
         nativeStorageImpl: BrowserCacheManager,
-        platformAuthHandler?: IPlatformAuthHandler,
-        correlationId?: string
+        correlationId: string,
+        platformAuthHandler?: IPlatformAuthHandler
     ) {
         super(
             config,
@@ -82,11 +89,9 @@ export class PopupClient extends StandardInteractionClient {
             eventHandler,
             navigationClient,
             performanceClient,
-            platformAuthHandler,
-            correlationId
+            correlationId,
+            platformAuthHandler
         );
-        // Properly sets this reference for the unload event.
-        this.unloadWindow = this.unloadWindow.bind(this);
         this.nativeStorage = nativeStorageImpl;
         this.eventHandler = eventHandler;
     }
@@ -103,7 +108,7 @@ export class PopupClient extends StandardInteractionClient {
         let popupParams: PopupParams | undefined = undefined;
         try {
             const popupName = this.generatePopupName(
-                request.scopes || OIDC_DEFAULT_SCOPES,
+                request.scopes || Constants.OIDC_DEFAULT_SCOPES,
                 request.authority || this.config.auth.authority
             );
             popupParams = {
@@ -113,13 +118,16 @@ export class PopupClient extends StandardInteractionClient {
             };
 
             this.performanceClient.addFields(
-                { isAsyncPopup: this.config.system.asyncPopups },
+                { isAsyncPopup: !this.config.system.navigatePopups },
                 this.correlationId
             );
 
-            // asyncPopups flag is true. Acquires token without first opening popup. Popup will be opened later asynchronously.
-            if (this.config.system.asyncPopups) {
-                this.logger.verbose("asyncPopups set to true, acquiring token");
+            // navigatePopups flag is false. Acquires token without first opening popup. Popup will be opened later asynchronously.
+            if (!this.config.system.navigatePopups) {
+                this.logger.verbose(
+                    "navigatePopups set to false, acquiring token",
+                    this.correlationId
+                );
                 // Passes on popup position and dimensions if in request
                 return this.acquireTokenPopupAsync(
                     request,
@@ -127,17 +135,20 @@ export class PopupClient extends StandardInteractionClient {
                     pkceCodes
                 );
             } else {
+                // navigatePopups flag is set to true. Opens popup before acquiring token.
+
                 // Pre-validate request method to avoid opening popup if the request is invalid
                 const validatedRequest: PopupRequest = {
                     ...request,
                     httpMethod: validateRequestMethod(
                         request,
-                        this.config.auth.protocolMode
+                        this.config.system.protocolMode
                     ),
                 };
-                // asyncPopups flag is set to false. Opens popup before acquiring token.
+
                 this.logger.verbose(
-                    "asyncPopup set to false, opening popup before acquiring token"
+                    "navigatePopups set to true, opening popup before acquiring token",
+                    this.correlationId
                 );
                 popupParams.popup = this.openSizedPopup(
                     "about:blank",
@@ -160,7 +171,7 @@ export class PopupClient extends StandardInteractionClient {
      */
     logout(logoutRequest?: EndSessionPopupRequest): Promise<void> {
         try {
-            this.logger.verbose("logoutPopup called");
+            this.logger.verbose("logoutPopup called", this.correlationId);
             const validLogoutRequest =
                 this.initializeLogoutRequest(logoutRequest);
             const popupParams: PopupParams = {
@@ -173,9 +184,12 @@ export class PopupClient extends StandardInteractionClient {
             const mainWindowRedirectUri =
                 logoutRequest && logoutRequest.mainWindowRedirectUri;
 
-            // asyncPopups flag is true. Acquires token without first opening popup. Popup will be opened later asynchronously.
-            if (this.config.system.asyncPopups) {
-                this.logger.verbose("asyncPopups set to true");
+            // navigatePopups flag set to false. Acquires token without first opening popup. Popup will be opened later asynchronously.
+            if (!this.config.system.navigatePopups) {
+                this.logger.verbose(
+                    "navigatePopups set to false",
+                    this.correlationId
+                );
                 // Passes on popup position and dimensions if in request
                 return this.logoutPopupAsync(
                     validLogoutRequest,
@@ -184,8 +198,11 @@ export class PopupClient extends StandardInteractionClient {
                     mainWindowRedirectUri
                 );
             } else {
-                // asyncPopups flag is set to false. Opens popup before logging out.
-                this.logger.verbose("asyncPopup set to false, opening popup");
+                // navigatePopups flag is set to true. Opens popup before logging out.
+                this.logger.verbose(
+                    "navigatePopups set to true, opening popup",
+                    this.correlationId
+                );
                 popupParams.popup = this.openSizedPopup(
                     "about:blank",
                     popupParams
@@ -216,15 +233,27 @@ export class PopupClient extends StandardInteractionClient {
         popupParams: PopupParams,
         pkceCodes?: PkceCodes
     ): Promise<AuthenticationResult> {
-        this.logger.verbose("acquireTokenPopupAsync called");
+        this.logger.verbose(
+            "acquireTokenPopupAsync called",
+            this.correlationId
+        );
 
         const validRequest = await invokeAsync(
-            this.initializeAuthorizationRequest.bind(this),
-            PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest,
+            initializeAuthorizationRequest,
+            BrowserPerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest,
             this.logger,
             this.performanceClient,
             this.correlationId
-        )(request, InteractionType.Popup);
+        )(
+            request,
+            InteractionType.Popup,
+            this.config,
+            this.browserCrypto,
+            this.browserStorage,
+            this.logger,
+            this.performanceClient,
+            this.correlationId
+        );
 
         /*
          * Skip pre-connect for async popups to reduce time between user interaction and popup window creation to avoid
@@ -237,12 +266,13 @@ export class PopupClient extends StandardInteractionClient {
         const isPlatformBroker = isPlatformAuthAllowed(
             this.config,
             this.logger,
+            this.correlationId,
             this.platformAuthProvider,
             request.authenticationScheme
         );
         validRequest.platformBroker = isPlatformBroker;
 
-        if (this.config.auth.protocolMode === ProtocolMode.EAR) {
+        if (this.config.system.protocolMode === ProtocolMode.EAR) {
             return this.executeEarFlow(validRequest, popupParams, pkceCodes);
         } else {
             return this.executeCodeFlow(validRequest, popupParams, pkceCodes);
@@ -262,15 +292,19 @@ export class PopupClient extends StandardInteractionClient {
         pkceCodes?: PkceCodes
     ): Promise<AuthenticationResult> {
         const correlationId = request.correlationId;
-        const serverTelemetryManager = this.initializeServerTelemetryManager(
-            ApiId.acquireTokenPopup
+        const serverTelemetryManager = initializeServerTelemetryManager(
+            ApiId.acquireTokenPopup,
+            this.config.auth.clientId,
+            this.correlationId,
+            this.browserStorage,
+            this.logger
         );
 
         const pkce =
             pkceCodes ||
             (await invokeAsync(
                 generatePkceCodes,
-                PerformanceEvents.GeneratePkceCodes,
+                BrowserPerformanceEvents.GeneratePkceCodes,
                 this.logger,
                 this.performanceClient,
                 correlationId
@@ -285,7 +319,7 @@ export class PopupClient extends StandardInteractionClient {
             // Initialize the client
             const authClient: AuthorizationCodeClient = await invokeAsync(
                 this.createAuthCodeClient.bind(this),
-                PerformanceEvents.StandardInteractionClientCreateAuthCodeClient,
+                BrowserPerformanceEvents.StandardInteractionClientCreateAuthCodeClient,
                 this.logger,
                 this.performanceClient,
                 correlationId
@@ -297,7 +331,7 @@ export class PopupClient extends StandardInteractionClient {
                 account: popupRequest.account,
             });
 
-            if (popupRequest.httpMethod === HttpMethod.POST) {
+            if (popupRequest.httpMethod === Constants.HttpMethod.POST) {
                 return await this.executeCodeFlowWithPost(
                     popupRequest,
                     popupParams,
@@ -327,32 +361,37 @@ export class PopupClient extends StandardInteractionClient {
                 );
                 this.eventHandler.emitEvent(
                     EventType.POPUP_OPENED,
+                    correlationId,
                     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,
-                    popupParams.popupWindowParent
+                // Wait for the redirect bridge response
+                const responseString = await BrowserUtils.waitForBridgeResponse(
+                    this.config.system.popupBridgeTimeout,
+                    this.logger,
+                    this.browserCrypto,
+                    request,
+                    this.performanceClient
                 );
 
                 const serverParams = invoke(
                     ResponseHandler.deserializeResponse,
-                    PerformanceEvents.DeserializeResponse,
+                    BrowserPerformanceEvents.DeserializeResponse,
                     this.logger,
                     this.performanceClient,
                     this.correlationId
                 )(
                     responseString,
-                    this.config.auth.OIDCOptions.serverResponseType,
-                    this.logger
+                    this.config.auth.OIDCOptions.responseMode,
+                    this.logger,
+                    this.correlationId
                 );
 
                 return await invokeAsync(
                     Authorize.handleResponseCode,
-                    PerformanceEvents.HandleResponseCode,
+                    BrowserPerformanceEvents.HandleResponseCode,
                     this.logger,
                     this.performanceClient,
                     correlationId
@@ -392,24 +431,35 @@ export class PopupClient extends StandardInteractionClient {
         popupParams: PopupParams,
         pkceCodes?: PkceCodes
     ): Promise<AuthenticationResult> {
-        const correlationId = request.correlationId;
+        const {
+            correlationId,
+            authority,
+            azureCloudOptions,
+            extraQueryParameters,
+            account,
+        } = request;
         // Get the frame handle for the silent request
         const discoveredAuthority = await invokeAsync(
-            this.getDiscoveredAuthority.bind(this),
-            PerformanceEvents.StandardInteractionClientGetDiscoveredAuthority,
+            getDiscoveredAuthority,
+            BrowserPerformanceEvents.StandardInteractionClientGetDiscoveredAuthority,
             this.logger,
             this.performanceClient,
             correlationId
-        )({
-            requestAuthority: request.authority,
-            requestAzureCloudOptions: request.azureCloudOptions,
-            requestExtraQueryParameters: request.extraQueryParameters,
-            account: request.account,
-        });
+        )(
+            this.config,
+            this.correlationId,
+            this.performanceClient,
+            this.browserStorage,
+            this.logger,
+            authority,
+            azureCloudOptions,
+            extraQueryParameters,
+            account
+        );
 
         const earJwk = await invokeAsync(
             generateEarKey,
-            PerformanceEvents.GenerateEarKey,
+            BrowserPerformanceEvents.GenerateEarKey,
             this.logger,
             this.performanceClient,
             correlationId
@@ -418,12 +468,11 @@ export class PopupClient extends StandardInteractionClient {
             pkceCodes ||
             (await invokeAsync(
                 generatePkceCodes,
-                PerformanceEvents.GeneratePkceCodes,
+                BrowserPerformanceEvents.GeneratePkceCodes,
                 this.logger,
                 this.performanceClient,
                 correlationId
             )(this.performanceClient, this.logger, correlationId));
-
         const popupRequest = {
             ...request,
             earJwk: earJwk,
@@ -444,35 +493,46 @@ export class PopupClient extends StandardInteractionClient {
 
         // Monitor the popup for the hash. Return the string value and close the popup when the hash is received. Default timeout is 60 seconds.
         const responseString = await invokeAsync(
-            this.monitorPopupForHash.bind(this),
-            PerformanceEvents.SilentHandlerMonitorIframeForHash,
+            BrowserUtils.waitForBridgeResponse,
+            BrowserPerformanceEvents.SilentHandlerMonitorIframeForHash,
             this.logger,
             this.performanceClient,
             correlationId
-        )(popupWindow, popupParams.popupWindowParent);
+        )(
+            this.config.system.popupBridgeTimeout,
+            this.logger,
+            this.browserCrypto,
+            popupRequest,
+            this.performanceClient
+        );
 
         const serverParams = invoke(
             ResponseHandler.deserializeResponse,
-            PerformanceEvents.DeserializeResponse,
+            BrowserPerformanceEvents.DeserializeResponse,
             this.logger,
             this.performanceClient,
             this.correlationId
         )(
             responseString,
-            this.config.auth.OIDCOptions.serverResponseType,
-            this.logger
+            this.config.auth.OIDCOptions.responseMode,
+            this.logger,
+            this.correlationId
         );
 
         if (!serverParams.ear_jwe && serverParams.code) {
             const authClient = await invokeAsync(
                 this.createAuthCodeClient.bind(this),
-                PerformanceEvents.StandardInteractionClientCreateAuthCodeClient,
+                BrowserPerformanceEvents.StandardInteractionClientCreateAuthCodeClient,
                 this.logger,
                 this.performanceClient,
                 correlationId
             )({
-                serverTelemetryManager: this.initializeServerTelemetryManager(
-                    ApiId.acquireTokenPopup
+                serverTelemetryManager: initializeServerTelemetryManager(
+                    ApiId.acquireTokenPopup,
+                    this.config.auth.clientId,
+                    correlationId,
+                    this.browserStorage,
+                    this.logger
                 ),
                 requestAuthority: request.authority,
                 requestAzureCloudOptions: request.azureCloudOptions,
@@ -483,7 +543,7 @@ export class PopupClient extends StandardInteractionClient {
 
             return invokeAsync(
                 Authorize.handleResponseCode,
-                PerformanceEvents.HandleResponseCode,
+                BrowserPerformanceEvents.HandleResponseCode,
                 this.logger,
                 this.performanceClient,
                 correlationId
@@ -504,7 +564,7 @@ export class PopupClient extends StandardInteractionClient {
         } else {
             return invokeAsync(
                 Authorize.handleResponseEAR,
-                PerformanceEvents.HandleResponseEar,
+                BrowserPerformanceEvents.HandleResponseEar,
                 this.logger,
                 this.performanceClient,
                 correlationId
@@ -533,17 +593,18 @@ export class PopupClient extends StandardInteractionClient {
         const correlationId = request.correlationId;
         // Get the frame handle for the silent request
         const discoveredAuthority = await invokeAsync(
-            this.getDiscoveredAuthority.bind(this),
-            PerformanceEvents.StandardInteractionClientGetDiscoveredAuthority,
+            getDiscoveredAuthority,
+            BrowserPerformanceEvents.StandardInteractionClientGetDiscoveredAuthority,
             this.logger,
             this.performanceClient,
             correlationId
-        )({
-            requestAuthority: request.authority,
-            requestAzureCloudOptions: request.azureCloudOptions,
-            requestExtraQueryParameters: request.extraQueryParameters,
-            account: request.account,
-        });
+        )(
+            this.config,
+            this.correlationId,
+            this.performanceClient,
+            this.browserStorage,
+            this.logger
+        );
 
         const popupWindow =
             popupParams.popup || this.openPopup("about:blank", popupParams);
@@ -561,28 +622,35 @@ export class PopupClient extends StandardInteractionClient {
 
         // Monitor the popup for the hash. Return the string value and close the popup when the hash is received. Default timeout is 60 seconds.
         const responseString = await invokeAsync(
-            this.monitorPopupForHash.bind(this),
-            PerformanceEvents.SilentHandlerMonitorIframeForHash,
+            BrowserUtils.waitForBridgeResponse,
+            BrowserPerformanceEvents.SilentHandlerMonitorIframeForHash,
             this.logger,
             this.performanceClient,
             correlationId
-        )(popupWindow, popupParams.popupWindowParent);
+        )(
+            this.config.system.popupBridgeTimeout,
+            this.logger,
+            this.browserCrypto,
+            request,
+            this.performanceClient
+        );
 
         const serverParams = invoke(
             ResponseHandler.deserializeResponse,
-            PerformanceEvents.DeserializeResponse,
+            BrowserPerformanceEvents.DeserializeResponse,
             this.logger,
             this.performanceClient,
             this.correlationId
         )(
             responseString,
-            this.config.auth.OIDCOptions.serverResponseType,
-            this.logger
+            this.config.auth.OIDCOptions.responseMode,
+            this.logger,
+            this.correlationId
         );
 
         return invokeAsync(
             Authorize.handleResponseCode,
-            PerformanceEvents.HandleResponseCode,
+            BrowserPerformanceEvents.HandleResponseCode,
             this.logger,
             this.performanceClient,
             correlationId
@@ -617,20 +685,28 @@ export class PopupClient extends StandardInteractionClient {
         requestAuthority?: string,
         mainWindowRedirectUri?: string
     ): Promise<void> {
-        this.logger.verbose("logoutPopupAsync called");
+        this.logger.verbose("logoutPopupAsync called", this.correlationId);
         this.eventHandler.emitEvent(
             EventType.LOGOUT_START,
+            this.correlationId,
             InteractionType.Popup,
             validRequest
         );
 
-        const serverTelemetryManager = this.initializeServerTelemetryManager(
-            ApiId.logoutPopup
+        const serverTelemetryManager = initializeServerTelemetryManager(
+            ApiId.logoutPopup,
+            this.config.auth.clientId,
+            this.correlationId,
+            this.browserStorage,
+            this.logger
         );
 
         try {
             // Clear cache on logout
-            await this.clearCacheOnLogout(
+            await clearCacheOnLogout(
+                this.browserStorage,
+                this.browserCrypto,
+                this.logger,
                 this.correlationId,
                 validRequest.account
             );
@@ -638,7 +714,7 @@ export class PopupClient extends StandardInteractionClient {
             // Initialize the client
             const authClient = await invokeAsync(
                 this.createAuthCodeClient.bind(this),
-                PerformanceEvents.StandardInteractionClientCreateAuthCodeClient,
+                BrowserPerformanceEvents.StandardInteractionClientCreateAuthCodeClient,
                 this.logger,
                 this.performanceClient,
                 this.correlationId
@@ -658,6 +734,7 @@ export class PopupClient extends StandardInteractionClient {
                 ) {
                     this.eventHandler.emitEvent(
                         EventType.LOGOUT_SUCCESS,
+                        validRequest.correlationId,
                         InteractionType.Popup,
                         validRequest
                     );
@@ -690,6 +767,7 @@ export class PopupClient extends StandardInteractionClient {
 
             this.eventHandler.emitEvent(
                 EventType.LOGOUT_SUCCESS,
+                validRequest.correlationId,
                 InteractionType.Popup,
                 validRequest
             );
@@ -698,14 +776,18 @@ export class PopupClient extends StandardInteractionClient {
             const popupWindow = this.openPopup(logoutUri, popupParams);
             this.eventHandler.emitEvent(
                 EventType.POPUP_OPENED,
+                validRequest.correlationId,
                 InteractionType.Popup,
                 { popupWindow },
                 null
             );
 
-            await this.monitorPopupForHash(
-                popupWindow,
-                popupParams.popupWindowParent
+            await BrowserUtils.waitForBridgeResponse(
+                this.config.system.popupBridgeTimeout,
+                this.logger,
+                this.browserCrypto,
+                validRequest,
+                this.performanceClient
             ).catch(() => {
                 // Swallow any errors related to monitoring the window. Server logout is best effort
             });
@@ -722,17 +804,22 @@ export class PopupClient extends StandardInteractionClient {
                 );
 
                 this.logger.verbose(
-                    "Redirecting main window to url specified in the request"
+                    "Redirecting main window to url specified in the request",
+                    this.correlationId
                 );
                 this.logger.verbosePii(
-                    `Redirecting main window to: ${absoluteUrl}`
+                    `Redirecting main window to: '${absoluteUrl}'`,
+                    this.correlationId
                 );
                 await this.navigationClient.navigateInternal(
                     absoluteUrl,
                     navigationOptions
                 );
             } else {
-                this.logger.verbose("No main window navigation requested");
+                this.logger.verbose(
+                    "No main window navigation requested",
+                    this.correlationId
+                );
             }
         } catch (e) {
             // Close the synchronous popup if an error is thrown before the window unload event is registered
@@ -744,12 +831,14 @@ export class PopupClient extends StandardInteractionClient {
             }
             this.eventHandler.emitEvent(
                 EventType.LOGOUT_FAILURE,
+                this.correlationId,
                 InteractionType.Popup,
                 null,
                 e as EventError
             );
             this.eventHandler.emitEvent(
                 EventType.LOGOUT_END,
+                this.correlationId,
                 InteractionType.Popup
             );
             throw e;
@@ -757,6 +846,7 @@ export class PopupClient extends StandardInteractionClient {
 
         this.eventHandler.emitEvent(
             EventType.LOGOUT_END,
+            this.correlationId,
             InteractionType.Popup
         );
     }
@@ -768,85 +858,21 @@ export class PopupClient extends StandardInteractionClient {
     initiateAuthRequest(requestUrl: string, params: PopupParams): Window {
         // Check that request url is not empty.
         if (requestUrl) {
-            this.logger.infoPii(`Navigate to: ${requestUrl}`);
+            this.logger.infoPii(
+                `Navigate to: '${requestUrl}'`,
+                this.correlationId
+            );
             // Open the popup window to requestUrl.
             return this.openPopup(requestUrl, params);
         } else {
             // Throw error if request URL is empty.
-            this.logger.error("Navigate url is empty");
+            this.logger.error("Navigate url is empty", this.correlationId);
             throw createBrowserAuthError(
                 BrowserAuthErrorCodes.emptyNavigateUri
             );
         }
     }
 
-    /**
-     * Monitors a window until it loads a url with the same origin.
-     * @param popupWindow - window that is being monitored
-     * @param timeout - timeout for processing hash once popup is redirected back to application
-     */
-    monitorPopupForHash(
-        popupWindow: Window,
-        popupWindowParent: Window
-    ): Promise<string> {
-        return new Promise<string>((resolve, reject) => {
-            this.logger.verbose(
-                "PopupHandler.monitorPopupForHash - polling started"
-            );
-
-            const intervalId = setInterval(() => {
-                // Window is closed
-                if (popupWindow.closed) {
-                    this.logger.error(
-                        "PopupHandler.monitorPopupForHash - window closed"
-                    );
-                    clearInterval(intervalId);
-                    reject(
-                        createBrowserAuthError(
-                            BrowserAuthErrorCodes.userCancelled
-                        )
-                    );
-                    return;
-                }
-
-                let href = "";
-                try {
-                    /*
-                     * Will throw if cross origin,
-                     * which should be caught and ignored
-                     * since we need the interval to keep running while on STS UI.
-                     */
-                    href = popupWindow.location.href;
-                } catch (e) {}
-
-                // Don't process blank pages or cross domain
-                if (!href || href === "about:blank") {
-                    return;
-                }
-                clearInterval(intervalId);
-
-                let responseString = "";
-                const responseType =
-                    this.config.auth.OIDCOptions.serverResponseType;
-                if (popupWindow) {
-                    if (responseType === ServerResponseType.QUERY) {
-                        responseString = popupWindow.location.search;
-                    } else {
-                        responseString = popupWindow.location.hash;
-                    }
-                }
-
-                this.logger.verbose(
-                    "PopupHandler.monitorPopupForHash - popup window is on same origin as caller"
-                );
-
-                resolve(responseString);
-            }, this.config.system.pollIntervalMilliseconds);
-        }).finally(() => {
-            this.cleanPopup(popupWindow, popupWindowParent);
-        });
-    }
-
     /**
      * @hidden
      *
@@ -867,13 +893,15 @@ export class PopupClient extends StandardInteractionClient {
             if (popupParams.popup) {
                 popupWindow = popupParams.popup;
                 this.logger.verbosePii(
-                    `Navigating popup window to: ${urlNavigate}`
+                    `Navigating popup window to: '${urlNavigate}'`,
+                    this.correlationId
                 );
                 popupWindow.location.assign(urlNavigate);
             } else if (typeof popupParams.popup === "undefined") {
                 // Popup will be undefined if it was not passed in
                 this.logger.verbosePii(
-                    `Opening popup window to: ${urlNavigate}`
+                    `Opening popup window to: '${urlNavigate}'`,
+                    this.correlationId
                 );
                 popupWindow = this.openSizedPopup(urlNavigate, popupParams);
             }
@@ -888,15 +916,12 @@ export class PopupClient extends StandardInteractionClient {
                 popupWindow.focus();
             }
             this.currentWindow = popupWindow;
-            popupParams.popupWindowParent.addEventListener(
-                "beforeunload",
-                this.unloadWindow
-            );
 
             return popupWindow;
         } catch (e) {
             this.logger.error(
-                "error opening popup " + (e as AuthError).message
+                `error opening popup '${(e as AuthError).message}'`,
+                this.correlationId
             );
             throw createBrowserAuthError(
                 BrowserAuthErrorCodes.popupWindowError
@@ -945,21 +970,24 @@ export class PopupClient extends StandardInteractionClient {
 
         if (!width || width < 0 || width > winWidth) {
             this.logger.verbose(
-                "Default popup window width used. Window width not configured or invalid."
+                "Default popup window width used. Window width not configured or invalid.",
+                this.correlationId
             );
             width = BrowserConstants.POPUP_WIDTH;
         }
 
         if (!height || height < 0 || height > winHeight) {
             this.logger.verbose(
-                "Default popup window height used. Window height not configured or invalid."
+                "Default popup window height used. Window height not configured or invalid.",
+                this.correlationId
             );
             height = BrowserConstants.POPUP_HEIGHT;
         }
 
         if (!top || top < 0 || top > winHeight) {
             this.logger.verbose(
-                "Default popup window top position used. Window top not configured or invalid."
+                "Default popup window top position used. Window top not configured or invalid.",
+                this.correlationId
             );
             top = Math.max(
                 0,
@@ -969,7 +997,8 @@ export class PopupClient extends StandardInteractionClient {
 
         if (!left || left < 0 || left > winWidth) {
             this.logger.verbose(
-                "Default popup window left position used. Window left not configured or invalid."
+                "Default popup window left position used. Window left not configured or invalid.",
+                this.correlationId
             );
             left = Math.max(
                 0,
@@ -984,32 +1013,6 @@ export class PopupClient extends StandardInteractionClient {
         );
     }
 
-    /**
-     * Event callback to unload main window.
-     */
-    unloadWindow(e: Event): void {
-        if (this.currentWindow) {
-            this.currentWindow.close();
-        }
-        // Guarantees browser unload will happen, so no other errors will be thrown.
-        e.preventDefault();
-    }
-
-    /**
-     * Closes popup, removes any state vars created during popup calls.
-     * @param popupWindow
-     */
-    cleanPopup(popupWindow: Window, popupWindowParent: Window): void {
-        // Close window.
-        popupWindow.close();
-
-        // Remove window unload function
-        popupWindowParent.removeEventListener(
-            "beforeunload",
-            this.unloadWindow
-        );
-    }
-
     /**
      * Generates the name for the popup based on the client id and request
      * @param clientId