fix tests

sandy081 · sandy081 · commit e4dbf1356e9d · 2020-04-19T13:36:37.000+02:00
diff --git a/src/vs/platform/product/common/productService.ts b/src/vs/platform/product/common/productService.ts
@@ -5,6 +5,7 @@
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ExtensionKind } from 'vs/platform/extensions/common/extensions';
+import { IStringDictionary } from 'vs/base/common/collections';
 
 export const IProductService = createDecorator<IProductService>('productService');
 
@@ -21,6 +22,8 @@ export interface IBuiltInExtension {
 	readonly metadata: any;
 }
 
+export type ConfigurationSyncStore = { url: string, authenticationProviders: IStringDictionary<{ scopes: string[] }> };
+
 export interface IProductConfiguration {
 	readonly version: string;
 	readonly date?: string;
@@ -113,7 +116,7 @@ export interface IProductConfiguration {
 	readonly msftInternalDomains?: string[];
 	readonly linkProtectionTrustedDomains?: readonly string[];
 
-	readonly 'configurationSync.store'?: { url: string, authenticationProviderId: string };
+	readonly 'configurationSync.store'?: ConfigurationSyncStore;
 }
 
 export interface IExeBasedExtensionTip {
diff --git a/src/vs/platform/userDataSync/common/userDataSync.ts b/src/vs/platform/userDataSync/common/userDataSync.ts
@@ -20,7 +20,7 @@ import { FormattingOptions } from 'vs/base/common/jsonFormatter';
 import { URI } from 'vs/base/common/uri';
 import { joinPath, isEqualOrParent } from 'vs/base/common/resources';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { IProductService, ConfigurationSyncStore } from 'vs/platform/product/common/productService';
 import { distinct } from 'vs/base/common/arrays';
 import { isArray, isString, isObject } from 'vs/base/common/types';
 
@@ -135,7 +135,7 @@ export function isAuthenticationProvider(thing: any): thing is IAuthenticationPr
 }
 
 export function getUserDataSyncStore(productService: IProductService, configurationService: IConfigurationService): IUserDataSyncStore | undefined {
-	const value = configurationService.getValue<{ url: string, authenticationProviders: IStringDictionary<{ scopes: string[] }> }>(CONFIGURATION_SYNC_STORE_KEY) || productService[CONFIGURATION_SYNC_STORE_KEY];
+	const value = configurationService.getValue<ConfigurationSyncStore>(CONFIGURATION_SYNC_STORE_KEY) || productService[CONFIGURATION_SYNC_STORE_KEY];
 	if (value
 		&& isString(value.url)
 		&& isObject(value.authenticationProviders)
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
@@ -65,7 +65,7 @@ export class UserDataSyncClient extends Disposable {
 			_serviceBrand: undefined, ...product, ...{
 				'configurationSync.store': {
 					url: this.testServer.url,
-					authenticationProviderId: 'test'
+					authenticationProviders: { 'test': { scopes: [] } }
 				}
 			}
 		});

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ export class UserDataSyncClient extends Disposable {`
`65`	`65`	`_serviceBrand: undefined, ...product, ...{`
`66`	`66`	`'configurationSync.store': {`
`67`	`67`	`url: this.testServer.url,`
`68`		`- authenticationProviderId: 'test'`
	`68`	`+ authenticationProviders: { 'test': { scopes: [] } }`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`});`