Fixes #356

intersystems · Nov 13, 2024 · 2009c88 · 2009c88
1 parent d4c38b6
commit 2009c88
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [2.6.5] - 2024-11-13
+- Fix issue [#356](https://github.com/intersystems/language-server/issues/356): Unexpected new dialog during password retrieval using Server Manager authprovider
+
 ## [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
 

diff --git a/client/src/extension.ts b/client/src/extension.ts
@@ -162,7 +162,7 @@ export async function activate(context: ExtensionContext) {
 				// get it from the server manager's authentication provider.
 				const scopes = [serverSpec.serverName, serverSpec.username];
 				try {
-					const account = serverManagerApi?.getAccount ? serverManagerApi.getAccount(serverSpec) : undefined;
+					const account = serverManagerApi?.getAccount ? serverManagerApi.getAccount({ name: serverSpec.serverName, ...serverSpec }) : undefined;
 					let session = await authentication.getSession(serverManager.AUTHENTICATION_PROVIDER, scopes, { silent: true, account });
 					if (!session) {
 						session = await authentication.getSession(serverManager.AUTHENTICATION_PROVIDER, scopes, { createIfNone: true, account });

diff --git a/server/src/utils/types.ts b/server/src/utils/types.ts
@@ -122,6 +122,7 @@ export type ServerSpec = {
 	namespace: string,
 	username: string,
 	serverName: string,
+	serverVersion: string,
 	password: string,
 	active: boolean
 };