@azure/msal-browser 3.26.1 → 3.28.0

package/src/interaction_client/NativeInteractionClient.ts

@@ -76,11 +76,6 @@ import { AuthenticationResult } from "../response/AuthenticationResult.js";
 import { base64Decode } from "../encode/Base64Decode.js";
 import { version } from "../packageMetadata.js";
 
-const BrokerServerParamKeys = {
-    BROKER_CLIENT_ID: "brk_client_id",
-    BROKER_REDIRECT_URI: "brk_redirect_uri",
-};
-
 export class NativeInteractionClient extends BaseInteractionClient {
     protected apiId: ApiId;
     protected accountId: string;
@@ -1044,31 +1039,46 @@ export class NativeInteractionClient extends BaseInteractionClient {
      * @private
      */
     private handleExtraBrokerParams(request: NativeTokenRequest): void {
-        if (!request.extraParameters) {
-            return;
-        }
-
-        if (
+        const hasExtraBrokerParams =
+            request.extraParameters &&
             request.extraParameters.hasOwnProperty(
-                BrokerServerParamKeys.BROKER_CLIENT_ID
+                AADServerParamKeys.BROKER_CLIENT_ID
             ) &&
             request.extraParameters.hasOwnProperty(
-                BrokerServerParamKeys.BROKER_REDIRECT_URI
+                AADServerParamKeys.BROKER_REDIRECT_URI
             ) &&
-            request.extraParameters.hasOwnProperty(AADServerParamKeys.CLIENT_ID)
-        ) {
-            const child_client_id =
+            request.extraParameters.hasOwnProperty(
+                AADServerParamKeys.CLIENT_ID
+            );
+
+        if (!request.embeddedClientId && !hasExtraBrokerParams) {
+            return;
+        }
+
+        let child_client_id: string = "";
+        const child_redirect_uri = request.redirectUri;
+
+        if (request.embeddedClientId) {
+            request.redirectUri = this.config.auth.redirectUri;
+            child_client_id = request.embeddedClientId;
+        } else if (request.extraParameters) {
+            request.redirectUri =
+                request.extraParameters[AADServerParamKeys.BROKER_REDIRECT_URI];
+            child_client_id =
                 request.extraParameters[AADServerParamKeys.CLIENT_ID];
-            const child_redirect_uri = request.redirectUri;
-            const brk_redirect_uri =
-                request.extraParameters[
-                    BrokerServerParamKeys.BROKER_REDIRECT_URI
-                ];
-            request.extraParameters = {
-                child_client_id,
-                child_redirect_uri,
-            };
-            request.redirectUri = brk_redirect_uri;
         }
+
+        request.extraParameters = {
+            child_client_id,
+            child_redirect_uri,
+        };
+
+        this.performanceClient?.addFields(
+            {
+                embeddedClientId: child_client_id,
+                embeddedRedirectUri: child_redirect_uri,
+            },
+            request.correlationId
+        );
     }
 }

package/src/interaction_client/StandardInteractionClient.ts

@@ -285,6 +285,7 @@ export abstract class StandardInteractionClient extends BaseInteractionClient {
                 clientId: this.config.auth.clientId,
                 authority: discoveredAuthority,
                 clientCapabilities: this.config.auth.clientCapabilities,
+                redirectUri: this.config.auth.redirectUri,
             },
             systemOptions: {
                 tokenRenewalOffsetSeconds:
@@ -361,6 +362,11 @@ export abstract class StandardInteractionClient extends BaseInteractionClient {
                 .serverResponseType as ResponseMode,
         };
 
+        // Skip active account lookup if either login hint or session id is set
+        if (request.loginHint || request.sid) {
+            return validatedRequest;
+        }
+
         const account =
             request.account || this.browserStorage.getActiveAccount();
         if (account) {

package/src/naa/mapping/NestedAppAuthAdapter.ts

@@ -72,7 +72,9 @@ export class NestedAppAuthAdapter {
             );
         }
 
-        const requestBuilder = new RequestParameterBuilder();
+        const correlationId =
+            request.correlationId || this.crypto.createNewGuid();
+        const requestBuilder = new RequestParameterBuilder(correlationId);
         const claims = requestBuilder.addClientCapabilitiesToClaims(
             request.claims,
             this.clientCapabilities
@@ -83,10 +85,7 @@ export class NestedAppAuthAdapter {
             clientId: this.clientId,
             authority: request.authority,
             scope: scopes.join(" "),
-            correlationId:
-                request.correlationId !== undefined
-                    ? request.correlationId
-                    : this.crypto.createNewGuid(),
+            correlationId,
             claims: !StringUtils.isEmptyObj(claims) ? claims : undefined,
             state: request.state,
             authenticationScheme:

package/src/network/FetchClient.ts

@@ -4,10 +4,10 @@
  */
 
 import {
-    Constants,
     INetworkModule,
     NetworkRequestOptions,
     NetworkResponse,
+    createNetworkError,
 } from "@azure/msal-common/browser";
 import {
     createBrowserAuthError,
@@ -29,33 +29,38 @@ export class FetchClient implements INetworkModule {
         url: string,
         options?: NetworkRequestOptions
     ): Promise<NetworkResponse<T>> {
-        let response;
+        let response: Response;
+        let responseHeaders: Record<string, string> = {};
+        let responseStatus = 0;
+        const reqHeaders = getFetchHeaders(options);
         try {
             response = await fetch(url, {
                 method: HTTP_REQUEST_TYPE.GET,
-                headers: this.getFetchHeaders(options),
+                headers: reqHeaders,
             });
         } catch (e) {
-            if (window.navigator.onLine) {
-                throw createBrowserAuthError(
-                    BrowserAuthErrorCodes.getRequestFailed
-                );
-            } else {
-                throw createBrowserAuthError(
-                    BrowserAuthErrorCodes.noNetworkConnectivity
-                );
-            }
+            throw createBrowserAuthError(
+                window.navigator.onLine
+                    ? BrowserAuthErrorCodes.getRequestFailed
+                    : BrowserAuthErrorCodes.noNetworkConnectivity
+            );
         }
 
+        responseHeaders = getHeaderDict(response.headers);
         try {
+            responseStatus = response.status;
             return {
-                headers: this.getHeaderDict(response.headers),
+                headers: responseHeaders,
                 body: (await response.json()) as T,
-                status: response.status,
+                status: responseStatus,
             };
         } catch (e) {
-            throw createBrowserAuthError(
-                BrowserAuthErrorCodes.failedToParseResponse
+            throw createNetworkError(
+                createBrowserAuthError(
+                    BrowserAuthErrorCodes.failedToParseResponse
+                ),
+                responseStatus,
+                responseHeaders
             );
         }
     }
@@ -70,61 +75,83 @@ export class FetchClient implements INetworkModule {
         url: string,
         options?: NetworkRequestOptions
     ): Promise<NetworkResponse<T>> {
-        const reqBody = (options && options.body) || Constants.EMPTY_STRING;
+        const reqBody = (options && options.body) || "";
+        const reqHeaders = getFetchHeaders(options);
 
-        let response;
+        let response: Response;
+        let responseStatus = 0;
+        let responseHeaders: Record<string, string> = {};
         try {
             response = await fetch(url, {
                 method: HTTP_REQUEST_TYPE.POST,
-                headers: this.getFetchHeaders(options),
+                headers: reqHeaders,
                 body: reqBody,
             });
         } catch (e) {
-            if (window.navigator.onLine) {
-                throw createBrowserAuthError(
-                    BrowserAuthErrorCodes.postRequestFailed
-                );
-            } else {
-                throw createBrowserAuthError(
-                    BrowserAuthErrorCodes.noNetworkConnectivity
-                );
-            }
+            throw createBrowserAuthError(
+                window.navigator.onLine
+                    ? BrowserAuthErrorCodes.postRequestFailed
+                    : BrowserAuthErrorCodes.noNetworkConnectivity
+            );
         }
 
+        responseHeaders = getHeaderDict(response.headers);
         try {
+            responseStatus = response.status;
             return {
-                headers: this.getHeaderDict(response.headers),
+                headers: responseHeaders,
                 body: (await response.json()) as T,
-                status: response.status,
+                status: responseStatus,
             };
         } catch (e) {
-            throw createBrowserAuthError(
-                BrowserAuthErrorCodes.failedToParseResponse
+            throw createNetworkError(
+                createBrowserAuthError(
+                    BrowserAuthErrorCodes.failedToParseResponse
+                ),
+                responseStatus,
+                responseHeaders
             );
         }
     }
+}
 
-    /**
-     * Get Fetch API Headers object from string map
-     * @param inputHeaders
-     */
-    private getFetchHeaders(options?: NetworkRequestOptions): Headers {
+/**
+ * Get Fetch API Headers object from string map
+ * @param inputHeaders
+ */
+function getFetchHeaders(options?: NetworkRequestOptions): Headers {
+    try {
         const headers = new Headers();
         if (!(options && options.headers)) {
             return headers;
         }
         const optionsHeaders = options.headers;
-        Object.keys(optionsHeaders).forEach((key) => {
-            headers.append(key, optionsHeaders[key]);
+        Object.entries(optionsHeaders).forEach(([key, value]) => {
+            headers.append(key, value);
         });
         return headers;
+    } catch (e) {
+        throw createBrowserAuthError(
+            BrowserAuthErrorCodes.failedToBuildHeaders
+        );
     }
+}
 
-    private getHeaderDict(headers: Headers): Record<string, string> {
+/**
+ * Returns object representing response headers
+ * @param headers
+ * @returns
+ */
+function getHeaderDict(headers: Headers): Record<string, string> {
+    try {
         const headerDict: Record<string, string> = {};
         headers.forEach((value: string, key: string) => {
             headerDict[key] = value;
         });
         return headerDict;
+    } catch (e) {
+        throw createBrowserAuthError(
+            BrowserAuthErrorCodes.failedToParseHeaders
+        );
     }
 }

package/src/packageMetadata.ts

@@ -1,3 +1,3 @@
 /* eslint-disable header/header */
 export const name = "@azure/msal-browser";
-export const version = "3.26.1";
+export const version = "3.28.0";