Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 (#8911)

* Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2

* update distro

* fix layering

* update distro

* fix tests

src/vs/platform/userDataSync/common/userDataAuthTokenService.ts

@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from 'vs/base/common/event';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { IUserDataAuthTokenService } from 'vs/platform/userDataSync/common/userDataSync';
+
+export class UserDataAuthTokenService extends Disposable implements IUserDataAuthTokenService {
+
+	_serviceBrand: any;
+
+	private _onDidChangeToken: Emitter<string | undefined> = this._register(new Emitter<string | undefined>());
+	readonly onDidChangeToken: Event<string | undefined> = this._onDidChangeToken.event;
+
+	private _token: string | undefined;
+
+	constructor() {
+		super();
+	}
+
+	async getToken(): Promise<string | undefined> {
+		return this._token;
+	}
+
+	async setToken(token: string | undefined): Promise<void> {
+		if (token !== this._token) {
+			this._token = token;
+			this._onDidChangeToken.fire(token);
+		}
+	}
+}