Skip to content

chat - use the preferred account when authenticating #246482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bpasero merged 1 commit into from
Apr 14, 2025
Merged

chat - use the preferred account when authenticating #246482

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { IProductService } from '../../../../platform/product/common/productServ
import { asText, IRequestService } from '../../../../platform/request/common/request.js';
import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
import { ITelemetryService, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
import { AuthenticationSession, IAuthenticationExtensionsService, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
import { AuthenticationSession, AuthenticationSessionAccount, IAuthenticationExtensionsService, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
import { IExtension, IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
import { ChatContextKeys } from './chatContextKeys.js';
Expand Down Expand Up @@ -465,8 +465,17 @@ export class ChatEntitlementRequests extends Disposable {
}

private async doGetSessions(providerId: string): Promise<readonly AuthenticationSession[]> {
const preferredAccountName = this.authenticationExtensionsService.getAccountPreference(defaultChat.chatExtensionId, providerId) ?? this.authenticationExtensionsService.getAccountPreference(defaultChat.extensionId, providerId);
Copy link
Member

@TylerLeonhardt TylerLeonhardt Apr 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In practice, chat and completions are tied together, via a package.json config, but this doesn't really hurt.

let preferredAccount: AuthenticationSessionAccount | undefined;
for (const account of await this.authenticationService.getAccounts(providerId)) {
if (account.label === preferredAccountName) {
preferredAccount = account;
break;
}
}

try {
return await this.authenticationService.getSessions(providerId);
return await this.authenticationService.getSessions(providerId, undefined, preferredAccount);
} catch (error) {
// ignore - errors can throw if a provider is not registered
}
Expand Down
Loading