SM-1227: Removed debug logging from Bitwarden SDK

bitwarden · Jun 11, 2024 · bb10f4f · bb10f4f
1 parent 2ce923b
commit bb10f4f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 60 deletions.
diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
@@ -25,7 +25,6 @@ let setFailedMock: jest.SpyInstance;
 let setSecretMock: jest.SpyInstance;
 let exportVariableMock: jest.SpyInstance;
 let setOutputMock: jest.SpyInstance;
-let setDebugMock: jest.SpyInstance;
 
 // Mock the Bitwarden SDK
 const secretsClientMock = jest.fn();
@@ -54,7 +53,6 @@ describe("action", () => {
     setSecretMock = jest.spyOn(core, "setSecret").mockImplementation();
     exportVariableMock = jest.spyOn(core, "exportVariable").mockImplementation();
     setOutputMock = jest.spyOn(core, "setOutput").mockImplementation();
-    setDebugMock = jest.spyOn(core, "isDebug").mockReturnValue(false);
   });
 
   describe("sets a failed status", () => {
@@ -173,7 +171,6 @@ describe("action", () => {
           identityUrl: DEFAULT_IDENTITY_URL,
           apiUrl: DEFAULT_API_URL,
         } as ClientSettings,
-        false,
       ],
       [
         "base_url provided",
@@ -186,7 +183,6 @@ describe("action", () => {
           identityUrl: "https://bitwarden.example.com/identity",
           apiUrl: "https://bitwarden.example.com/api",
         } as ClientSettings,
-        false,
       ],
       [
         "identity_url provided",
@@ -199,7 +195,6 @@ describe("action", () => {
           identityUrl: "https://identity.bitwarden.example.com",
           apiUrl: DEFAULT_API_URL,
         } as ClientSettings,
-        false,
       ],
       [
         "api_url provided",
@@ -212,7 +207,6 @@ describe("action", () => {
           identityUrl: DEFAULT_IDENTITY_URL,
           apiUrl: "https://api.bitwarden.example.com",
         } as ClientSettings,
-        false,
       ],
       [
         "api_url and identity_url provided",
@@ -225,58 +219,35 @@ describe("action", () => {
           identityUrl: "https://identity.bitwarden.example.com",
           apiUrl: "https://api.bitwarden.example.com",
         } as ClientSettings,
-        false,
       ],
-      [
-        "debug logging enabled",
-        {
-          baseUrl: DEFAULT_BASE_URL,
-          identityUrl: DEFAULT_IDENTITY_URL,
-          apiUrl: DEFAULT_API_URL,
-        } as OptionalInputs,
+    ])("%s", async (_, optionalInputs: OptionalInputs, expectedClientSettings: ClientSettings) => {
+      mockInputs({
+        accessToken: TEST_ACCESS_TOKEN,
+        secrets: [] as string[],
+        ...optionalInputs,
+      } as Inputs);
+      mockSecretsGetByIdResponse({
+        success: true,
+        data: {
+          data: [],
+        },
+      });
+
+      await main.run();
+
+      expect(setFailedMock).not.toHaveBeenCalled();
+      expect(errorMock).not.toHaveBeenCalled();
+      expect(setSecretMock).not.toHaveBeenCalled();
+      expect(bitwardenClientMock).toHaveBeenCalledTimes(1);
+      expect(bitwardenClientMock).toHaveBeenCalledWith([
         {
-          identityUrl: DEFAULT_IDENTITY_URL,
-          apiUrl: DEFAULT_API_URL,
+          deviceType: DeviceType.SDK,
+          userAgent: "bitwarden/sm-action",
+          ...expectedClientSettings,
         } as ClientSettings,
-        true,
-      ],
-    ])(
-      "%s",
-      async (
-        _,
-        optionalInputs: OptionalInputs,
-        expectedClientSettings: ClientSettings,
-        isDebugEnabled: boolean,
-      ) => {
-        mockInputs({
-          accessToken: TEST_ACCESS_TOKEN,
-          secrets: [] as string[],
-          ...optionalInputs,
-        } as Inputs);
-        mockSecretsGetByIdResponse({
-          success: true,
-          data: {
-            data: [],
-          },
-        });
-        setDebugMock.mockReturnValue(isDebugEnabled);
-
-        await main.run();
-
-        expect(setFailedMock).not.toHaveBeenCalled();
-        expect(errorMock).not.toHaveBeenCalled();
-        expect(setSecretMock).not.toHaveBeenCalled();
-        expect(bitwardenClientMock).toHaveBeenCalledTimes(1);
-        expect(bitwardenClientMock).toHaveBeenCalledWith([
-          {
-            deviceType: DeviceType.SDK,
-            userAgent: "bitwarden/sm-action",
-            ...expectedClientSettings,
-          } as ClientSettings,
-          isDebugEnabled ? LogLevel.Debug : LogLevel.Info,
-        ]);
-      },
-    );
+        LogLevel.Info,
+      ]);
+    });
   });
 
   describe("sets secrets", () => {

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/main.ts b/src/main.ts
@@ -93,9 +93,7 @@ async function getBitwardenClient(inputs: Inputs): Promise<BitwardenClient> {
     deviceType: DeviceType.SDK,
   };
 
-  const logLevel = core.isDebug() ? LogLevel.Debug : LogLevel.Info;
-
-  const client = new BitwardenClient(settings, logLevel);
+  const client = new BitwardenClient(settings, LogLevel.Info);
   const result = await client.loginWithAccessToken(inputs.accessToken);
   if (!result.success) {
     throw Error(`Authentication with Bitwarden failed.\nError: ${result.errorMessage}`);