@azure/msal-browser 3.2.0 → 3.4.0

package/dist/interaction_handler/InteractionHandler.mjs

@@ -1,8 +1,7 @@
-/*! @azure/msal-browser v3.2.0 2023-10-05 */
+/*! @azure/msal-browser v3.4.0 2023-10-30 */
 'use strict';
-import { PerformanceEvents, createClientAuthError, ClientAuthErrorCodes, ServerError, invokeAsync, AuthorityFactory } from '@azure/msal-common';
+import { PerformanceEvents, ServerError, invokeAsync, CcsCredentialType } from '@azure/msal-common';
 import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
-import { TemporaryCacheKeys } from '../utils/BrowserConstants.mjs';
 import { hashEmptyError, userCancelled } from '../error/BrowserAuthErrorCodes.mjs';
 
 /*
@@ -24,21 +23,15 @@ class InteractionHandler {
      * Function to handle response parameters from hash.
      * @param locationHash
      */
-    async handleCodeResponseFromHash(locationHash, state, authority, networkModule) {
-        this.performanceClient.addQueueMeasurement(PerformanceEvents.HandleCodeResponseFromHash, this.authCodeRequest.correlationId);
+    async handleCodeResponseFromHash(locationHash, request) {
+        this.performanceClient.addQueueMeasurement(PerformanceEvents.HandleCodeResponseFromHash, request.correlationId);
         // Check that location hash isn't empty.
         if (!locationHash) {
             throw createBrowserAuthError(hashEmptyError);
         }
-        // Handle code response.
-        const stateKey = this.browserStorage.generateStateKey(state);
-        const requestState = this.browserStorage.getTemporaryCache(stateKey);
-        if (!requestState) {
-            throw createClientAuthError(ClientAuthErrorCodes.stateNotFound, "Cached State");
-        }
         let authCodeResponse;
         try {
-            authCodeResponse = this.authModule.handleFragmentResponse(locationHash, requestState);
+            authCodeResponse = this.authModule.handleFragmentResponse(locationHash, request.state);
         }
         catch (e) {
             if (e instanceof ServerError &&
@@ -50,7 +43,7 @@ class InteractionHandler {
                 throw e;
             }
         }
-        return invokeAsync(this.handleCodeResponseFromServer.bind(this), PerformanceEvents.HandleCodeResponseFromServer, this.logger, this.performanceClient, this.authCodeRequest.correlationId)(authCodeResponse, state, authority, networkModule);
+        return invokeAsync(this.handleCodeResponseFromServer.bind(this), PerformanceEvents.HandleCodeResponseFromServer, this.logger, this.performanceClient, request.correlationId)(authCodeResponse, request);
     }
     /**
      * Process auth code response from AAD
@@ -60,70 +53,50 @@ class InteractionHandler {
      * @param networkModule
      * @returns
      */
-    async handleCodeResponseFromServer(authCodeResponse, state, authority, networkModule, validateNonce = true) {
-        this.performanceClient.addQueueMeasurement(PerformanceEvents.HandleCodeResponseFromServer, this.authCodeRequest.correlationId);
+    async handleCodeResponseFromServer(authCodeResponse, request, validateNonce = true) {
+        this.performanceClient.addQueueMeasurement(PerformanceEvents.HandleCodeResponseFromServer, request.correlationId);
         this.logger.trace("InteractionHandler.handleCodeResponseFromServer called");
-        // Handle code response.
-        const stateKey = this.browserStorage.generateStateKey(state);
-        const requestState = this.browserStorage.getTemporaryCache(stateKey);
-        if (!requestState) {
-            throw createClientAuthError(ClientAuthErrorCodes.stateNotFound, "Cached State");
-        }
-        // Get cached items
-        const nonceKey = this.browserStorage.generateNonceKey(requestState);
-        const cachedNonce = this.browserStorage.getTemporaryCache(nonceKey);
         // Assign code to request
         this.authCodeRequest.code = authCodeResponse.code;
         // Check for new cloud instance
         if (authCodeResponse.cloud_instance_host_name) {
-            await invokeAsync(this.updateTokenEndpointAuthority.bind(this), PerformanceEvents.UpdateTokenEndpointAuthority, this.logger, this.performanceClient, this.authCodeRequest.correlationId)(authCodeResponse.cloud_instance_host_name, authority, networkModule);
+            await invokeAsync(this.authModule.updateAuthority.bind(this.authModule), PerformanceEvents.UpdateTokenEndpointAuthority, this.logger, this.performanceClient, request.correlationId)(authCodeResponse.cloud_instance_host_name, request.correlationId);
         }
         // Nonce validation not needed when redirect not involved (e.g. hybrid spa, renewing token via rt)
         if (validateNonce) {
-            authCodeResponse.nonce = cachedNonce || undefined;
+            // TODO: Assigning "response nonce" to "request nonce" is confusing. Refactor the function doing validation to accept request nonce directly
+            authCodeResponse.nonce = request.nonce || undefined;
         }
-        authCodeResponse.state = requestState;
+        authCodeResponse.state = request.state;
         // Add CCS parameters if available
         if (authCodeResponse.client_info) {
             this.authCodeRequest.clientInfo = authCodeResponse.client_info;
         }
         else {
-            const cachedCcsCred = this.checkCcsCredentials();
-            if (cachedCcsCred) {
-                this.authCodeRequest.ccsCredential = cachedCcsCred;
+            const ccsCred = this.createCcsCredentials(request);
+            if (ccsCred) {
+                this.authCodeRequest.ccsCredential = ccsCred;
             }
         }
         // Acquire token with retrieved code.
-        const tokenResponse = (await invokeAsync(this.authModule.acquireToken.bind(this.authModule), PerformanceEvents.AuthClientAcquireToken, this.logger, this.performanceClient, this.authCodeRequest.correlationId)(this.authCodeRequest, authCodeResponse));
-        this.browserStorage.cleanRequestByState(state);
+        const tokenResponse = (await invokeAsync(this.authModule.acquireToken.bind(this.authModule), PerformanceEvents.AuthClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(this.authCodeRequest, authCodeResponse));
         return tokenResponse;
     }
     /**
-     * Updates authority based on cloudInstanceHostname
-     * @param cloudInstanceHostname
-     * @param authority
-     * @param networkModule
-     */
-    async updateTokenEndpointAuthority(cloudInstanceHostname, authority, networkModule) {
-        this.performanceClient.addQueueMeasurement(PerformanceEvents.UpdateTokenEndpointAuthority, this.authCodeRequest.correlationId);
-        const cloudInstanceAuthorityUri = `https://${cloudInstanceHostname}/${authority.tenant}/`;
-        const cloudInstanceAuthority = await AuthorityFactory.createDiscoveredInstance(cloudInstanceAuthorityUri, networkModule, this.browserStorage, authority.options, this.logger, this.performanceClient, this.authCodeRequest.correlationId);
-        this.authModule.updateAuthority(cloudInstanceAuthority);
-    }
-    /**
-     * Looks up ccs creds in the cache
+     * Build ccs creds if available
      */
-    checkCcsCredentials() {
-        // Look up ccs credential in temp cache
-        const cachedCcsCred = this.browserStorage.getTemporaryCache(TemporaryCacheKeys.CCS_CREDENTIAL, true);
-        if (cachedCcsCred) {
-            try {
-                return JSON.parse(cachedCcsCred);
-            }
-            catch (e) {
-                this.authModule.logger.error("Cache credential could not be parsed");
-                this.authModule.logger.errorPii(`Cache credential could not be parsed: ${cachedCcsCred}`);
-            }
+    createCcsCredentials(request) {
+        if (request.account) {
+            return {
+                credential: request.account.homeAccountId,
+                type: CcsCredentialType.HOME_ACCOUNT_ID,
+            };
+        }
+        else if (request.loginHint) {
+            return {
+                credential: request.loginHint,
+                type: CcsCredentialType.UPN,
+            };
         }
         return null;
     }

package/dist/interaction_handler/InteractionHandler.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"InteractionHandler.mjs","sources":["../../src/interaction_handler/InteractionHandler.ts"],"sourcesContent":[null],"names":["BrowserAuthErrorCodes.hashEmptyError"],"mappings":";;;;;;;AAKA;AAiBA;AAMA;AAEA;AAKA;AACI;AACA;AACA,MAAS,kBAAkB,CAAA;AAC3B,IAAA,WAAU,CAAA,cAAe,EAAA,WAAA,EAAA,eAAA,EAAA,MAAA,EAAA,iBAAA,EAAA;AACzB,QAAA,IAAA,CAAS,UAAC,GAAA,cAAmB,CAAA;AAGzB,QAAA,IAAA,CAAA,cAAA,GAAc,WAAyB,CAAA;AAa3C,QAAA,IAAA,CAAA,eAAA,GAAA,eAAA,CAAA;;;AAGG,KAAA;;AAuDH;;;;;;;AAOG,YAAA,MAAA,sBAAA,CAAAA,cAAA,CAAA,CAAA;SAC+B;AA4ElC;;;;;AAKG,SAAA;AACa,QAAA,IAAA,gBAAA,CAAA;AAuBhB,QAAA,IAAA;;AAEG,SAAA;AACH,QAAA,OAAU,CAAA,EAAA;AAoBb,YAAA,IAAA,CAAA,YAAA,WAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"InteractionHandler.mjs","sources":["../../src/interaction_handler/InteractionHandler.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAKA;AAaA;AAKA;AACA;AAIG;AACH;AACI;AACA,MAAS,kBAAiB,CAAA;AAC1B,IAAA,WAAU,CAAA,cAAiB,EAAA,WAAA,EAAA,eAAA,EAA+B,MAAA,EAAA,iBAAA,EAAA;AAC1D,QAAA,IAAA,CAAS,UAAS,GAAA,cAAO,CAAA;AACzB,QAAA,IAAA,CAAS,cAAC,GAAA,WAAmB,CAAA;AAGzB,QAAA,IAAA,CAAA,eAAA,kBAAuC,CAAA;AAa3C,QAAA,IAAA,CAAA,MAAA,GAAA,MAAA,CAAA;;;AAGG;AACG;AA0CN;;;;;;;AAOG,SAAA;AACG,QAAA,IAAA,gBAAA,CAAA;AAwDN,QAAA,IAAA;;AAEG,SAAA;QACM;AAiBZ,YAAA,IAAA,CAAA,YAAA,WAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/interaction_handler/RedirectHandler.d.ts

@@ -1,17 +1,20 @@
-import { AuthorizationCodeClient, CommonAuthorizationCodeRequest, ICrypto, Authority, INetworkModule, Logger, IPerformanceClient } from "@azure/msal-common";
+import { AuthorizationCodeClient, CommonAuthorizationCodeRequest, Logger, IPerformanceClient, CcsCredential } from "@azure/msal-common";
 import { BrowserCacheManager } from "../cache/BrowserCacheManager";
-import { InteractionHandler, InteractionParams } from "./InteractionHandler";
 import { INavigationClient } from "../navigation/INavigationClient";
 import { AuthenticationResult } from "../response/AuthenticationResult";
-export type RedirectParams = InteractionParams & {
+export type RedirectParams = {
     navigationClient: INavigationClient;
     redirectTimeout: number;
     redirectStartPage: string;
     onRedirectNavigate?: (url: string) => void | boolean;
 };
-export declare class RedirectHandler extends InteractionHandler {
-    private browserCrypto;
-    constructor(authCodeModule: AuthorizationCodeClient, storageImpl: BrowserCacheManager, authCodeRequest: CommonAuthorizationCodeRequest, logger: Logger, browserCrypto: ICrypto, performanceClient: IPerformanceClient);
+export declare class RedirectHandler {
+    authModule: AuthorizationCodeClient;
+    browserStorage: BrowserCacheManager;
+    authCodeRequest: CommonAuthorizationCodeRequest;
+    logger: Logger;
+    performanceClient: IPerformanceClient;
+    constructor(authCodeModule: AuthorizationCodeClient, storageImpl: BrowserCacheManager, authCodeRequest: CommonAuthorizationCodeRequest, logger: Logger, performanceClient: IPerformanceClient);
     /**
      * Redirects window to given URL.
      * @param urlNavigate
@@ -21,6 +24,10 @@ export declare class RedirectHandler extends InteractionHandler {
      * Handle authorization code response in the window.
      * @param hash
      */
-    handleCodeResponseFromHash(locationHash: string, state: string, authority: Authority, networkModule: INetworkModule): Promise<AuthenticationResult>;
+    handleCodeResponseFromHash(locationHash: string, state: string): Promise<AuthenticationResult>;
+    /**
+     * Looks up ccs creds in the cache
+     */
+    protected checkCcsCredentials(): CcsCredential | null;
 }
 //# sourceMappingURL=RedirectHandler.d.ts.map

package/dist/interaction_handler/RedirectHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RedirectHandler.d.ts","sourceRoot":"","sources":["../../src/interaction_handler/RedirectHandler.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,uBAAuB,EACvB,8BAA8B,EAC9B,OAAO,EACP,SAAS,EACT,cAAc,EACd,MAAM,EAEN,kBAAkB,EAGrB,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,MAAM,MAAM,cAAc,GAAG,iBAAiB,GAAG;IAC7C,gBAAgB,EAAE,iBAAiB,CAAC;IACpC,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC;CACxD,CAAC;AAEF,qBAAa,eAAgB,SAAQ,kBAAkB;IACnD,OAAO,CAAC,aAAa,CAAU;gBAG3B,cAAc,EAAE,uBAAuB,EACvC,WAAW,EAAE,mBAAmB,EAChC,eAAe,EAAE,8BAA8B,EAC/C,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,OAAO,EACtB,iBAAiB,EAAE,kBAAkB;IAYzC;;;OAGG;IACG,mBAAmB,CACrB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,cAAc,GACvB,OAAO,CAAC,IAAI,CAAC;IA6EhB;;;OAGG;IACG,0BAA0B,CAC5B,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,cAAc,GAC9B,OAAO,CAAC,oBAAoB,CAAC;CA+EnC"}
+{"version":3,"file":"RedirectHandler.d.ts","sourceRoot":"","sources":["../../src/interaction_handler/RedirectHandler.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,uBAAuB,EACvB,8BAA8B,EAC9B,MAAM,EAEN,kBAAkB,EAGlB,aAAa,EAGhB,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,MAAM,MAAM,cAAc,GAAG;IACzB,gBAAgB,EAAE,iBAAiB,CAAC;IACpC,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC;CACxD,CAAC;AAEF,qBAAa,eAAe;IACxB,UAAU,EAAE,uBAAuB,CAAC;IACpC,cAAc,EAAE,mBAAmB,CAAC;IACpC,eAAe,EAAE,8BAA8B,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,kBAAkB,CAAC;gBAGlC,cAAc,EAAE,uBAAuB,EACvC,WAAW,EAAE,mBAAmB,EAChC,eAAe,EAAE,8BAA8B,EAC/C,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,kBAAkB;IASzC;;;OAGG;IACG,mBAAmB,CACrB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,cAAc,GACvB,OAAO,CAAC,IAAI,CAAC;IA6EhB;;;OAGG;IACG,0BAA0B,CAC5B,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,GACd,OAAO,CAAC,oBAAoB,CAAC;IAqFhC;;OAEG;IACH,SAAS,CAAC,mBAAmB,IAAI,aAAa,GAAG,IAAI;CAoBxD"}

package/dist/interaction_handler/RedirectHandler.mjs

@@ -1,19 +1,21 @@
-/*! @azure/msal-browser v3.2.0 2023-10-05 */
+/*! @azure/msal-browser v3.4.0 2023-10-30 */
 'use strict';
-import { createClientAuthError, ClientAuthErrorCodes, ServerError } from '@azure/msal-common';
+import { createClientAuthError, ClientAuthErrorCodes, ServerError, invokeAsync, PerformanceEvents } from '@azure/msal-common';
 import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
 import { TemporaryCacheKeys, ApiId } from '../utils/BrowserConstants.mjs';
-import { InteractionHandler } from './InteractionHandler.mjs';
 import { emptyNavigateUri, hashEmptyError, userCancelled } from '../error/BrowserAuthErrorCodes.mjs';
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-class RedirectHandler extends InteractionHandler {
-    constructor(authCodeModule, storageImpl, authCodeRequest, logger, browserCrypto, performanceClient) {
-        super(authCodeModule, storageImpl, authCodeRequest, logger, performanceClient);
-        this.browserCrypto = browserCrypto;
+class RedirectHandler {
+    constructor(authCodeModule, storageImpl, authCodeRequest, logger, performanceClient) {
+        this.authModule = authCodeModule;
+        this.browserStorage = storageImpl;
+        this.authCodeRequest = authCodeRequest;
+        this.logger = logger;
+        this.performanceClient = performanceClient;
     }
     /**
      * Redirects window to given URL.
@@ -69,7 +71,7 @@ class RedirectHandler extends InteractionHandler {
      * Handle authorization code response in the window.
      * @param hash
      */
-    async handleCodeResponseFromHash(locationHash, state, authority, networkModule) {
+    async handleCodeResponseFromHash(locationHash, state) {
         this.logger.verbose("RedirectHandler.handleCodeResponse called");
         // Check that location hash isn't empty.
         if (!locationHash) {
@@ -104,7 +106,7 @@ class RedirectHandler extends InteractionHandler {
         this.authCodeRequest.code = authCodeResponse.code;
         // Check for new cloud instance
         if (authCodeResponse.cloud_instance_host_name) {
-            await this.updateTokenEndpointAuthority(authCodeResponse.cloud_instance_host_name, authority, networkModule);
+            await invokeAsync(this.authModule.updateAuthority.bind(this.authModule), PerformanceEvents.UpdateTokenEndpointAuthority, this.logger, this.performanceClient, this.authCodeRequest.correlationId)(authCodeResponse.cloud_instance_host_name, this.authCodeRequest.correlationId);
         }
         authCodeResponse.nonce = cachedNonce || undefined;
         authCodeResponse.state = requestState;
@@ -123,6 +125,23 @@ class RedirectHandler extends InteractionHandler {
         this.browserStorage.cleanRequestByState(state);
         return tokenResponse;
     }
+    /**
+     * Looks up ccs creds in the cache
+     */
+    checkCcsCredentials() {
+        // Look up ccs credential in temp cache
+        const cachedCcsCred = this.browserStorage.getTemporaryCache(TemporaryCacheKeys.CCS_CREDENTIAL, true);
+        if (cachedCcsCred) {
+            try {
+                return JSON.parse(cachedCcsCred);
+            }
+            catch (e) {
+                this.authModule.logger.error("Cache credential could not be parsed");
+                this.authModule.logger.errorPii(`Cache credential could not be parsed: ${cachedCcsCred}`);
+            }
+        }
+        return null;
+    }
 }
 
 export { RedirectHandler };

package/dist/interaction_handler/RedirectHandler.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"RedirectHandler.mjs","sources":["../../src/interaction_handler/RedirectHandler.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;AAKA;AAiBA;AACA;AACA;AAOqB,MAAA,wBAAS,kBAAA,CAAA;IAC1B,WAAkB,CAAA,cAAO,aAAa,EAAA,eAAe,EAAA,MAAA,EAAA,aAAA,EAAA,iBAAA,EAAA;QACvD,KAAA,CAAA,cAAA,EAAA,WAAA,EAAA,eAAA,EAAA,MAAA,EAAA,iBAAA,CAAA,CAAA;AAEF,QAAa,IAAA,CAAA,aAAA,GAAA;KACF;;AAoBP;;;AAGG,IAAA,MAAA,mBAAA,CAAA,UAAA,EAAA,MAAA,EAAA;AACG,QAAA,IAAA,CAAA,MAAA,CAAA,OACF,CAAA,4CAED,CAAA,CAAA;AA6EH;;;AAGG,YAAA,IAAA,MAAA,CAAA,iBAAA,EAAA;gBAC6B,IAAA,CAAA,MAAA,CAAA,wFAIb,CAAA,CAAA;AAgFtB,gBAAA,IAAA,CAAA,cAAA,CAAA,iBAAA,CAAA,kBAAA,CAAA,UAAA,EAAA,MAAA,CAAA,iBAAA,EAAA,IAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"RedirectHandler.mjs","sources":["../../src/interaction_handler/RedirectHandler.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;AAKA;AAiBA;AACA;AAEA;AAKqB,MAAA,gBAAQ;IACzB,WAAkB,CAAA,cAAO,aAAa,EAAA,eAAe,EAAA,MAAA,EAAA,iBAAA,EAAA;QACvD,IAAA,CAAA,UAAA,GAAA,cAAA,CAAA;AAEF,QAAA,IAAA,CAAA,cAA4B,GAAA,WAAA,CAAA;QACd,IAAA,CAAA,iCAA0B,CAAA;QACtB,IAAA,CAAA,MAAA;QACC,IAAA,CAAA,sCAAgC;KACzC;;AAIF;AAaJ;;;AAGG,QAAA,IAAA,CAAA,MAAA,CAAA,OAAA,CAAA,4CAAA,CAAA,CAAA;AACG;AAgFN,QAAA,IAAA,UAAA,EAAA;;;AAGG,gBAAA,IAAA,CAAA,MAAA,CAAA,OAAA,CAAA,gFAAA,CAAA,CAAA;AACG,gBAAA,IAAA,CAAA,cACF,CAAA,iBACA,CAAA,kBACD,CAAA,UAAQ,EAAA,MAAA,CAAA,iBAAqB,EAAA,IAAA,CAAA,CAAA;AAqFhC,aAAA;;AAEG,YAAA,IAAA,CAAA,cAAA,CAAA,iBAAA,CAAA,kBAAA,CAAA,cAAA,EAAA,IAAA,CAAA,eAAA,CAAA,aAAA,EAAA,IAAA,CAAA,CAAA;AACH,YAAA,IAAU,CAAA,cAAA,CAAA,gBAAuB,CAAA,IAAgB,CAAI,eAAA,CAAA,CAAA;AAoBxD,YAAA,IAAA,CAAA,MAAA,CAAA,OAAA,CAAA,CAAA,kDAAA,EAAA,UAAA,CAAA,CAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/interaction_handler/SilentHandler.d.ts

@@ -1,48 +1,14 @@
-import { CommonAuthorizationCodeRequest, AuthorizationCodeClient, Logger, IPerformanceClient } from "@azure/msal-common";
-import { InteractionHandler } from "./InteractionHandler";
-import { BrowserCacheManager } from "../cache/BrowserCacheManager";
-import { BrowserSystemOptions } from "../config/Configuration";
-export declare class SilentHandler extends InteractionHandler {
-    private navigateFrameWait;
-    private pollIntervalMilliseconds;
-    constructor(authCodeModule: AuthorizationCodeClient, storageImpl: BrowserCacheManager, authCodeRequest: CommonAuthorizationCodeRequest, logger: Logger, systemOptions: Required<Pick<BrowserSystemOptions, "navigateFrameWait" | "pollIntervalMilliseconds">>, performanceClient: IPerformanceClient);
-    /**
-     * Creates a hidden iframe to given URL using user-requested scopes as an id.
-     * @param urlNavigate
-     * @param userRequestScopes
-     */
-    initiateAuthRequest(requestUrl: string): Promise<HTMLIFrameElement>;
-    /**
-     * Monitors an iframe content window until it loads a url with a known hash, or hits a specified timeout.
-     * @param iframe
-     * @param timeout
-     */
-    monitorIframeForHash(iframe: HTMLIFrameElement, timeout: number): Promise<string>;
-    /**
-     * @hidden
-     * Loads iframe with authorization endpoint URL
-     * @ignore
-     */
-    private loadFrame;
-    /**
-     * @hidden
-     * Loads the iframe synchronously when the navigateTimeFrame is set to `0`
-     * @param urlNavigate
-     * @param frameName
-     * @param logger
-     */
-    private loadFrameSync;
-    /**
-     * @hidden
-     * Creates a new hidden iframe or gets an existing one for silent token renewal.
-     * @ignore
-     */
-    private createHiddenIframe;
-    /**
-     * @hidden
-     * Removes a hidden iframe from the page.
-     * @ignore
-     */
-    private removeHiddenIframe;
-}
+import { Logger, IPerformanceClient } from "@azure/msal-common";
+/**
+ * Creates a hidden iframe to given URL using user-requested scopes as an id.
+ * @param urlNavigate
+ * @param userRequestScopes
+ */
+export declare function initiateAuthRequest(requestUrl: string, performanceClient: IPerformanceClient, logger: Logger, correlationId: string, navigateFrameWait?: number): Promise<HTMLIFrameElement>;
+/**
+ * Monitors an iframe content window until it loads a url with a known hash, or hits a specified timeout.
+ * @param iframe
+ * @param timeout
+ */
+export declare function monitorIframeForHash(iframe: HTMLIFrameElement, timeout: number, pollIntervalMilliseconds: number, performanceClient: IPerformanceClient, logger: Logger, correlationId: string): Promise<string>;
 //# sourceMappingURL=SilentHandler.d.ts.map

package/dist/interaction_handler/SilentHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SilentHandler.d.ts","sourceRoot":"","sources":["../../src/interaction_handler/SilentHandler.ts"],"names":[],"mappings":"AAKA,OAAO,EAEH,8BAA8B,EAC9B,uBAAuB,EAEvB,MAAM,EACN,kBAAkB,EAGrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAK1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EACH,oBAAoB,EAEvB,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,aAAc,SAAQ,kBAAkB;IACjD,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,wBAAwB,CAAS;gBAGrC,cAAc,EAAE,uBAAuB,EACvC,WAAW,EAAE,mBAAmB,EAChC,eAAe,EAAE,8BAA8B,EAC/C,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,QAAQ,CACnB,IAAI,CACA,oBAAoB,EACpB,mBAAmB,GAAG,0BAA0B,CACnD,CACJ,EACD,iBAAiB,EAAE,kBAAkB;IAazC;;;;OAIG;IACG,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA0BzE;;;;OAIG;IACH,oBAAoB,CAChB,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC;IAiGlB;;;;OAIG;IACH,OAAO,CAAC,SAAS;IA2BjB;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IAQrB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAgB1B;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;CAK7B"}
+{"version":3,"file":"SilentHandler.d.ts","sourceRoot":"","sources":["../../src/interaction_handler/SilentHandler.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,MAAM,EACN,kBAAkB,EAIrB,MAAM,oBAAoB,CAAC;AAO5B;;;;GAIG;AACH,wBAAsB,mBAAmB,CACrC,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,kBAAkB,EACrC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,iBAAiB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CA2B5B;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,MAAM,EACf,wBAAwB,EAAE,MAAM,EAChC,iBAAiB,EAAE,kBAAkB,EACrC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,CA0DjB"}

package/dist/interaction_handler/SilentHandler.mjs

@@ -1,172 +1,137 @@
-/*! @azure/msal-browser v3.2.0 2023-10-05 */
+/*! @azure/msal-browser v3.4.0 2023-10-30 */
 'use strict';
-import { PerformanceEvents, invokeAsync, Constants, UrlString } from '@azure/msal-common';
-import { InteractionHandler } from './InteractionHandler.mjs';
+import { PerformanceEvents, invokeAsync, invoke } from '@azure/msal-common';
 import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
 import { DEFAULT_IFRAME_TIMEOUT_MS } from '../config/Configuration.mjs';
-import { emptyNavigateUri, monitorWindowTimeout, hashDoesNotContainKnownProperties, hashEmptyError } from '../error/BrowserAuthErrorCodes.mjs';
+import { emptyNavigateUri, monitorWindowTimeout } from '../error/BrowserAuthErrorCodes.mjs';
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-class SilentHandler extends InteractionHandler {
-    constructor(authCodeModule, storageImpl, authCodeRequest, logger, systemOptions, performanceClient) {
-        super(authCodeModule, storageImpl, authCodeRequest, logger, performanceClient);
-        this.navigateFrameWait = systemOptions.navigateFrameWait;
-        this.pollIntervalMilliseconds = systemOptions.pollIntervalMilliseconds;
-    }
-    /**
-     * Creates a hidden iframe to given URL using user-requested scopes as an id.
-     * @param urlNavigate
-     * @param userRequestScopes
-     */
-    async initiateAuthRequest(requestUrl) {
-        this.performanceClient.addQueueMeasurement(PerformanceEvents.SilentHandlerInitiateAuthRequest, this.authCodeRequest.correlationId);
-        if (!requestUrl) {
-            // Throw error if request URL is empty.
-            this.logger.info("Navigate url is empty");
-            throw createBrowserAuthError(emptyNavigateUri);
-        }
-        if (this.navigateFrameWait) {
-            return await invokeAsync(this.loadFrame.bind(this), PerformanceEvents.SilentHandlerLoadFrame, this.logger, this.performanceClient, this.authCodeRequest.correlationId)(requestUrl);
-        }
-        return this.loadFrameSync(requestUrl);
+/**
+ * Creates a hidden iframe to given URL using user-requested scopes as an id.
+ * @param urlNavigate
+ * @param userRequestScopes
+ */
+async function initiateAuthRequest(requestUrl, performanceClient, logger, correlationId, navigateFrameWait) {
+    performanceClient.addQueueMeasurement(PerformanceEvents.SilentHandlerInitiateAuthRequest, correlationId);
+    if (!requestUrl) {
+        // Throw error if request URL is empty.
+        logger.info("Navigate url is empty");
+        throw createBrowserAuthError(emptyNavigateUri);
     }
-    /**
-     * Monitors an iframe content window until it loads a url with a known hash, or hits a specified timeout.
-     * @param iframe
-     * @param timeout
-     */
-    monitorIframeForHash(iframe, timeout) {
-        this.performanceClient.addQueueMeasurement(PerformanceEvents.SilentHandlerMonitorIframeForHash, this.authCodeRequest.correlationId);
-        return new Promise((resolve, reject) => {
-            if (timeout < DEFAULT_IFRAME_TIMEOUT_MS) {
-                this.logger.warning(`system.loadFrameTimeout or system.iframeHashTimeout set to lower (${timeout}ms) than the default (${DEFAULT_IFRAME_TIMEOUT_MS}ms). This may result in timeouts.`);
-            }
-            /*
-             * Polling for iframes can be purely timing based,
-             * since we don't need to account for interaction.
-             */
-            const nowMark = window.performance.now();
-            const timeoutMark = nowMark + timeout;
-            const intervalId = setInterval(() => {
-                if (window.performance.now() > timeoutMark) {
-                    this.removeHiddenIframe(iframe);
-                    clearInterval(intervalId);
-                    reject(createBrowserAuthError(monitorWindowTimeout));
-                    return;
-                }
-                let href = Constants.EMPTY_STRING;
-                const contentWindow = iframe.contentWindow;
-                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 = contentWindow
-                        ? contentWindow.location.href
-                        : Constants.EMPTY_STRING;
-                }
-                catch (e) { }
-                if (!href || href === "about:blank") {
-                    return;
-                }
-                const contentHash = contentWindow
-                    ? contentWindow.location.hash
-                    : Constants.EMPTY_STRING;
-                if (contentHash) {
-                    if (UrlString.hashContainsKnownProperties(contentHash)) {
-                        // Success case
-                        this.removeHiddenIframe(iframe);
-                        clearInterval(intervalId);
-                        resolve(contentHash);
-                        return;
-                    }
-                    else {
-                        // Hash is present but incorrect
-                        this.logger.error("SilentHandler:monitorIFrameForHash - a hash is present in the iframe but it does not contain known properties. It's likely that the hash has been replaced by code running on the redirectUri page.");
-                        this.logger.errorPii(`SilentHandler:monitorIFrameForHash - the url detected in the iframe is: ${href}`);
-                        this.removeHiddenIframe(iframe);
-                        clearInterval(intervalId);
-                        reject(createBrowserAuthError(hashDoesNotContainKnownProperties));
-                        return;
-                    }
-                }
-                else {
-                    // No hash is present
-                    this.logger.error("SilentHandler:monitorIFrameForHash - the request has returned to the redirectUri but a hash is not present in the iframe. It's likely that the hash has been removed or the page has been redirected by code running on the redirectUri page.");
-                    this.logger.errorPii(`SilentHandler:monitorIFrameForHash - the url detected in the iframe is: ${href}`);
-                    this.removeHiddenIframe(iframe);
-                    clearInterval(intervalId);
-                    reject(createBrowserAuthError(hashEmptyError));
-                    return;
-                }
-            }, this.pollIntervalMilliseconds);
-        });
+    if (navigateFrameWait) {
+        return await invokeAsync(loadFrame, PerformanceEvents.SilentHandlerLoadFrame, logger, performanceClient, correlationId)(requestUrl, navigateFrameWait, performanceClient, correlationId);
     }
-    /**
-     * @hidden
-     * Loads iframe with authorization endpoint URL
-     * @ignore
-     */
-    loadFrame(urlNavigate) {
-        this.performanceClient.addQueueMeasurement(PerformanceEvents.SilentHandlerLoadFrame, this.authCodeRequest.correlationId);
+    return invoke(loadFrameSync, PerformanceEvents.SilentHandlerLoadFrameSync, logger, performanceClient, correlationId)(requestUrl);
+}
+/**
+ * Monitors an iframe content window until it loads a url with a known hash, or hits a specified timeout.
+ * @param iframe
+ * @param timeout
+ */
+async function monitorIframeForHash(iframe, timeout, pollIntervalMilliseconds, performanceClient, logger, correlationId) {
+    performanceClient.addQueueMeasurement(PerformanceEvents.SilentHandlerMonitorIframeForHash, correlationId);
+    return new Promise((resolve, reject) => {
+        if (timeout < DEFAULT_IFRAME_TIMEOUT_MS) {
+            logger.warning(`system.loadFrameTimeout or system.iframeHashTimeout set to lower (${timeout}ms) than the default (${DEFAULT_IFRAME_TIMEOUT_MS}ms). This may result in timeouts.`);
+        }
         /*
-         * This trick overcomes iframe navigation in IE
-         * IE does not load the page consistently in iframe
+         * Polling for iframes can be purely timing based,
+         * since we don't need to account for interaction.
          */
-        return new Promise((resolve, reject) => {
-            const frameHandle = this.createHiddenIframe();
-            setTimeout(() => {
-                if (!frameHandle) {
-                    reject("Unable to load iframe");
-                    return;
-                }
-                frameHandle.src = urlNavigate;
-                resolve(frameHandle);
-            }, this.navigateFrameWait);
-        });
-    }
-    /**
-     * @hidden
-     * Loads the iframe synchronously when the navigateTimeFrame is set to `0`
-     * @param urlNavigate
-     * @param frameName
-     * @param logger
-     */
-    loadFrameSync(urlNavigate) {
-        const frameHandle = this.createHiddenIframe();
-        frameHandle.src = urlNavigate;
-        return frameHandle;
-    }
-    /**
-     * @hidden
-     * Creates a new hidden iframe or gets an existing one for silent token renewal.
-     * @ignore
-     */
-    createHiddenIframe() {
-        const authFrame = document.createElement("iframe");
-        authFrame.style.visibility = "hidden";
-        authFrame.style.position = "absolute";
-        authFrame.style.width = authFrame.style.height = "0";
-        authFrame.style.border = "0";
-        authFrame.setAttribute("sandbox", "allow-scripts allow-same-origin allow-forms");
-        document.getElementsByTagName("body")[0].appendChild(authFrame);
-        return authFrame;
-    }
-    /**
-     * @hidden
-     * Removes a hidden iframe from the page.
-     * @ignore
+        const timeoutId = window.setTimeout(() => {
+            window.clearInterval(intervalId);
+            reject(createBrowserAuthError(monitorWindowTimeout));
+        }, timeout);
+        const intervalId = window.setInterval(() => {
+            let href = "";
+            const contentWindow = iframe.contentWindow;
+            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 = contentWindow ? contentWindow.location.href : "";
+            }
+            catch (e) { }
+            if (!href || href === "about:blank") {
+                return;
+            }
+            const contentHash = contentWindow
+                ? contentWindow.location.hash
+                : "";
+            window.clearTimeout(timeoutId);
+            window.clearInterval(intervalId);
+            resolve(contentHash);
+        }, pollIntervalMilliseconds);
+    }).finally(() => {
+        invoke(removeHiddenIframe, PerformanceEvents.RemoveHiddenIframe, logger, performanceClient, correlationId)(iframe);
+    });
+}
+/**
+ * @hidden
+ * Loads iframe with authorization endpoint URL
+ * @ignore
+ * @deprecated
+ */
+function loadFrame(urlNavigate, navigateFrameWait, performanceClient, correlationId) {
+    performanceClient.addQueueMeasurement(PerformanceEvents.SilentHandlerLoadFrame, correlationId);
+    /*
+     * This trick overcomes iframe navigation in IE
+     * IE does not load the page consistently in iframe
      */
-    removeHiddenIframe(iframe) {
-        if (document.body === iframe.parentNode) {
-            document.body.removeChild(iframe);
-        }
+    return new Promise((resolve, reject) => {
+        const frameHandle = createHiddenIframe();
+        window.setTimeout(() => {
+            if (!frameHandle) {
+                reject("Unable to load iframe");
+                return;
+            }
+            frameHandle.src = urlNavigate;
+            resolve(frameHandle);
+        }, navigateFrameWait);
+    });
+}
+/**
+ * @hidden
+ * Loads the iframe synchronously when the navigateTimeFrame is set to `0`
+ * @param urlNavigate
+ * @param frameName
+ * @param logger
+ */
+function loadFrameSync(urlNavigate) {
+    const frameHandle = createHiddenIframe();
+    frameHandle.src = urlNavigate;
+    return frameHandle;
+}
+/**
+ * @hidden
+ * Creates a new hidden iframe or gets an existing one for silent token renewal.
+ * @ignore
+ */
+function createHiddenIframe() {
+    const authFrame = document.createElement("iframe");
+    authFrame.style.visibility = "hidden";
+    authFrame.style.position = "absolute";
+    authFrame.style.width = authFrame.style.height = "0";
+    authFrame.style.border = "0";
+    authFrame.setAttribute("sandbox", "allow-scripts allow-same-origin allow-forms");
+    document.getElementsByTagName("body")[0].appendChild(authFrame);
+    return authFrame;
+}
+/**
+ * @hidden
+ * Removes a hidden iframe from the page.
+ * @ignore
+ */
+function removeHiddenIframe(iframe) {
+    if (document.body === iframe.parentNode) {
+        document.body.removeChild(iframe);
     }
 }
 
-export { SilentHandler };
+export { initiateAuthRequest, monitorIframeForHash };
 //# sourceMappingURL=SilentHandler.mjs.map