allow to provide only url

e2582cae · Sandeep Somavarapu · 288108c2 · e2582cae
隐藏空白更改
内联并排

Showing with 4 addition and 1 deletion

src/vs/platform/userDataSync/common/userDataSync.ts src/vs/platform/userDataSync/common/userDataSync.ts +4 -1

未找到文件。
--- a/src/vs/platform/userDataSync/common/userDataSync.ts
+++ b/src/vs/platform/userDataSync/common/userDataSync.ts
@@ -122,7 +122,10 @@ export function isAuthenticationProvider(thing: any): thing is IAuthenticationPr
 }

 export function getUserDataSyncStore(productService: IProductService, configurationService: IConfigurationService): IUserDataSyncStore | undefined {
-	const value = configurationService.getValue<ConfigurationSyncStore>(CONFIGURATION_SYNC_STORE_KEY) || productService[CONFIGURATION_SYNC_STORE_KEY];
+	const value = {
+		...(productService[CONFIGURATION_SYNC_STORE_KEY] || {}),
+		...(configurationService.getValue<ConfigurationSyncStore>(CONFIGURATION_SYNC_STORE_KEY) || {})
+	};
 	if (value
 		&& isString(value.url)
 		&& isObject(value.authenticationProviders)