From c35c7e050daf8aabd06de6c30fe52de6f577537e Mon Sep 17 00:00:00 2001
From: Tyler Leonhardt <me@tylerleonhardt.com>
Date: Mon, 12 Jul 2021 10:06:40 -0700
Subject: [PATCH] move to using an id token for settings sync

---
 src/vs/editor/common/modes.ts                                   | 1 +
 .../userDataSync/browser/userDataSyncWorkbenchService.ts        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
index d9863fff7fe..d5284c24f0d 100644
--- a/src/vs/editor/common/modes.ts
+++ b/src/vs/editor/common/modes.ts
@@ -1544,6 +1544,7 @@ export interface AuthenticationSession {
 		id: string;
 	}
 	scopes: ReadonlyArray<string>;
+	idToken?: string;
 }
 
 /**
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
index 120942e6f82..7796a8a328e 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
@@ -58,7 +58,7 @@ class UserDataSyncAccount implements IUserDataSyncAccount {
 	get sessionId(): string { return this.session.id; }
 	get accountName(): string { return this.session.account.label; }
 	get accountId(): string { return this.session.account.id; }
-	get token(): string { return this.session.accessToken; }
+	get token(): string { return this.session.idToken || this.session.accessToken; }
 }
 
 export class UserDataSyncWorkbenchService extends Disposable implements IUserDataSyncWorkbenchService {
-- 
GitLab