[Identity] Update logging and dependency versions for MSAL (#23960)

KarishmaGhiya · KarishmaGhiya · commit fb1d2b292011 · 2022-12-05T15:59:27.000-08:00
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/sdk/identity/identity/CHANGELOG.md b/sdk/identity/identity/CHANGELOG.md
@@ -1,5 +1,4 @@
 # Release History
-
 ## 3.1.2 (Unreleased)
 
 ### Features Added
@@ -8,8 +7,11 @@
 
 ### Bugs Fixed
 
+- Enable msal logging based on log level specified by user.
 ### Other Changes
 
+- Upgraded version dependencies on msal libraries, since they have additional logging enabled.
+
 ## 3.1.1 (2022-11-18)
 
 ### Bugs Fixed
diff --git a/sdk/identity/identity/package.json b/sdk/identity/identity/package.json
@@ -110,9 +110,9 @@
     "@azure/core-tracing": "^1.0.0",
     "@azure/core-util": "^1.0.0",
     "@azure/logger": "^1.0.0",
-    "@azure/msal-browser": "^2.26.0",
-    "@azure/msal-common": "^7.0.0",
-    "@azure/msal-node": "^1.14.2",
+    "@azure/msal-browser": "^2.32.0",
+    "@azure/msal-common": "^9.0.0",
+    "@azure/msal-node": "^1.14.4",
     "events": "^3.0.0",
     "jws": "^4.0.0",
     "open": "^8.0.0",
diff --git a/sdk/identity/identity/src/msal/browserFlows/msalAuthCode.ts b/sdk/identity/identity/src/msal/browserFlows/msalAuthCode.ts
@@ -3,11 +3,12 @@
 
 import * as msalBrowser from "@azure/msal-browser";
 import { MsalBrowser, MsalBrowserFlowOptions } from "./msalBrowserCommon";
-import { defaultLoggerCallback, msalToPublic, publicToMsal } from "../utils";
+import { defaultLoggerCallback, msalToPublic, publicToMsal, getMSALLogLevel } from "../utils";
 import { AccessToken } from "@azure/core-auth";
 import { AuthenticationRecord } from "../types";
 import { AuthenticationRequiredError } from "../../errors";
 import { CredentialFlowGetTokenOptions } from "../credentials";
+import { getLogLevel } from "@azure/logger";
 
 // We keep a copy of the redirect hash.
 const redirectHash = self.location.hash;
@@ -38,6 +39,7 @@ export class MSALAuthCode extends MsalBrowser {
     this.msalConfig.system = {
       loggerOptions: {
         loggerCallback: defaultLoggerCallback(this.logger, "Browser"),
+        logLevel: getMSALLogLevel(getLogLevel()),
       },
     };
 
diff --git a/sdk/identity/identity/src/msal/nodeFlows/msalNodeCommon.ts b/sdk/identity/identity/src/msal/nodeFlows/msalNodeCommon.ts
@@ -4,13 +4,15 @@
 import * as msalCommon from "@azure/msal-common";
 import * as msalNode from "@azure/msal-node";
 import { AccessToken, GetTokenOptions } from "@azure/core-auth";
+import { getLogLevel } from "@azure/logger";
 import {
   MsalBaseUtilities,
   defaultLoggerCallback,
   getAuthority,
   getKnownAuthorities,
   msalToPublic,
   publicToMsal,
+  getMSALLogLevel,
 } from "../utils";
 import { MsalFlow, MsalFlowOptions } from "../flows";
 import {
@@ -163,6 +165,7 @@ export abstract class MsalNode extends MsalBaseUtilities implements MsalFlow {
         networkClient: this.identityClient,
         loggerOptions: {
           loggerCallback: defaultLoggerCallback(options.logger),
+          logLevel: getMSALLogLevel(getLogLevel()),
         },
       },
     };
diff --git a/sdk/identity/identity/src/msal/utils.ts b/sdk/identity/identity/src/msal/utils.ts
@@ -12,6 +12,7 @@ import { AbortError } from "@azure/abort-controller";
 import { MsalFlowOptions } from "./flows";
 import { isNode } from "@azure/core-util";
 import { v4 as uuidv4 } from "uuid";
+import { AzureLogLevel } from "@azure/logger";
 
 /**
  * Latest AuthenticationRecord version
@@ -110,6 +111,25 @@ export const defaultLoggerCallback: (
     }
   };
 
+/**
+ * @internal
+ */
+export function getMSALLogLevel(logLevel: AzureLogLevel | undefined): msalCommon.LogLevel {
+  switch (logLevel) {
+    case "error":
+      return msalCommon.LogLevel.Error;
+    case "info":
+      return msalCommon.LogLevel.Info;
+    case "verbose":
+      return msalCommon.LogLevel.Verbose;
+    case "warning":
+      return msalCommon.LogLevel.Warning;
+    default:
+      // default msal logging level should be Info
+      return msalCommon.LogLevel.Info;
+  }
+}
+
 /**
  * The common utility functions for the MSAL clients.
  * Defined as a class so that the classes extending this one can have access to its methods and protected properties.
