WIP

Author: gjsjohnmurray

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-objectscript",
   "displayName": "InterSystems ObjectScript",
   "description": "InterSystems ObjectScript language support for Visual Studio Code",
-  "version": "1.1.2-SNAPSHOT",
+  "version": "1.1.2-SNAPSHOT-authentication-provider-20211126",
   "icon": "images/logo.png",
   "aiKey": "9cd75d51-697c-406c-a929-2bcf46e97c64",
   "categories": [
@@ -47,9 +47,8 @@
     }
   ],
   "engines": {
-    "vscode": "^1.43.0"
+    "vscode": "^1.63.0"
   },
-  "enableProposedApi": true,
   "enabledApiProposals": [
     "fileSearchProvider",
     "textSearchProvider"
@@ -1127,7 +1126,6 @@
     "@types/mocha": "^7.0.2",
     "@types/node": "^14.0.14",
     "@types/request": "^2.48.5",
-    "@types/vscode": "^1.43.0",
     "@types/ws": "^7.2.5",
     "@types/xmldom": "^0.1.29",
     "@typescript-eslint/eslint-plugin": "^4.32.0",

package.json

@@ -181,12 +181,30 @@ export async function resolveConnectionSpec(serverName: string): Promise<void> {
     if (serverName && serverName !== "" && !resolvedConnSpecs.has(serverName)) {
       const connSpec = await serverManagerApi.getServerSpec(serverName);
       if (connSpec) {
+        await resolvePassword(connSpec);
         resolvedConnSpecs.set(serverName, connSpec);
       }
     }
   }
 }
 
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export async function resolvePassword(serverSpec): Promise<void> {
+  const AUTHENTICATION_PROVIDER = "intersystems-server-credentials";
+  // This arises if setting says to use authentication provider
+  if (typeof serverSpec.password === "undefined") {
+    const scopes = [serverSpec.name, serverSpec.username || ""];
+    let session = await vscode.authentication.getSession(AUTHENTICATION_PROVIDER, scopes, { silent: true });
+    if (!session) {
+      session = await vscode.authentication.getSession(AUTHENTICATION_PROVIDER, scopes, { createIfNone: true });
+    }
+    if (session) {
+      serverSpec.username = session.scopes[1];
+      serverSpec.password = session.accessToken;
+    }
+  }
+}
+
 // Accessor for the cache of resolved connection specs
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export function getResolvedConnectionSpec(key: string, dflt: any): any {