From 453ddc22f6008e6fea12ab553d02ca68970c784a Mon Sep 17 00:00:00 2001 From: Joyce Er Date: Wed, 22 Jun 2022 00:41:06 -0700 Subject: [PATCH] Use `AuthenticationSession.account.id` to dedupe sessions (#152774) `AuthenticationSession.account.label` is not guaranteed to be unique --- .../userDataSync/browser/userDataSyncWorkbenchService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts index 78c27df5d0c..8d28e06a802 100644 --- a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts +++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts @@ -211,7 +211,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat const sessions = await this.authenticationService.getSessions(authenticationProviderId, scopes) || []; for (const session of sessions) { const account: UserDataSyncAccount = new UserDataSyncAccount(authenticationProviderId, session); - accounts.set(account.accountName, account); + accounts.set(account.accountId, account); if (this.isCurrentAccount(account)) { currentAccount = account; } @@ -219,7 +219,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat if (currentAccount) { // Always use current account if available - accounts.set(currentAccount.accountName, currentAccount); + accounts.set(currentAccount.accountId, currentAccount); } return [...accounts.values()];