@azure/msal-browser 4.11.1 → 4.13.0

package/src/interaction_client/{NativeInteractionClient.ts → PlatformAuthInteractionClient.ts}

@@ -30,8 +30,6 @@ import {
     createClientAuthError,
     ClientAuthErrorCodes,
     invokeAsync,
-    createAuthError,
-    AuthErrorCodes,
     updateAccountTenantProfileData,
     CacheHelpers,
     buildAccountToCache,
@@ -45,20 +43,18 @@ 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 {
-    NativeExtensionMethod,
     ApiId,
     TemporaryCacheKeys,
-    NativeConstants,
+    PlatformAuthConstants,
     BrowserConstants,
     CacheLookupPolicy,
 } from "../utils/BrowserConstants.js";
+import { PlatformAuthRequest } from "../broker/nativeBroker/PlatformAuthRequest.js";
 import {
-    NativeExtensionRequestBody,
-    NativeTokenRequest,
-} from "../broker/nativeBroker/NativeRequest.js";
-import { MATS, NativeResponse } from "../broker/nativeBroker/NativeResponse.js";
+    MATS,
+    PlatformAuthResponse,
+} from "../broker/nativeBroker/PlatformAuthResponse.js";
 import {
     NativeAuthError,
     NativeAuthErrorCodes,
@@ -76,11 +72,12 @@ import { SilentCacheClient } from "./SilentCacheClient.js";
 import { AuthenticationResult } from "../response/AuthenticationResult.js";
 import { base64Decode } from "../encode/Base64Decode.js";
 import { version } from "../packageMetadata.js";
+import { IPlatformAuthHandler } from "../broker/nativeBroker/IPlatformAuthHandler.js";
 
-export class NativeInteractionClient extends BaseInteractionClient {
+export 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;
@@ -94,7 +91,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
         navigationClient: INavigationClient,
         apiId: ApiId,
         performanceClient: IPerformanceClient,
-        provider: NativeMessageHandler,
+        provider: IPlatformAuthHandler,
         accountId: string,
         nativeStorageImpl: BrowserCacheManager,
         correlationId?: string
@@ -112,7 +109,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
         );
         this.apiId = apiId;
         this.accountId = accountId;
-        this.nativeMessageHandler = provider;
+        this.platformAuthProvider = provider;
         this.nativeStorageManager = nativeStorageImpl;
         this.silentCacheClient = new SilentCacheClient(
             config,
@@ -126,27 +123,22 @@ export class NativeInteractionClient extends BaseInteractionClient {
             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
      */
-    private addRequestSKUs(request: NativeTokenRequest) {
+    private addRequestSKUs(request: PlatformAuthRequest): void {
         request.extraParameters = {
             ...request.extraParameters,
             [AADServerParamKeys.X_CLIENT_EXTRA_SKU]: this.skus,
@@ -177,6 +169,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
         const serverTelemetryManager = this.initializeServerTelemetryManager(
             this.apiId
         );
+
         try {
             // initialize native request
             const nativeRequest = await this.initializeNativeRequest(request);
@@ -206,18 +199,8 @@ export class NativeInteractionClient extends BaseInteractionClient {
                 );
             }
 
-            const { ...nativeTokenRequest } = nativeRequest;
-
-            // fall back to native calls
-            const messageBody: NativeExtensionRequestBody = {
-                method: NativeExtensionMethod.GetToken,
-                request: nativeTokenRequest,
-            };
-
-            const response: object =
-                await this.nativeMessageHandler.sendMessage(messageBody);
-            const validatedResponse: NativeResponse =
-                this.validateNativeResponse(response);
+            const validatedResponse: PlatformAuthResponse =
+                await this.platformAuthProvider.sendMessage(nativeRequest);
 
             return await this.handleNativeResponse(
                 validatedResponse,
@@ -257,7 +240,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
      * @returns CommonSilentFlowRequest
      */
     private createSilentCacheRequest(
-        request: NativeTokenRequest,
+        request: PlatformAuthRequest,
         cachedAccount: AccountInfo
     ): CommonSilentFlowRequest {
         return {
@@ -277,7 +260,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
      */
     protected async acquireTokensFromCache(
         nativeAccountId: string,
-        request: NativeTokenRequest
+        request: PlatformAuthRequest
     ): Promise<AuthenticationResult> {
         if (!nativeAccountId) {
             this.logger.warning(
@@ -339,15 +322,8 @@ export class NativeInteractionClient extends BaseInteractionClient {
             remainingParameters
         );
 
-        const messageBody: NativeExtensionRequestBody = {
-            method: NativeExtensionMethod.GetToken,
-            request: nativeRequest,
-        };
-
         try {
-            const response: object =
-                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
             if (e instanceof NativeAuthError) {
@@ -427,30 +403,24 @@ export class NativeInteractionClient extends BaseInteractionClient {
             )
         );
 
-        const messageBody: NativeExtensionRequestBody = {
-            method: NativeExtensionMethod.GetToken,
-            request: request,
-        };
-
         const reqTimestamp = TimeUtils.nowSeconds();
 
         try {
             this.logger.verbose(
                 "NativeInteractionClient - handleRedirectPromise sending message to native broker."
             );
-            const response: object =
-                await this.nativeMessageHandler.sendMessage(messageBody);
-            this.validateNativeResponse(response);
-            const result = this.handleNativeResponse(
-                response as NativeResponse,
+            const response: PlatformAuthResponse =
+                await this.platformAuthProvider.sendMessage(request);
+            const authResult = await this.handleNativeResponse(
+                response,
                 request,
                 reqTimestamp
             );
-            const res = await result;
+
             const serverTelemetryManager =
                 this.initializeServerTelemetryManager(this.apiId);
             serverTelemetryManager.clearNativeBrokerErrorCode();
-            return res;
+            return authResult;
         } catch (e) {
             throw e;
         }
@@ -472,8 +442,8 @@ export class NativeInteractionClient extends BaseInteractionClient {
      * @param reqTimestamp
      */
     protected async handleNativeResponse(
-        response: NativeResponse,
-        request: NativeTokenRequest,
+        response: PlatformAuthResponse,
+        request: PlatformAuthRequest,
         reqTimestamp: number
     ): Promise<AuthenticationResult> {
         this.logger.trace(
@@ -566,7 +536,7 @@ export class NativeInteractionClient extends BaseInteractionClient {
      * @returns
      */
     protected createHomeAccountIdentifier(
-        response: NativeResponse,
+        response: PlatformAuthResponse,
         idTokenClaims: TokenClaims
     ): string {
         // Save account in browser storage
@@ -587,13 +557,10 @@ export class NativeInteractionClient extends BaseInteractionClient {
      * @param request
      * @returns
      */
-    generateScopes(
-        response: NativeResponse,
-        request: NativeTokenRequest
-    ): ScopeSet {
-        return response.scope
-            ? ScopeSet.fromString(response.scope)
-            : ScopeSet.fromString(request.scope);
+    generateScopes(requestScopes: string, responseScopes?: string): ScopeSet {
+        return responseScopes
+            ? ScopeSet.fromString(responseScopes)
+            : ScopeSet.fromString(requestScopes);
     }
 
     /**
@@ -602,8 +569,8 @@ export class NativeInteractionClient extends BaseInteractionClient {
      * @param response
      */
     async generatePopAccessToken(
-        response: NativeResponse,
-        request: NativeTokenRequest
+        response: PlatformAuthResponse,
+        request: PlatformAuthRequest
     ): Promise<string> {
         if (
             request.tokenType === AuthenticationScheme.POP &&
@@ -661,20 +628,23 @@ export class NativeInteractionClient extends BaseInteractionClient {
      * @returns
      */
     protected async generateAuthenticationResult(
-        response: NativeResponse,
-        request: NativeTokenRequest,
+        response: PlatformAuthResponse,
+        request: PlatformAuthRequest,
         idTokenClaims: TokenClaims,
         accountEntity: AccountEntity,
         authority: string,
         reqTimestamp: number
     ): Promise<AuthenticationResult> {
         // 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 =
@@ -762,8 +732,8 @@ export class NativeInteractionClient extends BaseInteractionClient {
      * @param reqTimestamp
      */
     cacheNativeTokens(
-        response: NativeResponse,
-        request: NativeTokenRequest,
+        response: PlatformAuthResponse,
+        request: PlatformAuthRequest,
         homeAccountIdentifier: string,
         idTokenClaims: TokenClaims,
         responseAccessToken: string,
@@ -787,7 +757,10 @@ export 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: AccessTokenEntity | null =
             CacheHelpers.createAccessTokenEntity(
@@ -818,10 +791,21 @@ export class NativeInteractionClient extends BaseInteractionClient {
         );
     }
 
+    getExpiresInValue(
+        tokenType: string,
+        expiresIn: string | number | undefined
+    ): number {
+        return tokenType === AuthenticationScheme.POP
+            ? Constants.SHR_NONCE_VALIDITY
+            : (typeof expiresIn === "string"
+                  ? parseInt(expiresIn, 10)
+                  : expiresIn) || 0;
+    }
+
     protected addTelemetryFromNativeResponse(
-        response: NativeResponse
+        matsResponse?: string
     ): MATS | null {
-        const mats = this.getMATSFromResponse(response);
+        const mats = this.getMATSFromResponse(matsResponse);
 
         if (!mats) {
             return null;
@@ -829,9 +813,9 @@ export class NativeInteractionClient extends BaseInteractionClient {
 
         this.performanceClient.addFields(
             {
-                extensionId: this.nativeMessageHandler.getExtensionId(),
+                extensionId: this.platformAuthProvider.getExtensionId(),
                 extensionVersion:
-                    this.nativeMessageHandler.getExtensionVersion(),
+                    this.platformAuthProvider.getExtensionVersion(),
                 matsBrokerVersion: mats.broker_version,
                 matsAccountJoinOnStart: mats.account_join_on_start,
                 matsAccountJoinOnEnd: mats.account_join_on_end,
@@ -852,37 +836,15 @@ export class NativeInteractionClient extends BaseInteractionClient {
         return mats;
     }
 
-    /**
-     * Validates native platform response before processing
-     * @param response
-     */
-    private validateNativeResponse(response: object): NativeResponse {
-        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 as NativeResponse;
-        } else {
-            throw createAuthError(
-                AuthErrorCodes.unexpectedError,
-                "Response missing expected properties."
-            );
-        }
-    }
-
     /**
      * Gets MATS telemetry from native response
      * @param response
      * @returns
      */
-    private getMATSFromResponse(response: NativeResponse): MATS | null {
-        if (response.properties.MATS) {
+    private getMATSFromResponse(matsResponse: string | undefined): MATS | null {
+        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"
@@ -915,79 +877,26 @@ export class NativeInteractionClient extends BaseInteractionClient {
      */
     protected async initializeNativeRequest(
         request: PopupRequest | SsoSilentRequest
-    ): Promise<NativeTokenRequest> {
+    ): Promise<PlatformAuthRequest> {
         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;
-                default:
-                    break;
-            }
-
-            // 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(
-                        BrowserAuthErrorCodes.nativePromptNotSupported
-                    );
-            }
-        };
-
-        const validatedRequest: NativeTokenRequest = {
+        const validatedRequest: PlatformAuthRequest = {
             ...remainingProperties,
             accountId: this.accountId,
             clientId: this.config.auth.clientId,
             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,
@@ -1010,7 +919,7 @@ export 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
@@ -1051,12 +960,72 @@ export class NativeInteractionClient extends BaseInteractionClient {
         return validatedRequest;
     }
 
+    private async getCanonicalAuthority(
+        request: PopupRequest | SsoSilentRequest
+    ): Promise<UrlString> {
+        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;
+    }
+
+    private getPrompt(prompt?: string): string | undefined {
+        // 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;
+            default:
+                break;
+        }
+
+        // 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(
+                    BrowserAuthErrorCodes.nativePromptNotSupported
+                );
+        }
+    }
+
     /**
      * Handles extra broker request parameters
-     * @param request {NativeTokenRequest}
+     * @param request {PlatformAuthRequest}
      * @private
      */
-    private handleExtraBrokerParams(request: NativeTokenRequest): void {
+    private handleExtraBrokerParams(request: PlatformAuthRequest): void {
         const hasExtraBrokerParams =
             request.extraParameters &&
             request.extraParameters.hasOwnProperty(

package/src/interaction_client/PopupClient.ts

@@ -31,7 +31,6 @@ import { EndSessionPopupRequest } from "../request/EndSessionPopupRequest.js";
 import { NavigationOptions } from "../navigation/NavigationOptions.js";
 import * as BrowserUtils from "../utils/BrowserUtils.js";
 import { PopupRequest } from "../request/PopupRequest.js";
-import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandler.js";
 import {
     createBrowserAuthError,
     BrowserAuthErrorCodes,
@@ -46,7 +45,9 @@ import { AuthenticationResult } from "../response/AuthenticationResult.js";
 import * as ResponseHandler from "../response/ResponseHandler.js";
 import * as Authorize from "../protocol/Authorize.js";
 import { generatePkceCodes } from "../crypto/PkceGenerator.js";
+import { isPlatformAuthAllowed } from "../broker/nativeBroker/PlatformAuthProvider.js";
 import { generateEarKey } from "../crypto/BrowserCrypto.js";
+import { IPlatformAuthHandler } from "../broker/nativeBroker/IPlatformAuthHandler.js";
 
 export type PopupParams = {
     popup?: Window | null;
@@ -68,7 +69,7 @@ export class PopupClient extends StandardInteractionClient {
         navigationClient: INavigationClient,
         performanceClient: IPerformanceClient,
         nativeStorageImpl: BrowserCacheManager,
-        nativeMessageHandler?: NativeMessageHandler,
+        platformAuthHandler?: IPlatformAuthHandler,
         correlationId?: string
     ) {
         super(
@@ -79,7 +80,7 @@ export class PopupClient extends StandardInteractionClient {
             eventHandler,
             navigationClient,
             performanceClient,
-            nativeMessageHandler,
+            platformAuthHandler,
             correlationId
         );
         // Properly sets this reference for the unload event.
@@ -222,10 +223,10 @@ export class PopupClient extends StandardInteractionClient {
             BrowserUtils.preconnect(validRequest.authority);
         }
 
-        const isPlatformBroker = NativeMessageHandler.isPlatformBrokerAvailable(
+        const isPlatformBroker = isPlatformAuthAllowed(
             this.config,
             this.logger,
-            this.nativeMessageHandler,
+            this.platformAuthProvider,
             request.authenticationScheme
         );
         validRequest.platformBroker = isPlatformBroker;
@@ -348,7 +349,7 @@ export class PopupClient extends StandardInteractionClient {
                 this.eventHandler,
                 this.logger,
                 this.performanceClient,
-                this.nativeMessageHandler
+                this.platformAuthProvider
             );
         } catch (e) {
             // Close the synchronous popup if an error is thrown before the window unload event is registered
@@ -447,7 +448,7 @@ export class PopupClient extends StandardInteractionClient {
             this.eventHandler,
             this.logger,
             this.performanceClient,
-            this.nativeMessageHandler
+            this.platformAuthProvider
         );
     }
 

package/src/interaction_client/RedirectClient.ts

@@ -37,7 +37,6 @@ import {
     BrowserAuthErrorCodes,
 } from "../error/BrowserAuthError.js";
 import { RedirectRequest } from "../request/RedirectRequest.js";
-import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandler.js";
 import { BrowserConfiguration } from "../config/Configuration.js";
 import { BrowserCacheManager } from "../cache/BrowserCacheManager.js";
 import { EventHandler } from "../event/EventHandler.js";
@@ -47,7 +46,9 @@ import { AuthenticationResult } from "../response/AuthenticationResult.js";
 import * as ResponseHandler from "../response/ResponseHandler.js";
 import * as Authorize from "../protocol/Authorize.js";
 import { generatePkceCodes } from "../crypto/PkceGenerator.js";
+import { isPlatformAuthAllowed } from "../broker/nativeBroker/PlatformAuthProvider.js";
 import { generateEarKey } from "../crypto/BrowserCrypto.js";
+import { IPlatformAuthHandler } from "../broker/nativeBroker/IPlatformAuthHandler.js";
 
 function getNavigationType(): NavigationTimingType | undefined {
     if (
@@ -77,7 +78,7 @@ export class RedirectClient extends StandardInteractionClient {
         navigationClient: INavigationClient,
         performanceClient: IPerformanceClient,
         nativeStorageImpl: BrowserCacheManager,
-        nativeMessageHandler?: NativeMessageHandler,
+        platformAuthHandler?: IPlatformAuthHandler,
         correlationId?: string
     ) {
         super(
@@ -88,7 +89,7 @@ export class RedirectClient extends StandardInteractionClient {
             eventHandler,
             navigationClient,
             performanceClient,
-            nativeMessageHandler,
+            platformAuthHandler,
             correlationId
         );
         this.nativeStorage = nativeStorageImpl;
@@ -107,13 +108,12 @@ export class RedirectClient extends StandardInteractionClient {
             this.correlationId
         )(request, InteractionType.Redirect);
 
-        validRequest.platformBroker =
-            NativeMessageHandler.isPlatformBrokerAvailable(
-                this.config,
-                this.logger,
-                this.nativeMessageHandler,
-                request.authenticationScheme
-            );
+        validRequest.platformBroker = isPlatformAuthAllowed(
+            this.config,
+            this.logger,
+            this.platformAuthProvider,
+            request.authenticationScheme
+        );
 
         const handleBackButton = (event: PageTransitionEvent) => {
             // Clear temporary cache if the back button is clicked during the redirect flow.
@@ -554,7 +554,7 @@ export class RedirectClient extends StandardInteractionClient {
                 this.eventHandler,
                 this.logger,
                 this.performanceClient,
-                this.nativeMessageHandler
+                this.platformAuthProvider
             );
         }
 
@@ -583,7 +583,7 @@ export class RedirectClient extends StandardInteractionClient {
             this.eventHandler,
             this.logger,
             this.performanceClient,
-            this.nativeMessageHandler
+            this.platformAuthProvider
         );
     }