From 2009c8847e8f62a93fea4952c8521c55314b6195 Mon Sep 17 00:00:00 2001
From: Brett Saviano <bsaviano@intersystems.com>
Date: Wed, 13 Nov 2024 09:20:25 -0500
Subject: [PATCH] Fixes #356

---
 CHANGELOG.md              | 3 +++
 client/src/extension.ts   | 2 +-
 server/src/utils/types.ts | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb49ec1..6a907df 100644
--- 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
index a768ddc..1614f84 100644
--- 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
index 80646fa..0101c4b 100644
--- 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
 };