Merge pull request #227 from gjsjohnmurray/fix-224

Fetch keychain-stored password when objectscript.conn.server is specified

Author: gjsjohnmurray

README.md

@@ -43,14 +43,19 @@ We recommend you define server connections in the `intersystems.servers` object
 				"host": "127.0.0.1",
 				"port": 52773
 			},
-      "description": "My local IRIS",
-      "username": "me"
+      		"description": "My local IRIS",
+      		"username": "me"
 		}
   }
 ```
-Setting the `username` property is optional. If omitted it will be prompted for when connecting.
 
-By defining connections in your User Settings they become available for use by any workspace you open in VSCode.
+By defining connections in your User Settings they become available for use by any workspace you open in VSCode. Alternatively, define them in workspace-specific settings.
+
+Setting the `username` property is optional. If omitted it will be prompted for when connecting, then cached for the session..
+
+Setting a plaintext value for the `password` property is not recommended. Instead, run the `InterSystems Server Manager: Store Password in Keychain` command from Command Palette.
+
+If no password has been set or stored it will be prompted for when connecting, then cached for the session.
 
 ### Client-side Editing
 
@@ -66,7 +71,9 @@ We recommend that `objectscript.conn` uses its `server` property to point to an
   }
 ```
 
-The mandatory `ns` property defines which server namespace you will work with. If `username` is set here it overrides that setting from the `intersystems.servers` entry.
+The mandatory `ns` property defines which server namespace you will work with.
+
+When the `server` property is set, any `username` or `password` properties of `objectscript.conn` are ignored. Instead these values come from the `intersystems.servers` entry.
 
 ### Server-side Editing
 

src/extension.ts

@@ -388,9 +388,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
   });
   toCheck.forEach(async function (uri, configName) {
     if (serverManagerApi && serverManagerApi.getServerSpec) {
-      const connSpec = await serverManagerApi.getServerSpec(configName);
-      if (connSpec) {
-        resolvedConnSpecs.set(configName, connSpec);
+      const serverName = uri.scheme === "file" ? config("conn", configName).server : configName;
+      if (serverName && serverName !== "" && !resolvedConnSpecs.has(serverName)) {
+        const connSpec = await serverManagerApi.getServerSpec(serverName);
+        if (connSpec) {
+          resolvedConnSpecs.set(serverName, connSpec);
+        }
       }
     }
     checkConnection(true, uri);