From e958506e1c5ca2f98fc047dd38c865eea9c0c360 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Wed, 22 Apr 2020 18:08:50 -0700
Subject: [PATCH] More directly log account id in settings sync

---
 .../userDataSync/browser/userDataSyncAccount.ts     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncAccount.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncAccount.ts
index f9c16b8b2fb..543c08932b9 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncAccount.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncAccount.ts
@@ -35,6 +35,7 @@ export interface IUserDataSyncAccount {
 	readonly authenticationProviderId: string;
 	readonly sessionId: string;
 	readonly accountName: string;
+	readonly accountId: string;
 }
 
 export const enum AccountStatus {
@@ -157,7 +158,7 @@ export class UserDataSyncAccounts extends Disposable {
 
 		const sessions = await this.authenticationService.getSessions(authenticationProviderId) || [];
 		for (const session of sessions) {
-			const account: IUserDataSyncAccount = { authenticationProviderId, sessionId: session.id, accountName: session.account.displayName };
+			const account: IUserDataSyncAccount = { authenticationProviderId, sessionId: session.id, accountName: session.account.displayName, accountId: session.account.id };
 			accounts.set(account.accountName, account);
 			if (this.isCurrentAccount(account)) {
 				currentAccount = account;
@@ -192,16 +193,18 @@ export class UserDataSyncAccounts extends Disposable {
 		if (!result) {
 			return false;
 		}
-		let sessionId: string, accountName: string;
+		let sessionId: string, accountName: string, accountId: string;
 		if (isAuthenticationProvider(result)) {
 			const session = await this.authenticationService.login(result.id, result.scopes);
 			sessionId = session.id;
 			accountName = session.account.displayName;
+			accountId = session.account.id;
 		} else {
 			sessionId = result.sessionId;
 			accountName = result.accountName;
+			accountId = result.accountId;
 		}
-		await this.switch(sessionId, accountName);
+		await this.switch(sessionId, accountName, accountId);
 		return true;
 	}
 
@@ -268,13 +271,13 @@ export class UserDataSyncAccounts extends Disposable {
 		return quickPickItems;
 	}
 
-	private async switch(sessionId: string, accountName: string): Promise<void> {
+	private async switch(sessionId: string, accountName: string, accountId: string): Promise<void> {
 		const currentAccount = this.current;
 		if (this.userDataSyncEnablementService.isEnabled() && (currentAccount && currentAccount.accountName !== accountName)) {
 			// accounts are switched while sync is enabled.
 		}
 		this.currentSessionId = sessionId;
-		this.telemetryService.publicLog2<UserAccountEvent, UserAccountClassification>('sync.userAccount', { id: sessionId.split('/')[1] });
+		this.telemetryService.publicLog2<UserAccountEvent, UserAccountClassification>('sync.userAccount', { id: accountId });
 		await this.update();
 	}
 
-- 
GitLab