Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f (#7282)

* Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f

* fix various icon issues

* fix preview features

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

@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable, } from 'vs/base/common/lifecycle';
+import { IUserData, IUserDataSyncStoreService, UserDataSyncStoreErrorCode, UserDataSyncStoreError } from 'vs/platform/userDataSync/common/userDataSync';
+import { IProductService } from 'vs/platform/product/common/productService';
+import { Emitter, Event } from 'vs/base/common/event';
+import { IRequestService, asText } from 'vs/platform/request/common/request';
+import { URI } from 'vs/base/common/uri';
+import { joinPath } from 'vs/base/common/resources';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { IHeaders } from 'vs/base/parts/request/common/request';
+
+export class UserDataSyncStoreService extends Disposable implements IUserDataSyncStoreService {
+
+	_serviceBrand: any;
+
+	get enabled(): boolean { return !!this.productService.settingsSyncStoreUrl; }
+
+	private _loggedIn: boolean = false;
+	get loggedIn(): boolean { return this._loggedIn; }
+	private readonly _onDidChangeLoggedIn: Emitter<boolean> = this._register(new Emitter<boolean>());
+	readonly onDidChangeLoggedIn: Event<boolean> = this._onDidChangeLoggedIn.event;
+
+	constructor(
+		@IProductService private readonly productService: IProductService,
+		@IRequestService private readonly requestService: IRequestService,
+	) {
+		super();
+	}
+
+	async login(): Promise<void> {
+	}
+
+	async logout(): Promise<void> {
+	}
+
+	async read(key: string, oldValue: IUserData | null): Promise<IUserData> {
+		if (!this.enabled) {
+			return Promise.reject(new Error('No settings sync store url configured.'));
+		}
+
+		const url = joinPath(URI.parse(this.productService.settingsSyncStoreUrl!), key).toString();
+		const headers: IHeaders = {};
+		if (oldValue) {
+			headers['If-None-Match'] = oldValue.ref;
+		}
+
+		const context = await this.requestService.request({ type: 'GET', url, headers }, CancellationToken.None);
+
+		if (context.res.statusCode === 304) {
+			// There is no new value. Hence return the old value.
+			return oldValue!;
+		}
+
+		const ref = context.res.headers['etag'];
+		if (!ref) {
+			throw new Error('Server did not return the ref');
+		}
+		const content = await asText(context);
+		return { ref, content };
+	}
+
+	async write(key: string, data: string, ref: string | null): Promise<string> {
+		if (!this.enabled) {
+			return Promise.reject(new Error('No settings sync store url configured.'));
+		}
+
+		const url = joinPath(URI.parse(this.productService.settingsSyncStoreUrl!), key).toString();
+		const headers: IHeaders = { 'Content-Type': 'text/plain' };
+		if (ref) {
+			headers['If-Match'] = ref;
+		}
+
+		const context = await this.requestService.request({ type: 'POST', url, data, headers }, CancellationToken.None);
+
+		if (context.res.statusCode === 412) {
+			// There is a new value. Throw Rejected Error
+			throw new UserDataSyncStoreError('New data exists', UserDataSyncStoreErrorCode.Rejected);
+		}
+
+		const newRef = context.res.headers['etag'];
+		if (!newRef) {
+			throw new Error('Server did not return the ref');
+		}
+		return newRef;
+	}
+
+}