@azure/msal-browser 4.11.1 → 4.13.0

package/dist/interaction_client/{NativeInteractionClient.d.ts → PlatformAuthInteractionClient.d.ts}

@@ -6,25 +6,25 @@ import { EventHandler } from "../event/EventHandler.js";
 import { PopupRequest } from "../request/PopupRequest.js";
 import { SilentRequest } from "../request/SilentRequest.js";
 import { SsoSilentRequest } from "../request/SsoSilentRequest.js";
-import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandler.js";
 import { ApiId, CacheLookupPolicy } from "../utils/BrowserConstants.js";
-import { NativeTokenRequest } from "../broker/nativeBroker/NativeRequest.js";
-import { MATS, NativeResponse } from "../broker/nativeBroker/NativeResponse.js";
+import { PlatformAuthRequest } from "../broker/nativeBroker/PlatformAuthRequest.js";
+import { MATS, PlatformAuthResponse } from "../broker/nativeBroker/PlatformAuthResponse.js";
 import { RedirectRequest } from "../request/RedirectRequest.js";
 import { INavigationClient } from "../navigation/INavigationClient.js";
 import { SilentCacheClient } from "./SilentCacheClient.js";
 import { AuthenticationResult } from "../response/AuthenticationResult.js";
-export declare class NativeInteractionClient extends BaseInteractionClient {
+import { IPlatformAuthHandler } from "../broker/nativeBroker/IPlatformAuthHandler.js";
+export declare class PlatformAuthInteractionClient extends BaseInteractionClient {
     protected apiId: ApiId;
     protected accountId: string;
-    protected nativeMessageHandler: NativeMessageHandler;
+    protected platformAuthProvider: IPlatformAuthHandler;
     protected silentCacheClient: SilentCacheClient;
     protected nativeStorageManager: BrowserCacheManager;
     protected skus: string;
-    constructor(config: BrowserConfiguration, browserStorage: BrowserCacheManager, browserCrypto: ICrypto, logger: Logger, eventHandler: EventHandler, navigationClient: INavigationClient, apiId: ApiId, performanceClient: IPerformanceClient, provider: NativeMessageHandler, accountId: string, nativeStorageImpl: BrowserCacheManager, correlationId?: string);
+    constructor(config: BrowserConfiguration, browserStorage: BrowserCacheManager, browserCrypto: ICrypto, logger: Logger, eventHandler: EventHandler, navigationClient: INavigationClient, apiId: ApiId, performanceClient: IPerformanceClient, provider: IPlatformAuthHandler, accountId: string, nativeStorageImpl: BrowserCacheManager, correlationId?: string);
     /**
      * Adds SKUs to request extra query parameters
-     * @param request {NativeTokenRequest}
+     * @param request {PlatformAuthRequest}
      * @private
      */
     private addRequestSKUs;
@@ -46,7 +46,7 @@ export declare class NativeInteractionClient extends BaseInteractionClient {
      * @param request
      * @returns authenticationResult
      */
-    protected acquireTokensFromCache(nativeAccountId: string, request: NativeTokenRequest): Promise<AuthenticationResult>;
+    protected acquireTokensFromCache(nativeAccountId: string, request: PlatformAuthRequest): Promise<AuthenticationResult>;
     /**
      * Acquires a token from native platform then redirects to the redirectUri instead of returning the response
      * @param {RedirectRequest} request
@@ -70,27 +70,27 @@ export declare class NativeInteractionClient extends BaseInteractionClient {
      * @param request
      * @param reqTimestamp
      */
-    protected handleNativeResponse(response: NativeResponse, request: NativeTokenRequest, reqTimestamp: number): Promise<AuthenticationResult>;
+    protected handleNativeResponse(response: PlatformAuthResponse, request: PlatformAuthRequest, reqTimestamp: number): Promise<AuthenticationResult>;
     /**
      * creates an homeAccountIdentifier for the account
      * @param response
      * @param idTokenObj
      * @returns
      */
-    protected createHomeAccountIdentifier(response: NativeResponse, idTokenClaims: TokenClaims): string;
+    protected createHomeAccountIdentifier(response: PlatformAuthResponse, idTokenClaims: TokenClaims): string;
     /**
      * Helper to generate scopes
      * @param response
      * @param request
      * @returns
      */
-    generateScopes(response: NativeResponse, request: NativeTokenRequest): ScopeSet;
+    generateScopes(requestScopes: string, responseScopes?: string): ScopeSet;
     /**
      * If PoP token is requesred, records the PoP token if returned from the WAM, else generates one in the browser
      * @param request
      * @param response
      */
-    generatePopAccessToken(response: NativeResponse, request: NativeTokenRequest): Promise<string>;
+    generatePopAccessToken(response: PlatformAuthResponse, request: PlatformAuthRequest): Promise<string>;
     /**
      * Generates authentication result
      * @param response
@@ -101,7 +101,7 @@ export declare class NativeInteractionClient extends BaseInteractionClient {
      * @param reqTimestamp
      * @returns
      */
-    protected generateAuthenticationResult(response: NativeResponse, request: NativeTokenRequest, idTokenClaims: TokenClaims, accountEntity: AccountEntity, authority: string, reqTimestamp: number): Promise<AuthenticationResult>;
+    protected generateAuthenticationResult(response: PlatformAuthResponse, request: PlatformAuthRequest, idTokenClaims: TokenClaims, accountEntity: AccountEntity, authority: string, reqTimestamp: number): Promise<AuthenticationResult>;
     /**
      * cache the account entity in browser storage
      * @param accountEntity
@@ -117,13 +117,9 @@ export declare class NativeInteractionClient extends BaseInteractionClient {
      * @param tenantId
      * @param reqTimestamp
      */
-    cacheNativeTokens(response: NativeResponse, request: NativeTokenRequest, homeAccountIdentifier: string, idTokenClaims: TokenClaims, responseAccessToken: string, tenantId: string, reqTimestamp: number): Promise<void>;
-    protected addTelemetryFromNativeResponse(response: NativeResponse): MATS | null;
-    /**
-     * Validates native platform response before processing
-     * @param response
-     */
-    private validateNativeResponse;
+    cacheNativeTokens(response: PlatformAuthResponse, request: PlatformAuthRequest, homeAccountIdentifier: string, idTokenClaims: TokenClaims, responseAccessToken: string, tenantId: string, reqTimestamp: number): Promise<void>;
+    getExpiresInValue(tokenType: string, expiresIn: string | number | undefined): number;
+    protected addTelemetryFromNativeResponse(matsResponse?: string): MATS | null;
     /**
      * Gets MATS telemetry from native response
      * @param response
@@ -140,12 +136,14 @@ export declare class NativeInteractionClient extends BaseInteractionClient {
      * Translates developer provided request object into NativeRequest object
      * @param request
      */
-    protected initializeNativeRequest(request: PopupRequest | SsoSilentRequest): Promise<NativeTokenRequest>;
+    protected initializeNativeRequest(request: PopupRequest | SsoSilentRequest): Promise<PlatformAuthRequest>;
+    private getCanonicalAuthority;
+    private getPrompt;
     /**
      * Handles extra broker request parameters
-     * @param request {NativeTokenRequest}
+     * @param request {PlatformAuthRequest}
      * @private
      */
     private handleExtraBrokerParams;
 }
-//# sourceMappingURL=NativeInteractionClient.d.ts.map
+//# sourceMappingURL=PlatformAuthInteractionClient.d.ts.map

package/dist/interaction_client/PlatformAuthInteractionClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PlatformAuthInteractionClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/PlatformAuthInteractionClient.ts"],"names":[],"mappings":"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"}

package/dist/interaction_client/{NativeInteractionClient.mjs → PlatformAuthInteractionClient.mjs}

@@ -1,44 +1,39 @@
-/*! @azure/msal-browser v4.11.1 2025-04-29 */
+/*! @azure/msal-browser v4.13.0 2025-05-30 */
 'use strict';
-import { ServerTelemetryManager, AADServerParamKeys, PerformanceEvents, TimeUtils, ScopeSet, createClientAuthError, ClientAuthErrorCodes, AuthToken, buildAccountToCache, AccountEntity, Constants, AuthorityType, AuthenticationScheme, PopTokenGenerator, updateAccountTenantProfileData, CacheHelpers, createAuthError, AuthErrorCodes, UrlString, OIDC_DEFAULT_SCOPES, invokeAsync, PromptValue } from '@azure/msal-common/browser';
+import { ServerTelemetryManager, AADServerParamKeys, PerformanceEvents, TimeUtils, ScopeSet, createClientAuthError, ClientAuthErrorCodes, AuthToken, buildAccountToCache, AccountEntity, Constants, AuthorityType, AuthenticationScheme, PopTokenGenerator, updateAccountTenantProfileData, CacheHelpers, OIDC_DEFAULT_SCOPES, invokeAsync, UrlString, PromptValue } from '@azure/msal-common/browser';
 import { BaseInteractionClient } from './BaseInteractionClient.mjs';
-import { NativeConstants, BrowserConstants, CacheLookupPolicy, NativeExtensionMethod, TemporaryCacheKeys, ApiId } from '../utils/BrowserConstants.mjs';
+import { BrowserConstants, CacheLookupPolicy, TemporaryCacheKeys, PlatformAuthConstants, ApiId } from '../utils/BrowserConstants.mjs';
 import { NativeAuthError, isFatalNativeAuthError, createNativeAuthError } from '../error/NativeAuthError.mjs';
 import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
 import { SilentCacheClient } from './SilentCacheClient.mjs';
 import { base64Decode } from '../encode/Base64Decode.mjs';
 import { version } from '../packageMetadata.mjs';
-import { invalidPopTokenRequest, nativePromptNotSupported } from '../error/BrowserAuthErrorCodes.mjs';
 import { userSwitch } from '../error/NativeAuthErrorCodes.mjs';
+import { invalidPopTokenRequest, nativePromptNotSupported } from '../error/BrowserAuthErrorCodes.mjs';
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-class NativeInteractionClient extends BaseInteractionClient {
+class PlatformAuthInteractionClient extends BaseInteractionClient {
     constructor(config, browserStorage, browserCrypto, logger, eventHandler, navigationClient, apiId, performanceClient, provider, accountId, nativeStorageImpl, correlationId) {
         super(config, browserStorage, browserCrypto, logger, eventHandler, navigationClient, performanceClient, provider, correlationId);
         this.apiId = apiId;
         this.accountId = accountId;
-        this.nativeMessageHandler = provider;
+        this.platformAuthProvider = provider;
         this.nativeStorageManager = nativeStorageImpl;
         this.silentCacheClient = new SilentCacheClient(config, this.nativeStorageManager, browserCrypto, logger, eventHandler, navigationClient, performanceClient, provider, correlationId);
-        const extensionName = this.nativeMessageHandler.getExtensionId() ===
-            NativeConstants.PREFERRED_EXTENSION_ID
-            ? "chrome"
-            : this.nativeMessageHandler.getExtensionId()?.length
-                ? "unknown"
-                : undefined;
+        const extensionName = this.platformAuthProvider.getExtensionName();
         this.skus = ServerTelemetryManager.makeExtraSkuString({
             libraryName: BrowserConstants.MSAL_SKU,
             libraryVersion: version,
             extensionName: extensionName,
-            extensionVersion: this.nativeMessageHandler.getExtensionVersion(),
+            extensionVersion: this.platformAuthProvider.getExtensionVersion(),
         });
     }
     /**
      * Adds SKUs to request extra query parameters
-     * @param request {NativeTokenRequest}
+     * @param request {PlatformAuthRequest}
      * @private
      */
     addRequestSKUs(request) {
@@ -79,14 +74,7 @@ class NativeInteractionClient extends BaseInteractionClient {
                 // continue with a native call for any and all errors
                 this.logger.info("MSAL internal Cache does not contain tokens, proceed to make a native call");
             }
-            const { ...nativeTokenRequest } = nativeRequest;
-            // fall back to native calls
-            const messageBody = {
-                method: NativeExtensionMethod.GetToken,
-                request: nativeTokenRequest,
-            };
-            const response = await this.nativeMessageHandler.sendMessage(messageBody);
-            const validatedResponse = this.validateNativeResponse(response);
+            const validatedResponse = await this.platformAuthProvider.sendMessage(nativeRequest);
             return await this.handleNativeResponse(validatedResponse, nativeRequest, reqTimestamp)
                 .then((result) => {
                 nativeATMeasurement.end({
@@ -175,13 +163,8 @@ class NativeInteractionClient extends BaseInteractionClient {
         const { ...remainingParameters } = request;
         delete remainingParameters.onRedirectNavigate;
         const nativeRequest = await this.initializeNativeRequest(remainingParameters);
-        const messageBody = {
-            method: NativeExtensionMethod.GetToken,
-            request: nativeRequest,
-        };
         try {
-            const response = await this.nativeMessageHandler.sendMessage(messageBody);
-            this.validateNativeResponse(response);
+            await this.platformAuthProvider.sendMessage(nativeRequest);
         }
         catch (e) {
             // Only throw fatal errors here to allow application to fallback to regular redirect. Otherwise proceed and the error will be thrown in handleRedirectPromise
@@ -230,20 +213,14 @@ class NativeInteractionClient extends BaseInteractionClient {
             this.logger.verbose("NativeInteractionClient - handleRedirectPromise called and prompt was included in the original request, removing prompt from cached request to prevent second interaction with native broker window.");
         }
         this.browserStorage.removeItem(this.browserStorage.generateCacheKey(TemporaryCacheKeys.NATIVE_REQUEST));
-        const messageBody = {
-            method: NativeExtensionMethod.GetToken,
-            request: request,
-        };
         const reqTimestamp = TimeUtils.nowSeconds();
         try {
             this.logger.verbose("NativeInteractionClient - handleRedirectPromise sending message to native broker.");
-            const response = await this.nativeMessageHandler.sendMessage(messageBody);
-            this.validateNativeResponse(response);
-            const result = this.handleNativeResponse(response, request, reqTimestamp);
-            const res = await result;
+            const response = await this.platformAuthProvider.sendMessage(request);
+            const authResult = await this.handleNativeResponse(response, request, reqTimestamp);
             const serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
             serverTelemetryManager.clearNativeBrokerErrorCode();
-            return res;
+            return authResult;
         }
         catch (e) {
             throw e;
@@ -314,10 +291,10 @@ class NativeInteractionClient extends BaseInteractionClient {
      * @param request
      * @returns
      */
-    generateScopes(response, request) {
-        return response.scope
-            ? ScopeSet.fromString(response.scope)
-            : ScopeSet.fromString(request.scope);
+    generateScopes(requestScopes, responseScopes) {
+        return responseScopes
+            ? ScopeSet.fromString(responseScopes)
+            : ScopeSet.fromString(requestScopes);
     }
     /**
      * If PoP token is requesred, records the PoP token if returned from the WAM, else generates one in the browser
@@ -369,11 +346,9 @@ class NativeInteractionClient extends BaseInteractionClient {
      */
     async generateAuthenticationResult(response, request, idTokenClaims, accountEntity, authority, reqTimestamp) {
         // Add Native Broker fields to Telemetry
-        const mats = this.addTelemetryFromNativeResponse(response);
+        const mats = this.addTelemetryFromNativeResponse(response.properties.MATS);
         // If scopes not returned in server response, use request scopes
-        const responseScopes = response.scope
-            ? ScopeSet.fromString(response.scope)
-            : ScopeSet.fromString(request.scope);
+        const responseScopes = this.generateScopes(request.scope, response.scope);
         const accountProperties = response.account.properties || {};
         const uid = accountProperties["UID"] ||
             idTokenClaims.oid ||
@@ -446,7 +421,7 @@ class NativeInteractionClient extends BaseInteractionClient {
                 ? parseInt(response.expires_in, 10)
                 : response.expires_in) || 0;
         const tokenExpirationSeconds = reqTimestamp + expiresIn;
-        const responseScopes = this.generateScopes(response, request);
+        const responseScopes = this.generateScopes(response.scope, request.scope);
         const cachedAccessToken = CacheHelpers.createAccessTokenEntity(homeAccountIdentifier, request.authority, responseAccessToken, request.clientId, idTokenClaims.tid || tenantId, responseScopes.printScopes(), tokenExpirationSeconds, 0, base64Decode, undefined, request.tokenType, undefined, request.keyId);
         const nativeCacheRecord = {
             idToken: cachedIdToken,
@@ -454,14 +429,21 @@ class NativeInteractionClient extends BaseInteractionClient {
         };
         return this.nativeStorageManager.saveCacheRecord(nativeCacheRecord, this.correlationId, request.storeInCache);
     }
-    addTelemetryFromNativeResponse(response) {
-        const mats = this.getMATSFromResponse(response);
+    getExpiresInValue(tokenType, expiresIn) {
+        return tokenType === AuthenticationScheme.POP
+            ? Constants.SHR_NONCE_VALIDITY
+            : (typeof expiresIn === "string"
+                ? parseInt(expiresIn, 10)
+                : expiresIn) || 0;
+    }
+    addTelemetryFromNativeResponse(matsResponse) {
+        const mats = this.getMATSFromResponse(matsResponse);
         if (!mats) {
             return null;
         }
         this.performanceClient.addFields({
-            extensionId: this.nativeMessageHandler.getExtensionId(),
-            extensionVersion: this.nativeMessageHandler.getExtensionVersion(),
+            extensionId: this.platformAuthProvider.getExtensionId(),
+            extensionVersion: this.platformAuthProvider.getExtensionVersion(),
             matsBrokerVersion: mats.broker_version,
             matsAccountJoinOnStart: mats.account_join_on_start,
             matsAccountJoinOnEnd: mats.account_join_on_end,
@@ -478,32 +460,15 @@ class NativeInteractionClient extends BaseInteractionClient {
         }, this.correlationId);
         return mats;
     }
-    /**
-     * Validates native platform response before processing
-     * @param response
-     */
-    validateNativeResponse(response) {
-        if (response.hasOwnProperty("access_token") &&
-            response.hasOwnProperty("id_token") &&
-            response.hasOwnProperty("client_info") &&
-            response.hasOwnProperty("account") &&
-            response.hasOwnProperty("scope") &&
-            response.hasOwnProperty("expires_in")) {
-            return response;
-        }
-        else {
-            throw createAuthError(AuthErrorCodes.unexpectedError, "Response missing expected properties.");
-        }
-    }
     /**
      * Gets MATS telemetry from native response
      * @param response
      * @returns
      */
-    getMATSFromResponse(response) {
-        if (response.properties.MATS) {
+    getMATSFromResponse(matsResponse) {
+        if (matsResponse) {
             try {
-                return JSON.parse(response.properties.MATS);
+                return JSON.parse(matsResponse);
             }
             catch (e) {
                 this.logger.error("NativeInteractionClient - Error parsing MATS telemetry, returning null instead");
@@ -529,46 +494,11 @@ class NativeInteractionClient extends BaseInteractionClient {
      */
     async initializeNativeRequest(request) {
         this.logger.trace("NativeInteractionClient - initializeNativeRequest called");
-        const requestAuthority = request.authority || this.config.auth.authority;
-        if (request.account) {
-            // validate authority
-            await this.getDiscoveredAuthority({
-                requestAuthority,
-                requestAzureCloudOptions: request.azureCloudOptions,
-                account: request.account,
-            });
-        }
-        const canonicalAuthority = new UrlString(requestAuthority);
-        canonicalAuthority.validateAsUri();
+        const canonicalAuthority = await this.getCanonicalAuthority(request);
         // scopes are expected to be received by the native broker as "scope" and will be added to the request below. Other properties that should be dropped from the request to the native broker can be included in the object destructuring here.
         const { scopes, ...remainingProperties } = request;
         const scopeSet = new ScopeSet(scopes || []);
         scopeSet.appendScopes(OIDC_DEFAULT_SCOPES);
-        const getPrompt = () => {
-            // If request is silent, prompt is always none
-            switch (this.apiId) {
-                case ApiId.ssoSilent:
-                case ApiId.acquireTokenSilent_silentFlow:
-                    this.logger.trace("initializeNativeRequest: silent request sets prompt to none");
-                    return PromptValue.NONE;
-            }
-            // Prompt not provided, request may proceed and native broker decides if it needs to prompt
-            if (!request.prompt) {
-                this.logger.trace("initializeNativeRequest: prompt was not provided");
-                return undefined;
-            }
-            // If request is interactive, check if prompt provided is allowed to go directly to native broker
-            switch (request.prompt) {
-                case PromptValue.NONE:
-                case PromptValue.CONSENT:
-                case PromptValue.LOGIN:
-                    this.logger.trace("initializeNativeRequest: prompt is compatible with native flow");
-                    return request.prompt;
-                default:
-                    this.logger.trace(`initializeNativeRequest: prompt = ${request.prompt} is not compatible with native flow`);
-                    throw createBrowserAuthError(nativePromptNotSupported);
-            }
-        };
         const validatedRequest = {
             ...remainingProperties,
             accountId: this.accountId,
@@ -576,7 +506,7 @@ class NativeInteractionClient extends BaseInteractionClient {
             authority: canonicalAuthority.urlString,
             scope: scopeSet.printScopes(),
             redirectUri: this.getRedirectUri(request.redirectUri),
-            prompt: getPrompt(),
+            prompt: this.getPrompt(request.prompt),
             correlationId: this.correlationId,
             tokenType: request.authenticationScheme,
             windowTitleSubstring: document.title,
@@ -595,7 +525,7 @@ class NativeInteractionClient extends BaseInteractionClient {
         validatedRequest.extraParameters =
             validatedRequest.extraParameters || {};
         validatedRequest.extraParameters.telemetry =
-            NativeConstants.MATS_TELEMETRY;
+            PlatformAuthConstants.MATS_TELEMETRY;
         if (request.authenticationScheme === AuthenticationScheme.POP) {
             // add POP request type
             const shrParameters = {
@@ -623,9 +553,48 @@ class NativeInteractionClient extends BaseInteractionClient {
         this.addRequestSKUs(validatedRequest);
         return validatedRequest;
     }
+    async getCanonicalAuthority(request) {
+        const requestAuthority = request.authority || this.config.auth.authority;
+        if (request.account) {
+            // validate authority
+            await this.getDiscoveredAuthority({
+                requestAuthority,
+                requestAzureCloudOptions: request.azureCloudOptions,
+                account: request.account,
+            });
+        }
+        const canonicalAuthority = new UrlString(requestAuthority);
+        canonicalAuthority.validateAsUri();
+        return canonicalAuthority;
+    }
+    getPrompt(prompt) {
+        // If request is silent, prompt is always none
+        switch (this.apiId) {
+            case ApiId.ssoSilent:
+            case ApiId.acquireTokenSilent_silentFlow:
+                this.logger.trace("initializeNativeRequest: silent request sets prompt to none");
+                return PromptValue.NONE;
+        }
+        // Prompt not provided, request may proceed and native broker decides if it needs to prompt
+        if (!prompt) {
+            this.logger.trace("initializeNativeRequest: prompt was not provided");
+            return undefined;
+        }
+        // If request is interactive, check if prompt provided is allowed to go directly to native broker
+        switch (prompt) {
+            case PromptValue.NONE:
+            case PromptValue.CONSENT:
+            case PromptValue.LOGIN:
+                this.logger.trace("initializeNativeRequest: prompt is compatible with native flow");
+                return prompt;
+            default:
+                this.logger.trace(`initializeNativeRequest: prompt = ${prompt} is not compatible with native flow`);
+                throw createBrowserAuthError(nativePromptNotSupported);
+        }
+    }
     /**
      * Handles extra broker request parameters
-     * @param request {NativeTokenRequest}
+     * @param request {PlatformAuthRequest}
      * @private
      */
     handleExtraBrokerParams(request) {
@@ -659,5 +628,5 @@ class NativeInteractionClient extends BaseInteractionClient {
     }
 }
 
-export { NativeInteractionClient };
-//# sourceMappingURL=NativeInteractionClient.mjs.map
+export { PlatformAuthInteractionClient };
+//# sourceMappingURL=PlatformAuthInteractionClient.mjs.map

package/dist/interaction_client/PlatformAuthInteractionClient.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"PlatformAuthInteractionClient.mjs","sources":["../../src/interaction_client/PlatformAuthInteractionClient.ts"],"sourcesContent":[null],"names":["NativeAuthErrorCodes.userSwitch","BrowserAuthErrorCodes.invalidPopTokenRequest","BrowserAuthErrorCodes.nativePromptNotSupported"],"mappings":"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"}

package/dist/interaction_client/PopupClient.d.ts

@@ -2,13 +2,13 @@ import { CommonEndSessionRequest, IPerformanceClient, Logger, ICrypto, PkceCodes
 import { StandardInteractionClient } from "./StandardInteractionClient.js";
 import { EndSessionPopupRequest } from "../request/EndSessionPopupRequest.js";
 import { PopupRequest } from "../request/PopupRequest.js";
-import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandler.js";
 import { INavigationClient } from "../navigation/INavigationClient.js";
 import { EventHandler } from "../event/EventHandler.js";
 import { BrowserCacheManager } from "../cache/BrowserCacheManager.js";
 import { BrowserConfiguration } from "../config/Configuration.js";
 import { PopupWindowAttributes } from "../request/PopupWindowAttributes.js";
 import { AuthenticationResult } from "../response/AuthenticationResult.js";
+import { IPlatformAuthHandler } from "../broker/nativeBroker/IPlatformAuthHandler.js";
 export type PopupParams = {
     popup?: Window | null;
     popupName: string;
@@ -18,7 +18,7 @@ export type PopupParams = {
 export declare class PopupClient extends StandardInteractionClient {
     private currentWindow;
     protected nativeStorage: BrowserCacheManager;
-    constructor(config: BrowserConfiguration, storageImpl: BrowserCacheManager, browserCrypto: ICrypto, logger: Logger, eventHandler: EventHandler, navigationClient: INavigationClient, performanceClient: IPerformanceClient, nativeStorageImpl: BrowserCacheManager, nativeMessageHandler?: NativeMessageHandler, correlationId?: string);
+    constructor(config: BrowserConfiguration, storageImpl: BrowserCacheManager, browserCrypto: ICrypto, logger: Logger, eventHandler: EventHandler, navigationClient: INavigationClient, performanceClient: IPerformanceClient, nativeStorageImpl: BrowserCacheManager, platformAuthHandler?: IPlatformAuthHandler, correlationId?: string);
     /**
      * Acquires tokens by opening a popup window to the /authorize endpoint of the authority
      * @param request

package/dist/interaction_client/PopupClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PopupClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/PopupClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PopupClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/PopupClient.ts"],"names":[],"mappings":"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"}

package/dist/interaction_client/PopupClient.mjs

@@ -1,15 +1,15 @@
-/*! @azure/msal-browser v4.11.1 2025-04-29 */
+/*! @azure/msal-browser v4.13.0 2025-05-30 */
 'use strict';
 import { OIDC_DEFAULT_SCOPES, invokeAsync, PerformanceEvents, ProtocolMode, invoke, AuthError, UrlString, ServerResponseType } from '@azure/msal-common/browser';
 import { StandardInteractionClient } from './StandardInteractionClient.mjs';
 import { EventType } from '../event/EventType.mjs';
 import { InteractionType, ApiId, BrowserConstants } from '../utils/BrowserConstants.mjs';
 import { preconnect, getCurrentUri } from '../utils/BrowserUtils.mjs';
-import { NativeMessageHandler } from '../broker/nativeBroker/NativeMessageHandler.mjs';
 import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
 import { deserializeResponse } from '../response/ResponseHandler.mjs';
 import { getAuthCodeRequestUrl, handleResponseCode, getEARForm, handleResponseEAR } from '../protocol/Authorize.mjs';
 import { generatePkceCodes } from '../crypto/PkceGenerator.mjs';
+import { isPlatformAuthAllowed } from '../broker/nativeBroker/PlatformAuthProvider.mjs';
 import { generateEarKey } from '../crypto/BrowserCrypto.mjs';
 import { emptyNavigateUri, userCancelled, emptyWindowError, popupWindowError } from '../error/BrowserAuthErrorCodes.mjs';
 
@@ -18,8 +18,8 @@ import { emptyNavigateUri, userCancelled, emptyWindowError, popupWindowError } f
  * Licensed under the MIT License.
  */
 class PopupClient extends StandardInteractionClient {
-    constructor(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, nativeStorageImpl, nativeMessageHandler, correlationId) {
-        super(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, nativeMessageHandler, correlationId);
+    constructor(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, nativeStorageImpl, platformAuthHandler, correlationId) {
+        super(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, platformAuthHandler, correlationId);
         // Properly sets this reference for the unload event.
         this.unloadWindow = this.unloadWindow.bind(this);
         this.nativeStorage = nativeStorageImpl;
@@ -107,7 +107,7 @@ class PopupClient extends StandardInteractionClient {
         if (popupParams.popup) {
             preconnect(validRequest.authority);
         }
-        const isPlatformBroker = NativeMessageHandler.isPlatformBrokerAvailable(this.config, this.logger, this.nativeMessageHandler, request.authenticationScheme);
+        const isPlatformBroker = isPlatformAuthAllowed(this.config, this.logger, this.platformAuthProvider, request.authenticationScheme);
         validRequest.platformBroker = isPlatformBroker;
         if (this.config.auth.protocolMode === ProtocolMode.EAR) {
             return this.executeEarFlow(validRequest, popupParams);
@@ -149,7 +149,7 @@ class PopupClient extends StandardInteractionClient {
             // 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);
             const serverParams = invoke(deserializeResponse, PerformanceEvents.DeserializeResponse, this.logger, this.performanceClient, this.correlationId)(responseString, this.config.auth.OIDCOptions.serverResponseType, this.logger);
-            return await invokeAsync(handleResponseCode, PerformanceEvents.HandleResponseCode, this.logger, this.performanceClient, correlationId)(request, serverParams, pkce.verifier, ApiId.acquireTokenPopup, this.config, authClient, this.browserStorage, this.nativeStorage, this.eventHandler, this.logger, this.performanceClient, this.nativeMessageHandler);
+            return await invokeAsync(handleResponseCode, PerformanceEvents.HandleResponseCode, this.logger, this.performanceClient, correlationId)(request, serverParams, pkce.verifier, ApiId.acquireTokenPopup, this.config, authClient, this.browserStorage, this.nativeStorage, this.eventHandler, this.logger, this.performanceClient, this.platformAuthProvider);
         }
         catch (e) {
             // Close the synchronous popup if an error is thrown before the window unload event is registered
@@ -185,7 +185,7 @@ 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, this.logger, this.performanceClient, correlationId)(popupWindow, popupParams.popupWindowParent);
         const serverParams = invoke(deserializeResponse, PerformanceEvents.DeserializeResponse, this.logger, this.performanceClient, this.correlationId)(responseString, this.config.auth.OIDCOptions.serverResponseType, this.logger);
-        return invokeAsync(handleResponseEAR, PerformanceEvents.HandleResponseEar, this.logger, this.performanceClient, correlationId)(popupRequest, serverParams, ApiId.acquireTokenPopup, this.config, discoveredAuthority, this.browserStorage, this.nativeStorage, this.eventHandler, this.logger, this.performanceClient, this.nativeMessageHandler);
+        return invokeAsync(handleResponseEAR, PerformanceEvents.HandleResponseEar, this.logger, this.performanceClient, correlationId)(popupRequest, serverParams, ApiId.acquireTokenPopup, this.config, discoveredAuthority, this.browserStorage, this.nativeStorage, this.eventHandler, this.logger, this.performanceClient, this.platformAuthProvider);
     }
     /**
      *