Fetch server info via servermanager extension, including passwords from keychain

Author: gjsjohnmurray

src/api/index.ts

@@ -5,6 +5,7 @@ import * as url from "url";
 import * as vscode from "vscode";
 import * as Cache from "vscode-cache";
 import {
+  getResolvedConnectionSpec,
   config,
   extensionContext,
   FILESYSTEM_SCHEMA,
@@ -169,7 +170,7 @@ export class AtelierAPI {
         webServer: { scheme, host, port, pathPrefix = "" },
         username,
         password,
-      } = config("intersystems.servers", workspaceFolderName).get(serverName);
+      } = getResolvedConnectionSpec(serverName, config("intersystems.servers", workspaceFolderName).get(serverName));
       this._config = {
         active: this.externalServer || conn.active,
         apiVersion: 1,

src/extension.ts

@@ -154,6 +154,15 @@ let connectionSocket: WebSocket;
 
 let serverManagerApi: any;
 
+// Map of the intersystems.server connection specs we have resolved via the API to that extension
+const resolvedConnSpecs = new Map<string, any>();
+
+// Accessor for the connection specs
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export function getResolvedConnectionSpec(key: string, dflt: any): any {
+  return resolvedConnSpecs.has(key) ? resolvedConnSpecs.get(key) : dflt;
+}
+
 export function checkConnection(clearCookies = false, uri?: vscode.Uri): void {
   const { apiTarget, configName } = connectionTarget(uri);
   if (clearCookies) {
@@ -339,14 +348,14 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     reporter = new TelemetryReporter(extensionId, extensionVersion, aiKey);
   }
 
-  // Get api for servermanager extension, perhaps offering to install it
-  serverManagerApi = await serverManager();
-
   const languages = packageJson.contributes.languages.map((lang) => lang.id);
   workspaceState = context.workspaceState;
   extensionContext = context;
   workspaceState.update("workspaceFolder", "");
 
+  // Get api for servermanager extension, perhaps offering to install it
+  serverManagerApi = await serverManager();
+
   documentContentProvider = new DocumentContentProvider();
   xmlContentProvider = new XmlContentProvider();
   fileSystemProvider = new FileSystemProvider();
@@ -375,7 +384,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     const { configName } = connectionTarget(uri);
     toCheck.set(configName, uri);
   });
-  toCheck.forEach(function (uri) {
+  toCheck.forEach(async function (uri, configName) {
+    if (serverManagerApi && serverManagerApi.getServerSpec) {
+      const connSpec = await serverManagerApi.getServerSpec(configName);
+      if (connSpec) {
+        resolvedConnSpecs.set(configName, connSpec);
+      }
+    }
     checkConnection(true, uri);
   });