use sync store from settings if provided

sandy081 · sandy081 · commit aee8005bfe19 · 2020-03-24T13:54:39.000+01:00
diff --git a/src/vs/platform/userDataSync/common/userDataSync.ts b/src/vs/platform/userDataSync/common/userDataSync.ts
@@ -125,7 +125,7 @@ export interface IUserDataSyncStore {
 }
 
 export function getUserDataSyncStore(productService: IProductService, configurationService: IConfigurationService): IUserDataSyncStore | undefined {
-	const value = productService[CONFIGURATION_SYNC_STORE_KEY] || configurationService.getValue<{ url: string, authenticationProviderId: string }>(CONFIGURATION_SYNC_STORE_KEY);
+	const value = configurationService.getValue<{ url: string, authenticationProviderId: string }>(CONFIGURATION_SYNC_STORE_KEY) || productService[CONFIGURATION_SYNC_STORE_KEY];
 	if (value && value.url && value.authenticationProviderId) {
 		return {
 			url: joinPath(URI.parse(value.url), 'v1'),

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ export interface IUserDataSyncStore {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`export function getUserDataSyncStore(productService: IProductService, configurationService: IConfigurationService): IUserDataSyncStore \| undefined {`
`128`		`- const value = productService[CONFIGURATION_SYNC_STORE_KEY] \|\| configurationService.getValue<{ url: string, authenticationProviderId: string }>(CONFIGURATION_SYNC_STORE_KEY);`
	`128`	`+ const value = configurationService.getValue<{ url: string, authenticationProviderId: string }>(CONFIGURATION_SYNC_STORE_KEY) \|\| productService[CONFIGURATION_SYNC_STORE_KEY];`
`129`	`129`	`if (value && value.url && value.authenticationProviderId) {`
`130`	`130`	`return {`
`131`	`131`	`url: joinPath(URI.parse(value.url), 'v1'),`