diff --git a/jslib b/jslib index 29556c5d..799c90af 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 29556c5d3beb28eb0258e70773c5ffc316db4139 +Subproject commit 799c90af1702c681874cb8fce8f8adcf1049d0c8 diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts index b7c87204..4d2368db 100644 --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts @@ -64,14 +64,14 @@ const cryptoService = new CryptoService(storageService, secureStorageService, cr const appIdService = new AppIdService(storageService); const tokenService = new TokenService(storageService); const apiService = new ApiService(tokenService, platformUtilsService, - (expired: boolean) => messagingService.send('logout', { expired: expired })); + async (expired: boolean) => messagingService.send('logout', { expired: expired })); const environmentService = new EnvironmentService(apiService, storageService); const userService = new UserService(tokenService, storageService); const containerService = new ContainerService(cryptoService, platformUtilsService); const authService = new AuthService(cryptoService, apiService, userService, tokenService, appIdService, i18nService, platformUtilsService, messagingService, false); const configurationService = new ConfigurationService(storageService, secureStorageService); -const syncSevrice = new SyncService(configurationService, logService, cryptoFunctionService, apiService, +const syncService = new SyncService(configurationService, logService, cryptoFunctionService, apiService, messagingService, i18nService); const analytics = new Analytics(window, () => true, platformUtilsService, storageService, appIdService); @@ -134,7 +134,7 @@ export function initFactory(): Function { { provide: StateServiceAbstraction, useValue: stateService }, { provide: LogServiceAbstraction, useValue: logService }, { provide: ConfigurationService, useValue: configurationService }, - { provide: SyncService, useValue: syncSevrice }, + { provide: SyncService, useValue: syncService }, { provide: APP_INITIALIZER, useFactory: initFactory, diff --git a/tsconfig.json b/tsconfig.json index f1163f54..1e39f9c7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,11 +11,21 @@ "types": [], "baseUrl": ".", "paths": { - "jslib/*": [ "jslib/src/*" ], - "@angular/*": [ "node_modules/@angular/*" ], - "angular2-toaster": [ "node_modules/angular2-toaster" ], - "angulartics2": [ "node_modules/angulartics2" ], - "electron": [ "node_modules/electron" ] + "jslib/*": [ + "jslib/src/*" + ], + "@angular/*": [ + "node_modules/@angular/*" + ], + "angular2-toaster": [ + "node_modules/angular2-toaster" + ], + "angulartics2": [ + "node_modules/angulartics2" + ], + "electron": [ + "node_modules/electron" + ] } }, "exclude": [ @@ -23,6 +33,7 @@ "jslib/node_modules", "jslib/src/services/webCryptoFunction.service.ts", "jslib/src/services/search.service.ts", + "jslib/src/services/nodeApi.service.ts", "jslib/src/angular/components/export.component.ts", "dist", "jslib/dist",