Fixes #355, Prepare 2.6.4 release

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [2.6.4] - 2024-11-13
+- Fix issue [#355](https://github.com/intersystems/language-server/issues/355): Prevent overprompting for Server Manager permission and account information
+
 ## [2.6.3] - 2024-10-25
 - Fix issue [#352](https://github.com/intersystems/language-server/issues/352): Hide Deprecated classes and class members from completion lists by default
 - Fix issue [#353](https://github.com/intersystems/language-server/issues/353): Fix keyword completion for ClassMethods

client/package.json

@@ -4,15 +4,16 @@
   "version": "2.6.4-SNAPSHOT",
   "private": true,
   "engines": {
-    "vscode": "^1.82.0"
+    "vscode": "^1.93.0"
   },
   "dependencies": {
-    "axios": "^1.7.5",
+    "axios": "^1.7.7",
     "vscode-cache": "^0.3.0",
     "vscode-languageclient": "^9.0.1"
   },
   "devDependencies": {
+    "@intersystems-community/intersystems-servermanager": "^3.8.0",
     "@types/semver": "^7.5.8",
-    "@types/vscode": "1.82.0"
+    "@types/vscode": "1.93.0"
   }
 }

client/src/extension.ts

@@ -21,6 +21,7 @@ import {
 } from 'vscode-languageclient/node';
 
 import { gt, lte } from "semver";
+import * as serverManager from "@intersystems-community/intersystems-servermanager";
 
 import { ObjectScriptEvaluatableExpressionProvider } from './evaluatableExpressionProvider';
 import {
@@ -41,6 +42,8 @@ export let client: LanguageClient;
  */
 export let cookiesCache: Cache;
 
+let serverManagerApi: serverManager.ServerManagerAPI;
+
 type MakeRESTRequestParams = {
 	method: "GET"|"POST";
 	api: number;
@@ -131,7 +134,7 @@ export async function activate(context: ExtensionContext) {
 	const serverManagerExt = extensions.getExtension("intersystems-community.servermanager");
 	if (serverManagerExt !== undefined) {
 		// The server manager extension is installed
-		const serverManagerApi = serverManagerExt.isActive ? serverManagerExt.exports : await serverManagerExt.activate();
+		serverManagerApi = serverManagerExt.isActive ? serverManagerExt.exports : await serverManagerExt.activate();
 		serverManagerApi.onDidChangePassword()((serverName: string) => {
 			client.sendNotification("intersystems/server/passwordChange",serverName);
 		});
@@ -157,12 +160,12 @@ export async function activate(context: ExtensionContext) {
 			) {
 				// The main extension didn't provide a password, so we must 
 				// get it from the server manager's authentication provider.
-				const AUTHENTICATION_PROVIDER = "intersystems-server-credentials";
 				const scopes = [serverSpec.serverName, serverSpec.username];
 				try {
-					let session = await authentication.getSession(AUTHENTICATION_PROVIDER, scopes, { silent: true });
+					const account = serverManagerApi.getAccount ? serverManagerApi.getAccount(serverSpec) : undefined;
+					let session = await authentication.getSession(serverManager.AUTHENTICATION_PROVIDER, scopes, { silent: true, account });
 					if (!session) {
-						session = await authentication.getSession(AUTHENTICATION_PROVIDER, scopes, { createIfNone: true });
+						session = await authentication.getSession(serverManager.AUTHENTICATION_PROVIDER, scopes, { createIfNone: true, account });
 					}
 					if (session) {
 						serverSpec.username = session.scopes[1];
@@ -171,7 +174,7 @@ export async function activate(context: ExtensionContext) {
 				} catch (error) {
 					// The user did not consent to sharing authentication information
 					if (error instanceof Error) {
-						client.warn(`${AUTHENTICATION_PROVIDER}: ${error.message}`);
+						client.warn(`${serverManager.AUTHENTICATION_PROVIDER}: ${error.message}`);
 					}
 				}
 			}