Prevent overprompting for permission and account

Requires Server Manager 3.8.0

src/extension.ts

@@ -4,6 +4,7 @@ export const smExtensionId = "intersystems-community.servermanager";
 
 import vscode = require("vscode");
 import * as semver from "semver";
+import * as serverManager from "@intersystems-community/intersystems-servermanager";
 
 import { AtelierJob, Content, Response, ServerInfo } from "./api/atelier";
 export const OBJECTSCRIPT_FILE_SCHEMA = "objectscript";
@@ -198,7 +199,7 @@ let reporter: TelemetryReporter = null;
 
 export let checkingConnection = false;
 
-let serverManagerApi: any;
+let serverManagerApi: serverManager.ServerManagerAPI;
 
 // Map of the intersystems.server connection specs we have resolved via the API to that extension
 const resolvedConnSpecs = new Map<string, any>();
@@ -222,18 +223,26 @@ export async function resolveConnectionSpec(serverName: string): Promise<void> {
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export async function resolvePassword(serverSpec, ignoreUnauthenticated = false): Promise<void> {
-  const AUTHENTICATION_PROVIDER = "intersystems-server-credentials";
-  // This arises if setting says to use authentication provider
   if (
     // Connection isn't unauthenticated
     (!isUnauthenticated(serverSpec.username) || ignoreUnauthenticated) &&
     // A password is missing
     typeof serverSpec.password == "undefined"
   ) {
     const scopes = [serverSpec.name, serverSpec.username || ""];
-    let session = await vscode.authentication.getSession(AUTHENTICATION_PROVIDER, scopes, { silent: true });
+
+    // Handle Server Manager extension version < 3.8.0
+    const account = serverManagerApi.getAccount ? serverManagerApi.getAccount(serverSpec) : undefined;
+
+    let session = await vscode.authentication.getSession(serverManager.AUTHENTICATION_PROVIDER, scopes, {
+      silent: true,
+      account,
+    });
     if (!session) {
-      session = await vscode.authentication.getSession(AUTHENTICATION_PROVIDER, scopes, { createIfNone: true });
+      session = await vscode.authentication.getSession(serverManager.AUTHENTICATION_PROVIDER, scopes, {
+        createIfNone: true,
+        account,
+      });
     }
     if (session) {
       // If original spec lacked username use the one obtained by the authprovider