@azure/msal-browser 3.2.0 → 3.4.0

package/src/index.ts

@@ -8,12 +8,11 @@
  * @module @azure/msal-browser
  */
 
-/**
- * Warning: This set of exports is purely intended to be used by other MSAL libraries, and should be considered potentially unstable. We strongly discourage using them directly, you do so at your own risk.
- * Breaking changes to these APIs will be shipped under a minor version, instead of a major version.
- */
+import * as BrowserUtils from "./utils/BrowserUtils";
+export { BrowserUtils };
 
 export { PublicClientApplication } from "./app/PublicClientApplication";
+export { PublicClientNext } from "./app/PublicClientNext";
 export { IController } from "./controllers/IController";
 export {
     Configuration,
@@ -32,12 +31,6 @@ export {
     ApiId,
     CacheLookupPolicy,
 } from "./utils/BrowserConstants";
-export { BrowserUtils } from "./utils/BrowserUtils";
-
-/*
- * export { IController} from "./controllers/IController";
- * export { StandardController } from "./controllers/StandardController";
- */
 
 // Browser Errors
 export {

package/src/interaction_client/BaseInteractionClient.ts

@@ -32,7 +32,7 @@ import { PopupRequest } from "../request/PopupRequest";
 import { SsoSilentRequest } from "../request/SsoSilentRequest";
 import { version } from "../packageMetadata";
 import { BrowserConstants } from "../utils/BrowserConstants";
-import { BrowserUtils } from "../utils/BrowserUtils";
+import * as BrowserUtils from "../utils/BrowserUtils";
 import { INavigationClient } from "../navigation/INavigationClient";
 import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandler";
 import { AuthenticationResult } from "../response/AuthenticationResult";

package/src/interaction_client/NativeInteractionClient.ts

@@ -33,6 +33,7 @@ import {
     invokeAsync,
     createAuthError,
     AuthErrorCodes,
+    CacheHelpers,
 } from "@azure/msal-common";
 import { BaseInteractionClient } from "./BaseInteractionClient";
 import { BrowserConfiguration } from "../config/Configuration";
@@ -238,9 +239,10 @@ export class NativeInteractionClient extends BaseInteractionClient {
             throw createClientAuthError(ClientAuthErrorCodes.noAccountFound);
         }
         // fetch the account from browser cache
-        const account = this.browserStorage.getAccountInfoFilteredBy({
+        const account = this.browserStorage.getBaseAccountInfo({
             nativeAccountId,
         });
+
         if (!account) {
             throw createClientAuthError(ClientAuthErrorCodes.noAccountFound);
         }
@@ -254,9 +256,15 @@ export class NativeInteractionClient extends BaseInteractionClient {
             const result = await this.silentCacheClient.acquireToken(
                 silentRequest
             );
+
+            const fullAccount = {
+                ...account,
+                idTokenClaims: result?.idTokenClaims as TokenClaims,
+            };
+
             return {
                 ...result,
-                account,
+                account: fullAccount,
             };
         } catch (e) {
             throw e;
@@ -572,6 +580,15 @@ export class NativeInteractionClient extends BaseInteractionClient {
             idTokenClaims.tid ||
             Constants.EMPTY_STRING;
 
+        const fullAccountEntity: AccountEntity = idTokenClaims
+            ? Object.assign(new AccountEntity(), {
+                  ...accountEntity,
+                  idTokenClaims: idTokenClaims,
+              })
+            : accountEntity;
+
+        const accountInfo = fullAccountEntity.getAccountInfo();
+
         // generate PoP token as needed
         const responseAccessToken = await this.generatePopAccessToken(
             response,
@@ -587,7 +604,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
             uniqueId: uid,
             tenantId: tid,
             scopes: responseScopes.asArray(),
-            account: accountEntity.getAccountInfo(),
+            account: accountInfo,
             idToken: response.id_token,
             idTokenClaims: idTokenClaims,
             accessToken: responseAccessToken,
@@ -640,7 +657,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
         reqTimestamp: number
     ): void {
         const cachedIdToken: IdTokenEntity | null =
-            IdTokenEntity.createIdTokenEntity(
+            CacheHelpers.createIdTokenEntity(
                 homeAccountIdentifier,
                 request.authority,
                 response.id_token || "",
@@ -659,7 +676,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
         const responseScopes = this.generateScopes(response, request);
 
         const cachedAccessToken: AccessTokenEntity | null =
-            AccessTokenEntity.createAccessTokenEntity(
+            CacheHelpers.createAccessTokenEntity(
                 homeAccountIdentifier,
                 request.authority,
                 responseAccessToken,
@@ -668,7 +685,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
                 responseScopes.printScopes(),
                 tokenExpirationSeconds,
                 0,
-                this.browserCrypto
+                base64Decode
             );
 
         const nativeCacheRecord = new CacheRecord(

package/src/interaction_client/PopupClient.ts

@@ -20,6 +20,7 @@ import {
     ICrypto,
     ProtocolMode,
     ServerResponseType,
+    invokeAsync,
 } from "@azure/msal-common";
 import { StandardInteractionClient } from "./StandardInteractionClient";
 import { EventType } from "../event/EventType";
@@ -30,7 +31,7 @@ import {
 } from "../utils/BrowserConstants";
 import { EndSessionPopupRequest } from "../request/EndSessionPopupRequest";
 import { NavigationOptions } from "../navigation/NavigationOptions";
-import { BrowserUtils } from "../utils/BrowserUtils";
+import * as BrowserUtils from "../utils/BrowserUtils";
 import { PopupRequest } from "../request/PopupRequest";
 import { NativeInteractionClient } from "./NativeInteractionClient";
 import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandler";
@@ -42,15 +43,12 @@ import { INavigationClient } from "../navigation/INavigationClient";
 import { EventHandler } from "../event/EventHandler";
 import { BrowserCacheManager } from "../cache/BrowserCacheManager";
 import { BrowserConfiguration } from "../config/Configuration";
-import {
-    InteractionHandler,
-    InteractionParams,
-} from "../interaction_handler/InteractionHandler";
+import { InteractionHandler } from "../interaction_handler/InteractionHandler";
 import { PopupWindowAttributes } from "../request/PopupWindowAttributes";
 import { EventError } from "../event/EventMessage";
 import { AuthenticationResult } from "../response/AuthenticationResult";
 
-export type PopupParams = InteractionParams & {
+export type PopupParams = {
     popup?: Window | null;
     popupName: string;
     popupWindowAttributes: PopupWindowAttributes;
@@ -203,43 +201,39 @@ export class PopupClient extends StandardInteractionClient {
             ApiId.acquireTokenPopup
         );
 
-        this.performanceClient.setPreQueueTime(
+        const validRequest = await invokeAsync(
+            this.initializeAuthorizationRequest.bind(this),
             PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest,
-            request.correlationId
-        );
-        const validRequest = await this.initializeAuthorizationRequest(
-            request,
-            InteractionType.Popup
-        );
-        this.browserStorage.updateCacheEntries(
-            validRequest.state,
-            validRequest.nonce,
-            validRequest.authority,
-            validRequest.loginHint || Constants.EMPTY_STRING,
-            validRequest.account || null
-        );
+            this.logger,
+            this.performanceClient,
+            this.correlationId
+        )(request, InteractionType.Popup);
+
+        BrowserUtils.preconnect(validRequest.authority);
 
         try {
             // Create auth code request and generate PKCE params
-            this.performanceClient.setPreQueueTime(
-                PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest,
-                request.correlationId
-            );
             const authCodeRequest: CommonAuthorizationCodeRequest =
-                await this.initializeAuthorizationCodeRequest(validRequest);
+                await invokeAsync(
+                    this.initializeAuthorizationCodeRequest.bind(this),
+                    PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest,
+                    this.logger,
+                    this.performanceClient,
+                    this.correlationId
+                )(validRequest);
 
             // Initialize the client
-            this.performanceClient.setPreQueueTime(
+            const authClient: AuthorizationCodeClient = await invokeAsync(
+                this.createAuthCodeClient.bind(this),
                 PerformanceEvents.StandardInteractionClientCreateAuthCodeClient,
-                request.correlationId
+                this.logger,
+                this.performanceClient,
+                this.correlationId
+            )(
+                serverTelemetryManager,
+                validRequest.authority,
+                validRequest.azureCloudOptions
             );
-            const authClient: AuthorizationCodeClient =
-                await this.createAuthCodeClient(
-                    serverTelemetryManager,
-                    validRequest.authority,
-                    validRequest.azureCloudOptions
-                );
-            this.logger.verbose("Auth code client created");
 
             const isNativeBroker = NativeMessageHandler.isNativeAvailable(
                 this.config,
@@ -294,11 +288,6 @@ export class PopupClient extends StandardInteractionClient {
             // Deserialize hash fragment response parameters.
             const serverParams: ServerAuthorizationCodeResponse =
                 UrlString.getDeserializedHash(hash);
-            const state = this.validateAndExtractStateFromHash(
-                serverParams,
-                InteractionType.Popup,
-                validRequest.correlationId
-            );
             // Remove throttle if it exists
             ThrottlingUtils.removeThrottle(
                 this.browserStorage,
@@ -339,25 +328,19 @@ export class PopupClient extends StandardInteractionClient {
                 );
                 const { userRequestState } = ProtocolUtils.parseRequestState(
                     this.browserCrypto,
-                    state
+                    validRequest.state
                 );
-                return nativeInteractionClient
-                    .acquireToken({
-                        ...validRequest,
-                        state: userRequestState,
-                        prompt: undefined, // Server should handle the prompt, ideally native broker can do this part silently
-                    })
-                    .finally(() => {
-                        this.browserStorage.cleanRequestByState(state);
-                    });
+                return 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.handleCodeResponseFromHash(
                 hash,
-                state,
-                authClient.authority,
-                this.networkClient
+                validRequest
             );
 
             return result;
@@ -371,7 +354,6 @@ export class PopupClient extends StandardInteractionClient {
                 (e as AuthError).setCorrelationId(this.correlationId);
                 serverTelemetryManager.cacheFailedRequest(e);
             }
-            this.browserStorage.cleanRequestByState(validRequest.state);
             throw e;
         }
     }
@@ -409,15 +391,13 @@ export class PopupClient extends StandardInteractionClient {
             await this.clearCacheOnLogout(validRequest.account);
 
             // Initialize the client
-            this.performanceClient.setPreQueueTime(
+            const authClient = await invokeAsync(
+                this.createAuthCodeClient.bind(this),
                 PerformanceEvents.StandardInteractionClientCreateAuthCodeClient,
-                validRequest.correlationId
-            );
-            const authClient = await this.createAuthCodeClient(
-                serverTelemetryManager,
-                requestAuthority
-            );
-            this.logger.verbose("Auth code client created");
+                this.logger,
+                this.performanceClient,
+                this.correlationId
+            )(serverTelemetryManager, requestAuthority);
 
             try {
                 authClient.authority.endSessionEndpoint;

package/src/interaction_client/RedirectClient.ts

@@ -18,6 +18,7 @@ import {
     IPerformanceClient,
     PerformanceEvents,
     ProtocolMode,
+    invokeAsync,
 } from "@azure/msal-common";
 import { StandardInteractionClient } from "./StandardInteractionClient";
 import {
@@ -26,7 +27,7 @@ import {
     TemporaryCacheKeys,
 } from "../utils/BrowserConstants";
 import { RedirectHandler } from "../interaction_handler/RedirectHandler";
-import { BrowserUtils } from "../utils/BrowserUtils";
+import * as BrowserUtils from "../utils/BrowserUtils";
 import { EndSessionRequest } from "../request/EndSessionRequest";
 import { EventType } from "../event/EventType";
 import { NavigationOptions } from "../navigation/NavigationOptions";
@@ -78,19 +79,19 @@ export class RedirectClient extends StandardInteractionClient {
      * @param request
      */
     async acquireToken(request: RedirectRequest): Promise<void> {
-        this.performanceClient.setPreQueueTime(
+        const validRequest = await invokeAsync(
+            this.initializeAuthorizationRequest.bind(this),
             PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest,
-            request.correlationId
-        );
-        const validRequest = await this.initializeAuthorizationRequest(
-            request,
-            InteractionType.Redirect
-        );
+            this.logger,
+            this.performanceClient,
+            this.correlationId
+        )(request, InteractionType.Redirect);
+
         this.browserStorage.updateCacheEntries(
             validRequest.state,
             validRequest.nonce,
             validRequest.authority,
-            validRequest.loginHint || Constants.EMPTY_STRING,
+            validRequest.loginHint || "",
             validRequest.account || null
         );
         const serverTelemetryManager = this.initializeServerTelemetryManager(
@@ -113,25 +114,27 @@ export class RedirectClient extends StandardInteractionClient {
 
         try {
             // Create auth code request and generate PKCE params
-            this.performanceClient.setPreQueueTime(
-                PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest,
-                request.correlationId
-            );
             const authCodeRequest: CommonAuthorizationCodeRequest =
-                await this.initializeAuthorizationCodeRequest(validRequest);
+                await invokeAsync(
+                    this.initializeAuthorizationCodeRequest.bind(this),
+                    PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest,
+                    this.logger,
+                    this.performanceClient,
+                    this.correlationId
+                )(validRequest);
 
             // Initialize the client
-            this.performanceClient.setPreQueueTime(
+            const authClient: AuthorizationCodeClient = await invokeAsync(
+                this.createAuthCodeClient.bind(this),
                 PerformanceEvents.StandardInteractionClientCreateAuthCodeClient,
-                request.correlationId
+                this.logger,
+                this.performanceClient,
+                this.correlationId
+            )(
+                serverTelemetryManager,
+                validRequest.authority,
+                validRequest.azureCloudOptions
             );
-            const authClient: AuthorizationCodeClient =
-                await this.createAuthCodeClient(
-                    serverTelemetryManager,
-                    validRequest.authority,
-                    validRequest.azureCloudOptions
-                );
-            this.logger.verbose("Auth code client created");
 
             // Create redirect interaction handler.
             const interactionHandler = new RedirectHandler(
@@ -139,7 +142,6 @@ export class RedirectClient extends StandardInteractionClient {
                 this.browserStorage,
                 authCodeRequest,
                 this.logger,
-                this.browserCrypto,
                 this.performanceClient
             );
 
@@ -444,15 +446,15 @@ export class RedirectClient extends StandardInteractionClient {
                 BrowserAuthErrorCodes.noCachedAuthorityError
             );
         }
-        this.performanceClient.setPreQueueTime(
+
+        const authClient = await invokeAsync(
+            this.createAuthCodeClient.bind(this),
             PerformanceEvents.StandardInteractionClientCreateAuthCodeClient,
-            cachedRequest.correlationId
-        );
-        const authClient = await this.createAuthCodeClient(
-            serverTelemetryManager,
-            currentAuthority
-        );
-        this.logger.verbose("Auth code client created");
+            this.logger,
+            this.performanceClient,
+            this.correlationId
+        )(serverTelemetryManager, currentAuthority);
+
         ThrottlingUtils.removeThrottle(
             this.browserStorage,
             this.config.auth.clientId,
@@ -463,15 +465,9 @@ export class RedirectClient extends StandardInteractionClient {
             this.browserStorage,
             cachedRequest,
             this.logger,
-            this.browserCrypto,
             this.performanceClient
         );
-        return await interactionHandler.handleCodeResponseFromHash(
-            hash,
-            state,
-            authClient.authority,
-            this.networkClient
-        );
+        return await interactionHandler.handleCodeResponseFromHash(hash, state);
     }
 
     /**
@@ -501,15 +497,14 @@ export class RedirectClient extends StandardInteractionClient {
                 timeout: this.config.system.redirectNavigationTimeout,
                 noHistory: false,
             };
-            this.performanceClient.setPreQueueTime(
+
+            const authClient = await invokeAsync(
+                this.createAuthCodeClient.bind(this),
                 PerformanceEvents.StandardInteractionClientCreateAuthCodeClient,
-                validLogoutRequest.correlationId
-            );
-            const authClient = await this.createAuthCodeClient(
-                serverTelemetryManager,
-                logoutRequest && logoutRequest.authority
-            );
-            this.logger.verbose("Auth code client created");
+                this.logger,
+                this.performanceClient,
+                this.correlationId
+            )(serverTelemetryManager, logoutRequest && logoutRequest.authority);
 
             if (authClient.authority.protocolMode === ProtocolMode.OIDC) {
                 try {

package/src/interaction_client/SilentAuthCodeClient.ts

@@ -8,7 +8,6 @@ import {
     Logger,
     CommonAuthorizationCodeRequest,
     AuthError,
-    Constants,
     IPerformanceClient,
     PerformanceEvents,
     invokeAsync,
@@ -24,11 +23,11 @@ import {
     BrowserAuthErrorCodes,
 } from "../error/BrowserAuthError";
 import { InteractionType, ApiId } from "../utils/BrowserConstants";
-import { SilentHandler } from "../interaction_handler/SilentHandler";
 import { AuthorizationCodeRequest } from "../request/AuthorizationCodeRequest";
 import { HybridSpaAuthorizationCodeClient } from "./HybridSpaAuthorizationCodeClient";
 import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandler";
 import { AuthenticationResult } from "../response/AuthenticationResult";
+import { InteractionHandler } from "../interaction_handler/InteractionHandler";
 
 export class SilentAuthCodeClient extends StandardInteractionClient {
     private apiId: ApiId;
@@ -81,13 +80,6 @@ export class SilentAuthCodeClient extends StandardInteractionClient {
             this.performanceClient,
             request.correlationId
         )(request, InteractionType.Silent);
-        this.browserStorage.updateCacheEntries(
-            silentRequest.state,
-            silentRequest.nonce,
-            silentRequest.authority,
-            silentRequest.loginHint || Constants.EMPTY_STRING,
-            silentRequest.account || null
-        );
 
         const serverTelemetryManager = this.initializeServerTelemetryManager(
             this.apiId
@@ -113,18 +105,19 @@ export class SilentAuthCodeClient extends StandardInteractionClient {
             this.logger.verbose("Auth code client created");
 
             // Create silent handler
-            const silentHandler = new SilentHandler(
+            const interactionHandler = new InteractionHandler(
                 authClient,
                 this.browserStorage,
                 authCodeRequest,
                 this.logger,
-                this.config.system,
                 this.performanceClient
             );
 
             // Handle auth code parameters from request
             return invokeAsync(
-                silentHandler.handleCodeResponseFromServer.bind(silentHandler),
+                interactionHandler.handleCodeResponseFromServer.bind(
+                    interactionHandler
+                ),
                 PerformanceEvents.HandleCodeResponseFromServer,
                 this.logger,
                 this.performanceClient,
@@ -136,9 +129,7 @@ export class SilentAuthCodeClient extends StandardInteractionClient {
                     cloud_graph_host_name: request.cloudGraphHostName,
                     cloud_instance_host_name: request.cloudInstanceHostName,
                 },
-                silentRequest.state,
-                authClient.authority,
-                this.networkClient,
+                silentRequest,
                 false
             );
         } catch (e) {
@@ -146,7 +137,6 @@ export class SilentAuthCodeClient extends StandardInteractionClient {
                 (e as AuthError).setCorrelationId(this.correlationId);
                 serverTelemetryManager.cacheFailedRequest(e);
             }
-            this.browserStorage.cleanRequestByState(silentRequest.state);
             throw e;
         }
     }

package/src/interaction_client/SilentCacheClient.ts

@@ -30,6 +30,10 @@ export class SilentCacheClient extends StandardInteractionClient {
     async acquireToken(
         silentRequest: CommonSilentFlowRequest
     ): Promise<AuthenticationResult> {
+        this.performanceClient.addQueueMeasurement(
+            PerformanceEvents.SilentCacheClientAcquireToken,
+            silentRequest.correlationId
+        );
         // Telemetry manager only used to increment cacheHits here
         const serverTelemetryManager = this.initializeServerTelemetryManager(
             ApiId.acquireTokenSilent_silentFlow
@@ -43,9 +47,13 @@ export class SilentCacheClient extends StandardInteractionClient {
         this.logger.verbose("Silent auth client created");
 
         try {
-            const response = await silentAuthClient.acquireCachedToken(
-                silentRequest
-            );
+            const response = await invokeAsync(
+                silentAuthClient.acquireCachedToken.bind(silentAuthClient),
+                PerformanceEvents.SilentFlowClientAcquireCachedToken,
+                this.logger,
+                this.performanceClient,
+                silentRequest.correlationId
+            )(silentRequest);
             const authResponse = response[0] as AuthenticationResult;
 
             this.performanceClient.addFields(