From 55e0bf2f826df1f4ea79c8b97bda64155e44f079 Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Fri, 23 Oct 2020 16:09:24 -0700 Subject: [PATCH] Remove deprecated authenticationSessionId from embedder API --- .../workbench/browser/parts/activitybar/activitybarActions.ts | 2 +- .../userDataSync/browser/userDataSyncWorkbenchService.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts index 5ea881aab0a..0a75815ce3b 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts @@ -192,7 +192,7 @@ export class AccountsActionViewItem extends ActivityActionViewItem { if (sessionInfo.sessions) { Object.keys(sessionInfo.sessions).forEach(accountName => { - const hasEmbedderAccountSession = sessionInfo.sessions[accountName].some(session => session.id === (authenticationSession?.id || this.environmentService.options?.authenticationSessionId)); + const hasEmbedderAccountSession = sessionInfo.sessions[accountName].some(session => session.id === (authenticationSession?.id)); const manageExtensionsAction = new Action(`configureSessions${accountName}`, nls.localize('manageTrustedExtensions', "Manage Trusted Extensions"), '', true, _ => { return this.authenticationService.manageTrustedExtensionsForAccount(sessionInfo.providerId, accountName); }); diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts index f6d93e4f9eb..9df0eb64c5b 100644 --- a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts +++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts @@ -155,8 +155,8 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat private async initialize(): Promise { const authenticationSession = this.environmentService.options?.credentialsProvider ? await getCurrentAuthenticationSessionInfo(this.environmentService, this.productService) : undefined; - if (this.currentSessionId === undefined && this.useWorkbenchSessionId && (authenticationSession?.id || this.environmentService.options?.authenticationSessionId)) { - this.currentSessionId = authenticationSession?.id || this.environmentService.options?.authenticationSessionId; + if (this.currentSessionId === undefined && this.useWorkbenchSessionId && (authenticationSession?.id)) { + this.currentSessionId = authenticationSession?.id; this.useWorkbenchSessionId = false; } -- GitLab