From 3c582adcfeb450c2fcbcae82400c13ed5805c16d Mon Sep 17 00:00:00 2001 From: addison Date: Thu, 20 Jan 2022 10:15:52 -0500 Subject: [PATCH] [chore] Update jslib --- jslib | 2 +- src/bw.ts | 8 +++++++- src/commands/login.command.ts | 6 +----- src/program.ts | 1 - 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/jslib b/jslib index cc285e5..54c6a4b 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit cc285e5ea729795812d8f1f66f622b67c11efb4a +Subproject commit 54c6a4b3c3d34fe6adbbeba5d35a416a3fbc487d diff --git a/src/bw.ts b/src/bw.ts index 6592984..db9e146 100644 --- a/src/bw.ts +++ b/src/bw.ts @@ -50,6 +50,11 @@ import { Program } from "./program"; import { SendProgram } from "./send.program"; import { VaultProgram } from "./vault.program"; +import { + Account, + AccountFactory +} from "jslib-common/models/domain/account"; + // Polyfills (global as any).DOMParser = new jsdom.JSDOM().window.DOMParser; @@ -136,7 +141,8 @@ export class Main { this.storageService, this.secureStorageService, this.logService, - this.stateMigrationService + this.stateMigrationService, + new AccountFactory(Account), ); this.cryptoService = new CryptoService( diff --git a/src/commands/login.command.ts b/src/commands/login.command.ts index 273099d..38b856c 100644 --- a/src/commands/login.command.ts +++ b/src/commands/login.command.ts @@ -12,7 +12,6 @@ import { PasswordGenerationService } from "jslib-common/abstractions/passwordGen import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; import { PolicyService } from "jslib-common/abstractions/policy.service"; import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; @@ -27,7 +26,6 @@ export class LoginCommand extends BaseLoginCommand { authService: AuthService, apiService: ApiService, cryptoFunctionService: CryptoFunctionService, - syncService: SyncService, i18nService: I18nService, environmentService: EnvironmentService, passwordGenerationService: PasswordGenerationService, @@ -35,7 +33,7 @@ export class LoginCommand extends BaseLoginCommand { stateService: StateService, cryptoService: CryptoService, policyService: PolicyService, - keyConnectorService: KeyConnectorService, + private keyConnectorService: KeyConnectorService, private logoutCallback: () => Promise ) { super( @@ -50,8 +48,6 @@ export class LoginCommand extends BaseLoginCommand { cryptoService, policyService, "cli", - syncService, - keyConnectorService ); this.logout = this.logoutCallback; this.validatedParams = async () => { diff --git a/src/program.ts b/src/program.ts index 8948fc3..9d01042 100644 --- a/src/program.ts +++ b/src/program.ts @@ -149,7 +149,6 @@ export class Program extends BaseProgram { this.main.authService, this.main.apiService, this.main.cryptoFunctionService, - this.main.syncService, this.main.i18nService, this.main.environmentService, this.main.passwordGenerationService,