feat(ggshield-configuration): fetch API key from config list

Author: salome-voltz

src/extension.ts

@@ -167,7 +167,10 @@ export function activate(context: ExtensionContext) {
         updateStatusBarItem(StatusBarStatus.unauthenticated, statusBar);
        } else {
         commands.executeCommand('setContext', 'isAuthenticated', true);
-       }
+        updateStatusBarItem(StatusBarStatus.ready, statusBar);
+        const ggshieldApi = ggshieldApiKey(configuration);
+        setApiKey(configuration, ggshieldApi);
+      }
     })
     .then(async () => {
       // Check if git is installed
@@ -235,7 +238,8 @@ export function activate(context: ExtensionContext) {
             authStatus = true;
             updateStatusBarItem(StatusBarStatus.ready, statusBar);
             commands.executeCommand('setContext', 'isAuthenticated', true);
-            setApiKey(configuration, ggshieldApiKey(configuration));
+            const ggshieldApi = ggshieldApiKey(configuration);
+            setApiKey(configuration, ggshieldApi);
             ggshieldViewProvider.refresh();
             ggshieldQuotaViewProvider.refresh();
           } else {

src/lib/ggshield-api.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 import {
   SpawnOptionsWithoutStdio,
   SpawnSyncOptionsWithStringEncoding,
@@ -22,17 +23,25 @@ export function runGGShieldCommand(
   args: string[]
 ): SpawnSyncReturns<string> {
   const { ggshieldPath, apiUrl, apiKey } = configuration;
+  let env: {
+    GITGUARDIAN_API_URL: string;
+    GG_USER_AGENT: string;
+    GITGUARDIAN_API_KEY?: string; // Note the ? to indicate this property is optional
+  } = {
+    GITGUARDIAN_API_URL: apiUrl,
+    GG_USER_AGENT: "gitguardian-vscode",
+  };
+  
+  if (apiKey) {
+    env = {
+      ...env,
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      GITGUARDIAN_API_KEY: apiKey,
+    };
+  }
 
   let options: SpawnSyncOptionsWithStringEncoding = {
     cwd: os.tmpdir(),
-    env: {
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      GITGUARDIAN_API_URL: apiUrl,
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      GG_USER_AGENT: "gitguardian-vscode",
-      //eslint-disable-next-line @typescript-eslint/naming-convention
-      GITGUARDIAN_API_KEY: apiKey,
-    },
     encoding: "utf-8",
     windowsHide: true,
   };
@@ -249,9 +258,18 @@ export function ggshieldApiKey(
     return undefined;
   } else {
     console.log(proc.stdout);
-    const regexToken = /token: ([a-zA-Z0-9]+)/;  
-    const matchToken = proc.stdout.match(regexToken);
-  
-    return matchToken ? matchToken[1].trim() : undefined;
+    const apiUrl = configuration.apiUrl;
+    const re = /api/;
+
+    const regexInstanceSection = `\\[${apiUrl.replace(re, "dashboard")}\\]([\\s\\S]*?)(?=\\[|$)`;
+    const instanceSectionMatch = proc.stdout.match(regexInstanceSection);
+
+    if (instanceSectionMatch) {
+      const instanceSection = instanceSectionMatch[0];
+      const regexToken = /token:\s([a-zA-Z0-9]+)/;
+      const matchToken = instanceSection.match(regexToken);
+      
+      return matchToken ? matchToken[1].trim() : undefined;
+    }
   }
 }

src/lib/ggshield-configuration.ts

@@ -1,5 +1,5 @@
 import { getBinaryAbsolutePath } from "./ggshield-resolver-utils";
-import { ExtensionContext, workspace } from "vscode";
+import { ConfigurationTarget, ExtensionContext, workspace } from "vscode";
 import * as os from "os";
 
 const apiUrlDefault = "https://api.gitguardian.com/";
@@ -43,6 +43,7 @@ export function setApiKey(configuration: GGShieldConfiguration, apiKey: string |
   if (!apiKey) {
     throw new Error("Missing API Key");
   }
+
   configuration.apiKey = apiKey;
-  config.update("apiKey", apiKey);
+  config.update("apiKey", apiKey, ConfigurationTarget.Global);
 }