Merge from vscode 708b019bb4e20f07cf89df9f1d943af3d38d7a70 (#9657)

This commit is contained in:
Anthony Dresser
2020-03-17 22:35:18 -07:00
committed by GitHub
parent 5ee7454793
commit 61831d8642
71 changed files with 5191 additions and 372 deletions

View File

@@ -40,10 +40,15 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn
super();
this.userDataSyncStore = getUserDataSyncStore(productService, configurationService);
this.commonHeadersPromise = getServiceMachineId(environmentService, fileService, storageService)
.then(uuid => ({
'X-Sync-Client-Id': productService.version,
'X-Sync-Machine-Id': uuid
}));
.then(uuid => {
const headers: IHeaders = {
'X-Sync-Client-Id': productService.version,
};
if (uuid) {
headers['X-Sync-Machine-Id'] = uuid;
}
return headers;
});
}
async getAllRefs(resource: SyncResource): Promise<IResourceRefHandle[]> {