change accessing token to be sync

sandy081 · sandy081 · commit f9de4bb67d2e · 2020-05-17T17:42:57.000+02:00
diff --git a/src/vs/platform/authentication/common/authentication.ts b/src/vs/platform/authentication/common/authentication.ts
@@ -17,33 +17,27 @@ export interface IUserDataSyncAuthToken {
 export interface IAuthenticationTokenService {
 	_serviceBrand: undefined;
 
+	readonly token: IUserDataSyncAuthToken | undefined;
 	readonly onDidChangeToken: Event<IUserDataSyncAuthToken | undefined>;
-	readonly onTokenFailed: Event<void>;
 
-	getToken(): Promise<IUserDataSyncAuthToken | undefined>;
 	setToken(userDataSyncAuthToken: IUserDataSyncAuthToken | undefined): Promise<void>;
+
+	readonly onTokenFailed: Event<void>;
 	sendTokenFailed(): void;
 }
 
 export class AuthenticationTokenService extends Disposable implements IAuthenticationTokenService {
 
 	_serviceBrand: any;
 
+	private _token: IUserDataSyncAuthToken | undefined;
+	get token(): IUserDataSyncAuthToken | undefined { return this._token; }
 	private _onDidChangeToken = this._register(new Emitter<IUserDataSyncAuthToken | undefined>());
 	readonly onDidChangeToken = this._onDidChangeToken.event;
 
 	private _onTokenFailed: Emitter<void> = this._register(new Emitter<void>());
 	readonly onTokenFailed: Event<void> = this._onTokenFailed.event;
 
-	private _token: IUserDataSyncAuthToken | undefined;
-
-	constructor() {
-		super();
-	}
-
-	async getToken(): Promise<IUserDataSyncAuthToken | undefined> {
-		return this._token;
-	}
 
 	async setToken(token: IUserDataSyncAuthToken | undefined): Promise<void> {
 		if (token && this._token ? token.token !== this._token.token || token.authenticationProviderId !== this._token.authenticationProviderId : token !== this._token) {
diff --git a/src/vs/platform/authentication/common/authenticationIpc.ts b/src/vs/platform/authentication/common/authenticationIpc.ts
@@ -22,7 +22,6 @@ export class AuthenticationTokenServiceChannel implements IServerChannel {
 	call(context: any, command: string, args?: any): Promise<any> {
 		switch (command) {
 			case 'setToken': return this.service.setToken(args);
-			case 'getToken': return this.service.getToken();
 		}
 		throw new Error('Invalid call');
 	}
diff --git a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
@@ -41,8 +41,8 @@ export class UserDataAutoSyncService extends Disposable implements IUserDataAuto
 		this._register(this.userDataSyncEnablementService.onDidChangeResourceEnablement(() => this.triggerAutoSync(['resourceEnablement'])));
 	}
 
-	private async updateEnablement(stopIfDisabled: boolean, auto: boolean): Promise<void> {
-		const { enabled, reason } = await this.isAutoSyncEnabled();
+	private updateEnablement(stopIfDisabled: boolean, auto: boolean): void {
+		const { enabled, reason } = this.isAutoSyncEnabled();
 		if (this.enabled === enabled) {
 			return;
 		}
@@ -95,15 +95,14 @@ export class UserDataAutoSyncService extends Disposable implements IUserDataAuto
 		}
 	}
 
-	private async isAutoSyncEnabled(): Promise<{ enabled: boolean, reason?: string }> {
+	private isAutoSyncEnabled(): { enabled: boolean, reason?: string } {
 		if (!this.userDataSyncEnablementService.isEnabled()) {
 			return { enabled: false, reason: 'sync is disabled' };
 		}
 		if (this.userDataSyncService.status === SyncStatus.Uninitialized) {
 			return { enabled: false, reason: 'sync is not initialized' };
 		}
-		const token = await this.authTokenService.getToken();
-		if (!token) {
+		if (!this.authTokenService.token) {
 			return { enabled: false, reason: 'token is not avaialable' };
 		}
 		return { enabled: true };
diff --git a/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts b/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
@@ -219,7 +219,7 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn
 	}
 
 	private async request(options: IRequestOptions, source: SyncResource | undefined, token: CancellationToken): Promise<IRequestContext> {
-		const authToken = await this.authTokenService.getToken();
+		const authToken = this.authTokenService.token;
 		if (!authToken) {
 			throw new UserDataSyncStoreError('No Auth Token Available', UserDataSyncErrorCode.Unauthorized, source);
 		}
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
@@ -83,7 +83,7 @@ export class UserDataSyncClient extends Disposable {
 		this.instantiationService.stub(IRequestService, this.testServer);
 		this.instantiationService.stub(IAuthenticationTokenService, <Partial<IAuthenticationTokenService>>{
 			onDidChangeToken: new Emitter<IUserDataSyncAuthToken | undefined>().event,
-			async getToken() { return { authenticationProviderId: 'id', token: 'token' }; }
+			token: { authenticationProviderId: 'id', token: 'token' }
 		});
 
 		this.instantiationService.stub(IUserDataSyncLogService, logService);
diff --git a/src/vs/workbench/services/authentication/electron-browser/authenticationTokenService.ts b/src/vs/workbench/services/authentication/electron-browser/authenticationTokenService.ts
@@ -15,6 +15,9 @@ export class AuthenticationTokenService extends Disposable implements IAuthentic
 	_serviceBrand: undefined;
 
 	private readonly channel: IChannel;
+
+	private _token: IUserDataSyncAuthToken | undefined;
+	get token(): IUserDataSyncAuthToken | undefined { return this._token; }
 	private _onDidChangeToken = this._register(new Emitter<IUserDataSyncAuthToken | undefined>());
 	readonly onDidChangeToken = this._onDidChangeToken.event;
 
@@ -29,11 +32,8 @@ export class AuthenticationTokenService extends Disposable implements IAuthentic
 		this._register(this.channel.listen<void[]>('onTokenFailed')(_ => this.sendTokenFailed()));
 	}
 
-	getToken(): Promise<IUserDataSyncAuthToken | undefined> {
-		return this.channel.call('getToken');
-	}
-
 	setToken(token: IUserDataSyncAuthToken | undefined): Promise<undefined> {
+		this._token = token;
 		return this.channel.call('setToken', token);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ export class AuthenticationTokenServiceChannel implements IServerChannel {`
`22`	`22`	`call(context: any, command: string, args?: any): Promise<any> {`
`23`	`23`	`switch (command) {`
`24`	`24`	`case 'setToken': return this.service.setToken(args);`
`25`		`- case 'getToken': return this.service.getToken();`
`26`	`25`	`}`
`27`	`26`	`throw new Error('Invalid call');`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ export class UserDataAutoSyncService extends Disposable implements IUserDataAuto`
`41`	`41`	`this._register(this.userDataSyncEnablementService.onDidChangeResourceEnablement(() => this.triggerAutoSync(['resourceEnablement'])));`
`42`	`42`	`}`
`43`	`43`
`44`		`- private async updateEnablement(stopIfDisabled: boolean, auto: boolean): Promise<void> {`
`45`		`- const { enabled, reason } = await this.isAutoSyncEnabled();`
	`44`	`+ private updateEnablement(stopIfDisabled: boolean, auto: boolean): void {`
	`45`	`+ const { enabled, reason } = this.isAutoSyncEnabled();`
`46`	`46`	`if (this.enabled === enabled) {`
`47`	`47`	`return;`
`48`	`48`	`}`
`@@ -95,15 +95,14 @@ export class UserDataAutoSyncService extends Disposable implements IUserDataAuto`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`- private async isAutoSyncEnabled(): Promise<{ enabled: boolean, reason?: string }> {`
	`98`	`+ private isAutoSyncEnabled(): { enabled: boolean, reason?: string } {`
`99`	`99`	`if (!this.userDataSyncEnablementService.isEnabled()) {`
`100`	`100`	`return { enabled: false, reason: 'sync is disabled' };`
`101`	`101`	`}`
`102`	`102`	`if (this.userDataSyncService.status === SyncStatus.Uninitialized) {`
`103`	`103`	`return { enabled: false, reason: 'sync is not initialized' };`
`104`	`104`	`}`
`105`		`- const token = await this.authTokenService.getToken();`
`106`		`- if (!token) {`
	`105`	`+ if (!this.authTokenService.token) {`
`107`	`106`	`return { enabled: false, reason: 'token is not avaialable' };`
`108`	`107`	`}`
`109`	`108`	`return { enabled: true };`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`private async request(options: IRequestOptions, source: SyncResource \| undefined, token: CancellationToken): Promise<IRequestContext> {`
`222`		`- const authToken = await this.authTokenService.getToken();`
	`222`	`+ const authToken = this.authTokenService.token;`
`223`	`223`	`if (!authToken) {`
`224`	`224`	`throw new UserDataSyncStoreError('No Auth Token Available', UserDataSyncErrorCode.Unauthorized, source);`
`225`	`225`	`}`