Fix overprompting during authentication

intersystems-community · Nov 13, 2024 · f736389 · f736389
1 parent 907e24a
commit f736389
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -1,6 +1,7 @@
 "use strict";
 
 import * as vscode from "vscode";
+import * as serverManager from "@intersystems-community/intersystems-servermanager";
 import { setupHistoryExplorerController } from "./historyExplorer";
 import { setupServerTestsController } from "./serverTests";
 import { setupLocalTestsController } from "./localTests";
@@ -11,7 +12,7 @@ export let localTestController: vscode.TestController;
 export let loadedTestController: vscode.TestController;
 export let historyBrowserController: vscode.TestController;
 export let osAPI: any;
-export let smAPI: any;
+export let smAPI: serverManager.ServerManagerAPI | undefined;
 
 export interface TestRun extends vscode.TestRun {
   debugSession?: vscode.DebugSession
@@ -40,7 +41,7 @@ export interface IJSONServerSpec {
     description?: string;
 }
 
-async function getServerManagerAPI(): Promise<any> {
+async function getServerManagerAPI(): Promise<serverManager.ServerManagerAPI | undefined> {
     const targetExtension = vscode.extensions.getExtension("intersystems-community.servermanager");
     if (!targetExtension) {
       return undefined;

diff --git a/src/historyExplorer.ts b/src/historyExplorer.ts
@@ -48,6 +48,9 @@ export async function setupHistoryExplorerController() {
 export async function serverSpec(item: vscode.TestItem): Promise<IServerSpec | undefined> {
     const serverName = item.id.split(':')[0];
     if (serverName) {
+        if (!smAPI) {
+          return undefined;
+        }
         return await smAPI.getServerSpec(serverName);
     }
     else {

diff --git a/src/makeRESTRequest.ts b/src/makeRESTRequest.ts
@@ -2,7 +2,7 @@ import axios, { AxiosResponse } from "axios";
 import axiosCookieJarSupport from "axios-cookiejar-support";
 import tough = require("tough-cookie");
 import * as vscode from "vscode";
-import { IServerSpec } from "./extension";
+import { IServerSpec, smAPI } from "./extension";
 import * as https from 'https';
 
 const AUTHENTICATION_PROVIDER = "intersystems-server-credentials";
@@ -137,19 +137,21 @@ export async function makeRESTRequest(
 }
 
 export async function resolveCredentials(serverSpec: IServerSpec) {
-    // This arises if setting says to use authentication provider
-    if (typeof serverSpec.password === "undefined") {
+    if (typeof serverSpec.password === "undefined" && smAPI) {
         const scopes = [serverSpec.name, serverSpec.username || ""];
+
+        // Handle Server Manager extension version < 3.8.0
+        const account = smAPI.getAccount ? smAPI.getAccount(serverSpec) : undefined;
         let session = await vscode.authentication.getSession(
             AUTHENTICATION_PROVIDER,
             scopes,
-            { silent: true },
+            { silent: true, account },
         );
         if (!session) {
             session = await vscode.authentication.getSession(
                 AUTHENTICATION_PROVIDER,
                 scopes,
-                { createIfNone: true },
+                { createIfNone: true, account },
             );
         }
         if (session) {