Fixed http(s) import errors in msal-node (#6349)

AzureAD · Aug 16, 2023 · 4d23a90 · 4d23a90
1 parent b0aff05
commit 4d23a90
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/change/@azure-msal-node-ed5d8419-81d8-4314-9e52-6ffa43e31e33.json b/change/@azure-msal-node-ed5d8419-81d8-4314-9e52-6ffa43e31e33.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fixed http(s) imports #6349",
+  "packageName": "@azure/msal-node",
+  "email": "rginsburg@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/lib/msal-node/src/config/Configuration.ts b/lib/msal-node/src/config/Configuration.ts
@@ -16,8 +16,8 @@ import {
     INativeBrokerPlugin,
 } from "@azure/msal-common";
 import { HttpClient } from "../network/HttpClient";
-import { AgentOptions as httpAgentOptions } from "http";
-import { AgentOptions as httpsAgentOptions } from "https";
+import http from "http";
+import https from "https";
 
 /**
  * - clientId               - Client id of the application.
@@ -82,7 +82,7 @@ export type NodeSystemOptions = {
     loggerOptions?: LoggerOptions;
     networkClient?: INetworkModule;
     proxyUrl?: string;
-    customAgentOptions?: httpAgentOptions | httpsAgentOptions;
+    customAgentOptions?: http.AgentOptions | https.AgentOptions;
 };
 
 export type NodeTelemetryOptions = {
@@ -145,7 +145,7 @@ const DEFAULT_SYSTEM_OPTIONS: Required<NodeSystemOptions> = {
     loggerOptions: DEFAULT_LOGGER_OPTIONS,
     networkClient: new HttpClient(),
     proxyUrl: Constants.EMPTY_STRING,
-    customAgentOptions: {} as httpAgentOptions | httpsAgentOptions,
+    customAgentOptions: {} as http.AgentOptions | https.AgentOptions,
 };
 
 const DEFAULT_TELEMETRY_OPTIONS: Required<NodeTelemetryOptions> = {
@@ -186,7 +186,7 @@ export function buildAppConfiguration({
         ...DEFAULT_SYSTEM_OPTIONS,
         networkClient: new HttpClient(
             system?.proxyUrl,
-            system?.customAgentOptions as httpAgentOptions | httpsAgentOptions
+            system?.customAgentOptions as http.AgentOptions | https.AgentOptions
         ),
         loggerOptions: system?.loggerOptions || DEFAULT_LOGGER_OPTIONS,
     };

diff --git a/lib/msal-node/src/network/LoopbackClient.ts b/lib/msal-node/src/network/LoopbackClient.ts
@@ -8,7 +8,7 @@ import {
     ServerAuthorizationCodeResponse,
     UrlString,
 } from "@azure/msal-common";
-import { createServer, IncomingMessage, Server, ServerResponse } from "http";
+import http from "http";
 import { NodeAuthError } from "../error/NodeAuthError";
 import {
     Constants,
@@ -18,7 +18,7 @@ import {
 import { ILoopbackClient } from "./ILoopbackClient";
 
 export class LoopbackClient implements ILoopbackClient {
-    private server: Server;
+    private server: http.Server;
 
     /**
      * Spins up a loopback server which returns the server response when the localhost redirectUri is hit
@@ -36,8 +36,11 @@ export class LoopbackClient implements ILoopbackClient {
 
         const authCodeListener = new Promise<ServerAuthorizationCodeResponse>(
             (resolve, reject) => {
-                this.server = createServer(
-                    async (req: IncomingMessage, res: ServerResponse) => {
+                this.server = http.createServer(
+                    async (
+                        req: http.IncomingMessage,
+                        res: http.ServerResponse
+                    ) => {
                         const url = req.url;
                         if (!url) {
                             res.end(

diff --git a/samples/msal-node-samples/ElectronSystemBrowserTestApp/src/CustomLoopbackClient.ts b/samples/msal-node-samples/ElectronSystemBrowserTestApp/src/CustomLoopbackClient.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { createServer, IncomingMessage, Server, ServerResponse } from "http";
+import http from "http";
 import { ILoopbackClient, ServerAuthorizationCodeResponse } from "@azure/msal-node";
 
 /**
@@ -13,7 +13,7 @@ import { ILoopbackClient, ServerAuthorizationCodeResponse } from "@azure/msal-no
  */
 export class CustomLoopbackClient implements ILoopbackClient {
     port: number = 0; // default port, which will be set to a random available port
-    private server: Server;
+    private server: http.Server;
 
     private constructor(port: number = 0) {
         this.port = port;
@@ -52,7 +52,7 @@ export class CustomLoopbackClient implements ILoopbackClient {
         }
 
         const authCodeListener = new Promise<ServerAuthorizationCodeResponse>((resolve, reject) => {
-            this.server = createServer(async (req: IncomingMessage, res: ServerResponse) => {
+            this.server = http.createServer(async (req: http.IncomingMessage, res: http.ServerResponse) => {
                 const url = req.url;
                 if (!url) {
                     res.end(errorTemplate || "Error occurred loading redirectUrl");
@@ -129,7 +129,7 @@ export class CustomLoopbackClient implements ILoopbackClient {
      */
     isPortAvailable(port: number): Promise<boolean> {
         return new Promise(resolve => {
-            const server = createServer()
+            const server = http.createServer()
                 .listen(port, () => {
                     server.close();
                     resolve(true);

diff --git a/samples/msal-node-samples/client-credentials-distributed-cache/src/ProvisionHandler.ts b/samples/msal-node-samples/client-credentials-distributed-cache/src/ProvisionHandler.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { createServer, IncomingMessage, Server, ServerResponse } from "http";
+import http from "http";
 import { CryptoProvider } from "@azure/msal-node";
 import open from "open";
 
@@ -13,7 +13,7 @@ import open from "open";
  * https://learn.microsoft.com/azure/active-directory/develop/single-and-multi-tenant-apps
  */
 class ProvisionHandler {
-    private server: Server;
+    private server: http.Server;
     private cryptoProvider: CryptoProvider;
     private state: string;
 
@@ -64,7 +64,7 @@ class ProvisionHandler {
         }
 
         const adminConsentListener = new Promise<boolean>((resolve, reject) => {
-            this.server = createServer(async (req: IncomingMessage, res: ServerResponse) => {
+            this.server = http.createServer(async (req: http.IncomingMessage, res: http.ServerResponse) => {
                 const url = req.url;
 
                 if (!url) {