Merge branch 'dev' into claims_bugfix

.github/workflows/msal-node-e2e.yml

@@ -32,7 +32,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                node: [16, 18, 20]
+                node: [16, 18, 20, 22]
                 sample:
                     - "auth-code"
                     - "auth-code-cli-app"

change/@azure-msal-browser-3e059f3a-cb8d-46c5-b5c9-dbce2766f95b.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Export invoke and invokeAsync functions #7065",
+  "packageName": "@azure/msal-browser",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@azure-msal-common-36d2e3a5-a377-457a-8f44-de8b7cfa68c2.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": " Fixed inconsistencies with cancellationToken (timeout)",
+  "packageName": "@azure/msal-common",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@azure-msal-node-09eb19fc-c2da-4430-8f1e-37987728ea16.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": " Fixed inconsistencies with cancellationToken (timeout)",
+  "packageName": "@azure/msal-node",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

lib/msal-browser/src/utils/BrowserUtils.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { UrlString } from "@azure/msal-common";
+import { UrlString, invoke, invokeAsync } from "@azure/msal-common";
 import {
     createBrowserAuthError,
     BrowserAuthErrorCodes,
@@ -206,3 +206,6 @@ export function preconnect(authority: string): void {
 export function createGuid(): string {
     return BrowserCrypto.createNewGuid();
 }
+
+export { invoke };
+export { invokeAsync };

lib/msal-common/src/network/INetworkModule.ts

@@ -31,7 +31,7 @@ export interface INetworkModule {
     sendGetRequestAsync<T>(
         url: string,
         options?: NetworkRequestOptions,
-        cancellationToken?: number
+        timeout?: number
     ): Promise<NetworkResponse<T>>;
 
     /**

lib/msal-common/src/utils/Constants.ts

@@ -64,22 +64,24 @@ export const Constants = {
 };
 
 export const HttpStatus = {
-    SUCCESS_RANGE_START: 200,
     SUCCESS: 200,
+    SUCCESS_RANGE_START: 200,
     SUCCESS_RANGE_END: 299,
     REDIRECT: 302,
+    CLIENT_ERROR: 400,
     CLIENT_ERROR_RANGE_START: 400,
     BAD_REQUEST: 400,
     UNAUTHORIZED: 401,
     NOT_FOUND: 404,
     REQUEST_TIMEOUT: 408,
     TOO_MANY_REQUESTS: 429,
     CLIENT_ERROR_RANGE_END: 499,
+    SERVER_ERROR: 500,
     SERVER_ERROR_RANGE_START: 500,
-    INTERNAL_SERVER_ERROR: 500,
     SERVICE_UNAVAILABLE: 503,
     GATEWAY_TIMEOUT: 504,
     SERVER_ERROR_RANGE_END: 599,
+    MULTI_SIDED_ERROR: 600,
 } as const;
 export type HttpStatus = (typeof HttpStatus)[keyof typeof HttpStatus];
 

lib/msal-node/README.md

@@ -88,7 +88,7 @@ Any major MSAL Node release:
 
 | MSAL Node version | MSAL support status | Supported Node versions |
 | ----------------- | ------------------- | ----------------------- |
-| 2.x.x             | Active development  | 16, 18, 20              |
+| 2.x.x             | Active development  | 16, 18, 20, 22          |
 | 1.x.x             | In maintenance      | 10, 12, 14, 16, 18      |
 
 **Note:** There have been no functional changes in the MSAL Node v2 release.

lib/msal-node/src/network/HttpClient.ts

@@ -36,23 +36,25 @@ export class HttpClient implements INetworkModule {
      */
     async sendGetRequestAsync<T>(
         url: string,
-        options?: NetworkRequestOptions
+        options?: NetworkRequestOptions,
+        timeout?: number
     ): Promise<NetworkResponse<T>> {
         if (this.proxyUrl) {
             return networkRequestViaProxy(
                 url,
                 this.proxyUrl,
                 HttpMethod.GET,
                 options,
-                this.customAgentOptions as http.AgentOptions
+                this.customAgentOptions as http.AgentOptions,
+                timeout
             );
         } else {
             return networkRequestViaHttps(
                 url,
                 HttpMethod.GET,
                 options,
                 this.customAgentOptions as https.AgentOptions,
-                undefined
+                timeout
             );
         }
     }
@@ -64,25 +66,22 @@ export class HttpClient implements INetworkModule {
      */
     async sendPostRequestAsync<T>(
         url: string,
-        options?: NetworkRequestOptions,
-        cancellationToken?: number
+        options?: NetworkRequestOptions
     ): Promise<NetworkResponse<T>> {
         if (this.proxyUrl) {
             return networkRequestViaProxy(
                 url,
                 this.proxyUrl,
                 HttpMethod.POST,
                 options,
-                this.customAgentOptions as http.AgentOptions,
-                cancellationToken
+                this.customAgentOptions as http.AgentOptions
             );
         } else {
             return networkRequestViaHttps(
                 url,
                 HttpMethod.POST,
                 options,
-                this.customAgentOptions as https.AgentOptions,
-                cancellationToken
+                this.customAgentOptions as https.AgentOptions
             );
         }
     }
@@ -109,10 +108,6 @@ const networkRequestViaProxy = <T>(
         headers: headers,
     };
 
-    if (timeout) {
-        tunnelRequestOptions.timeout = timeout;
-    }
-
     if (agentOptions && Object.keys(agentOptions).length) {
         tunnelRequestOptions.agent = new http.Agent(agentOptions);
     }
@@ -125,6 +120,11 @@ const networkRequestViaProxy = <T>(
             "Content-Type: application/x-www-form-urlencoded\r\n" +
             `Content-Length: ${body.length}\r\n` +
             `\r\n${body}`;
+    } else {
+        // optional timeout is only for get requests (regionDiscovery, for example)
+        if (timeout) {
+            tunnelRequestOptions.timeout = timeout;
+        }
     }
     const outgoingRequestString =
         `${httpMethod.toUpperCase()} ${destinationUrl.href} HTTP/1.1\r\n` +
@@ -136,7 +136,7 @@ const networkRequestViaProxy = <T>(
     return new Promise<NetworkResponse<T>>((resolve, reject) => {
         const request = http.request(tunnelRequestOptions);
 
-        if (tunnelRequestOptions.timeout) {
+        if (timeout) {
             request.on("timeout", () => {
                 request.destroy();
                 reject(new Error("Request time out"));
@@ -165,14 +165,6 @@ const networkRequestViaProxy = <T>(
                     )
                 );
             }
-            if (tunnelRequestOptions.timeout) {
-                socket.setTimeout(tunnelRequestOptions.timeout);
-                socket.on("timeout", () => {
-                    request.destroy();
-                    socket.destroy();
-                    reject(new Error("Request time out"));
-                });
-            }
 
             // make a request over an HTTP tunnel
             socket.write(outgoingRequestString);
@@ -291,10 +283,6 @@ const networkRequestViaHttps = <T>(
         ...NetworkUtils.urlToHttpOptions(url),
     };
 
-    if (timeout) {
-        customOptions.timeout = timeout;
-    }
-
     if (agentOptions && Object.keys(agentOptions).length) {
         customOptions.agent = new https.Agent(agentOptions);
     }
@@ -305,6 +293,11 @@ const networkRequestViaHttps = <T>(
             ...customOptions.headers,
             "Content-Length": body.length,
         };
+    } else {
+        // optional timeout is only for get requests (regionDiscovery, for example)
+        if (timeout) {
+            customOptions.timeout = timeout;
+        }
     }
 
     return new Promise<NetworkResponse<T>>((resolve, reject) => {
@@ -316,17 +309,17 @@ const networkRequestViaHttps = <T>(
             request = https.request(customOptions);
         }
 
+        if (isPostRequest) {
+            request.write(body);
+        }
+
         if (timeout) {
             request.on("timeout", () => {
                 request.destroy();
                 reject(new Error("Request time out"));
             });
         }
 
-        if (isPostRequest) {
-            request.write(body);
-        }
-
         request.end();
 
         request.on("response", (response) => {

lib/msal-node/src/utils/Constants.ts

@@ -65,9 +65,10 @@ export const HttpMethod = {
 export type HttpMethod = (typeof HttpMethod)[keyof typeof HttpMethod];
 
 export const ProxyStatus = {
-    SUCCESS_RANGE_START: 200,
-    SUCCESS_RANGE_END: 299,
-    SERVER_ERROR: 500,
+    SUCCESS: HttpStatus.SUCCESS,
+    SUCCESS_RANGE_START: HttpStatus.SUCCESS_RANGE_START,
+    SUCCESS_RANGE_END: HttpStatus.SUCCESS_RANGE_END,
+    SERVER_ERROR: HttpStatus.SERVER_ERROR,
 } as const;
 export type ProxyStatus = (typeof ProxyStatus)[keyof typeof ProxyStatus];
 
@@ -160,7 +161,7 @@ export const MANAGED_IDENTITY_HTTP_STATUS_CODES_TO_RETRY_ON = [
     HttpStatus.NOT_FOUND,
     HttpStatus.REQUEST_TIMEOUT,
     HttpStatus.TOO_MANY_REQUESTS,
-    HttpStatus.INTERNAL_SERVER_ERROR,
+    HttpStatus.SERVER_ERROR,
     HttpStatus.SERVICE_UNAVAILABLE,
     HttpStatus.GATEWAY_TIMEOUT,
 ];