[Identity] Remove express

sdk/identity/identity/package.json

@@ -87,9 +87,10 @@
     "@azure/msal-browser": "2.9.0",
     "@opentelemetry/api": "^0.10.2",
     "@types/express": "^4.16.0",
+    "@types/stoppable": "^1.1.0",
+    "stoppable": "^1.1.0",
     "axios": "^0.21.1",
     "events": "^3.0.0",
-    "express": "^4.16.3",
     "jws": "^4.0.0",
     "msal": "^1.0.2",
     "open": "^7.0.0",

sdk/identity/identity/src/credentials/interactiveBrowserCredential.ts

@@ -11,9 +11,10 @@ import { Socket } from "net";
 import { AuthenticationRequired, MsalClient } from "../client/msalClient";
 import { AuthorizationCodeRequest } from "@azure/msal-node";
 
-import express from "express";
 import open from "open";
 import http from "http";
+import stoppable from "stoppable";
+
 import { checkTenantId } from "../util/checkTenantId";
 
 const logger = credentialLogger("InteractiveBrowserCredential");
@@ -26,6 +27,7 @@ const logger = credentialLogger("InteractiveBrowserCredential");
 export class InteractiveBrowserCredential implements TokenCredential {
   private redirectUri: string;
   private port: number;
+  private hostname: string;
   private msalClient: MsalClient;
 
   constructor(options?: InteractiveBrowserCredentialOptions) {
@@ -53,6 +55,8 @@ export class InteractiveBrowserCredential implements TokenCredential {
       this.port = 80;
     }
 
+    this.hostname = url.hostname;
+
     let authorityHost;
     if (options && options.authorityHost) {
       if (options.authorityHost.endsWith("/")) {
@@ -116,24 +120,14 @@ export class InteractiveBrowserCredential implements TokenCredential {
     // eslint-disable-next-line
     return new Promise<AccessToken | null>(async (resolve, reject) => {
       // eslint-disable-next-line
-      let listen: http.Server | undefined;
       let socketToDestroy: Socket | undefined;
 
-      function cleanup(): void {
-        if (listen) {
-          listen.close();
-        }
-        if (socketToDestroy) {
-          socketToDestroy.destroy();
-        }
-      }
-
       // Create Express App and Routes
-      const app = express();
 
-      app.get("/", async (req, res) => {
+      const requestListener = async (req: http.IncomingMessage, res: http.ServerResponse) => {
+        const url = new URL(req.url!, this.redirectUri);
         const tokenRequest: AuthorizationCodeRequest = {
-          code: req.query.code as string,
+          code: url.searchParams.get("code")!,
           redirectUri: this.redirectUri,
           scopes: scopeArray
         };
@@ -143,7 +137,8 @@ export class InteractiveBrowserCredential implements TokenCredential {
           const successMessage = `Authentication Complete. You can close the browser and return to the application.`;
           if (authResponse && authResponse.expiresOn) {
             const expiresOnTimestamp = authResponse?.expiresOn.valueOf();
-            res.status(200).send(successMessage);
+            res.writeHead(200);
+            res.end(successMessage);
             logger.getToken.info(formatSuccess(scopeArray));
 
             resolve({
@@ -160,27 +155,44 @@ export class InteractiveBrowserCredential implements TokenCredential {
         } catch (error) {
           const errorMessage = formatError(
             scopeArray,
-            `${req.query["error"]}. ${req.query["error_description"]}`
+            `${url.searchParams.get("error")}. ${url.searchParams.get("error_description")}`
           );
-          res.status(500).send(errorMessage);
+          res.writeHead(500);
+          res.end(errorMessage);
           logger.getToken.info(errorMessage);
           reject(new Error(errorMessage));
         } finally {
           cleanup();
         }
-      });
+      };
+      const app = http.createServer(requestListener);
 
-      listen = app.listen(this.port, () =>
+      const listen = app.listen(this.port, this.hostname, () =>
         logger.info(`InteractiveBrowerCredential listening on port ${this.port}!`)
       );
-      listen.on("connection", (socket) => (socketToDestroy = socket));
+      app.on("connection", (socket) => (socketToDestroy = socket));
+      const server = stoppable(app);
 
       try {
         await this.openAuthCodeUrl(scopeArray);
       } catch (e) {
         cleanup();
         throw e;
       }
+
+      function cleanup(): void {
+        if (listen) {
+          listen.close();
+        }
+        if (socketToDestroy) {
+          socketToDestroy.destroy();
+        }
+
+        if (server) {
+          server.close();
+          server.stop();
+        }
+      }
     });
   }
 }