[refactor(Account Switching)] Implement StateService (#424)

src/bw.ts

@@ -3,6 +3,7 @@ import * as fs from "fs";
 import * as jsdom from "jsdom";
 import * as path from "path";
 
+import { KeySuffixOptions } from "jslib-common/enums/keySuffixOptions";
 import { LogLevelType } from "jslib-common/enums/logLevelType";
 
 import { AuthService } from "jslib-common/services/auth.service";
@@ -17,7 +18,6 @@ import { AppIdService } from "jslib-common/services/appId.service";
 import { AuditService } from "jslib-common/services/audit.service";
 import { CipherService } from "jslib-common/services/cipher.service";
 import { CollectionService } from "jslib-common/services/collection.service";
-import { ConstantsService } from "jslib-common/services/constants.service";
 import { ContainerService } from "jslib-common/services/container.service";
 import { CryptoService } from "jslib-common/services/crypto.service";
 import { EnvironmentService } from "jslib-common/services/environment.service";
@@ -27,17 +27,21 @@ import { FolderService } from "jslib-common/services/folder.service";
 import { ImportService } from "jslib-common/services/import.service";
 import { KeyConnectorService } from "jslib-common/services/keyConnector.service";
 import { NoopMessagingService } from "jslib-common/services/noopMessaging.service";
+import { OrganizationService } from "jslib-common/services/organization.service";
 import { PasswordGenerationService } from "jslib-common/services/passwordGeneration.service";
 import { PolicyService } from "jslib-common/services/policy.service";
+import { ProviderService } from "jslib-common/services/provider.service";
 import { SearchService } from "jslib-common/services/search.service";
 import { SendService } from "jslib-common/services/send.service";
 import { SettingsService } from "jslib-common/services/settings.service";
+import { StateService } from "jslib-common/services/state.service";
+import { StateMigrationService } from "jslib-common/services/stateMigration.service";
 import { SyncService } from "jslib-common/services/sync.service";
 import { TokenService } from "jslib-common/services/token.service";
 import { TotpService } from "jslib-common/services/totp.service";
-import { UserService } from "jslib-common/services/user.service";
 import { UserVerificationService } from "jslib-common/services/userVerification.service";
 import { VaultTimeoutService } from "jslib-common/services/vaultTimeout.service";
+
 import { LowdbStorageService } from "jslib-node/services/lowdbStorage.service";
 import { NodeApiService } from "jslib-node/services/nodeApi.service";
 import { NodeCryptoFunctionService } from "jslib-node/services/nodeCryptoFunction.service";
@@ -58,13 +62,11 @@ export class Main {
   secureStorageService: NodeEnvSecureStorageService;
   i18nService: I18nService;
   platformUtilsService: CliPlatformUtilsService;
-  constantsService: ConstantsService;
   cryptoService: CryptoService;
   tokenService: TokenService;
   appIdService: AppIdService;
   apiService: NodeApiService;
   environmentService: EnvironmentService;
-  userService: UserService;
   settingsService: SettingsService;
   cipherService: CipherService;
   folderService: FolderService;
@@ -89,6 +91,10 @@ export class Main {
   fileUploadService: FileUploadService;
   keyConnectorService: KeyConnectorService;
   userVerificationService: UserVerificationService;
+  stateService: StateService;
+  stateMigrationService: StateMigrationService;
+  organizationService: OrganizationService;
+  providerService: ProviderService;
 
   constructor() {
     let p = null;
@@ -120,17 +126,30 @@ export class Main {
       this.logService,
       () => this.cryptoService
     );
-    this.cryptoService = new CryptoService(
+
+    this.stateMigrationService = new StateMigrationService(
+      this.storageService,
+      this.secureStorageService
+    );
+
+    this.stateService = new StateService(
       this.storageService,
       this.secureStorageService,
+      this.logService,
+      this.stateMigrationService
+    );
+
+    this.cryptoService = new CryptoService(
       this.cryptoFunctionService,
       this.platformUtilsService,
-      this.logService
+      this.logService,
+      this.stateService
     );
+
     this.appIdService = new AppIdService(this.storageService);
-    this.tokenService = new TokenService(this.storageService);
+    this.tokenService = new TokenService(this.stateService);
     this.messagingService = new NoopMessagingService();
-    this.environmentService = new EnvironmentService(this.storageService);
+    this.environmentService = new EnvironmentService(this.stateService);
     this.apiService = new NodeApiService(
       this.tokenService,
       this.platformUtilsService,
@@ -143,97 +162,113 @@ export class Main {
         ")",
       (clientId, clientSecret) => this.authService.logInApiKey(clientId, clientSecret)
     );
-    this.userService = new UserService(this.tokenService, this.storageService);
     this.containerService = new ContainerService(this.cryptoService);
-    this.settingsService = new SettingsService(this.userService, this.storageService);
+
+    this.settingsService = new SettingsService(this.stateService);
+
     this.fileUploadService = new FileUploadService(this.logService, this.apiService);
+
     this.cipherService = new CipherService(
       this.cryptoService,
-      this.userService,
       this.settingsService,
       this.apiService,
       this.fileUploadService,
-      this.storageService,
       this.i18nService,
       null,
-      this.logService
+      this.logService,
+      this.stateService
     );
+
     this.folderService = new FolderService(
       this.cryptoService,
-      this.userService,
       this.apiService,
-      this.storageService,
       this.i18nService,
-      this.cipherService
+      this.cipherService,
+      this.stateService
     );
+
     this.collectionService = new CollectionService(
       this.cryptoService,
-      this.userService,
-      this.storageService,
-      this.i18nService
+      this.i18nService,
+      this.stateService
     );
+
     this.searchService = new SearchService(this.cipherService, this.logService, this.i18nService);
-    this.policyService = new PolicyService(this.userService, this.storageService, this.apiService);
+
+    this.providerService = new ProviderService(this.stateService);
+
+    this.organizationService = new OrganizationService(this.stateService);
+
+    this.policyService = new PolicyService(
+      this.stateService,
+      this.organizationService,
+      this.apiService
+    );
+
     this.sendService = new SendService(
       this.cryptoService,
-      this.userService,
       this.apiService,
       this.fileUploadService,
-      this.storageService,
       this.i18nService,
-      this.cryptoFunctionService
+      this.cryptoFunctionService,
+      this.stateService
     );
+
     this.keyConnectorService = new KeyConnectorService(
-      this.storageService,
-      this.userService,
+      this.stateService,
       this.cryptoService,
       this.apiService,
       this.tokenService,
-      this.logService
+      this.logService,
+      this.organizationService
     );
+
     this.vaultTimeoutService = new VaultTimeoutService(
       this.cipherService,
       this.folderService,
       this.collectionService,
       this.cryptoService,
       this.platformUtilsService,
-      this.storageService,
       this.messagingService,
       this.searchService,
-      this.userService,
       this.tokenService,
       this.policyService,
       this.keyConnectorService,
-      async () => await this.cryptoService.clearStoredKey("auto"),
+      this.stateService,
+      async () => await this.cryptoService.clearStoredKey(KeySuffixOptions.Auto),
       null
     );
+
     this.syncService = new SyncService(
-      this.userService,
       this.apiService,
       this.settingsService,
       this.folderService,
       this.cipherService,
       this.cryptoService,
       this.collectionService,
-      this.storageService,
       this.messagingService,
       this.policyService,
       this.sendService,
       this.logService,
-      this.tokenService,
       this.keyConnectorService,
+      this.stateService,
+      this.organizationService,
+      this.providerService,
       async (expired: boolean) => await this.logout()
     );
+
     this.passwordGenerationService = new PasswordGenerationService(
       this.cryptoService,
-      this.storageService,
-      this.policyService
+      this.policyService,
+      this.stateService
     );
+
     this.totpService = new TotpService(
-      this.storageService,
       this.cryptoFunctionService,
-      this.logService
+      this.logService,
+      this.stateService
     );
+
     this.importService = new ImportService(
       this.cipherService,
       this.folderService,
@@ -249,10 +284,10 @@ export class Main {
       this.apiService,
       this.cryptoService
     );
+
     this.authService = new AuthService(
       this.cryptoService,
       this.apiService,
-      this.userService,
       this.tokenService,
       this.appIdService,
       this.i18nService,
@@ -261,10 +296,12 @@ export class Main {
       this.vaultTimeoutService,
       this.logService,
       this.cryptoFunctionService,
-      this.environmentService,
       this.keyConnectorService,
+      this.environmentService,
+      this.stateService,
       true
     );
+
     this.auditService = new AuditService(this.cryptoFunctionService, this.apiService);
     this.program = new Program(this);
     this.vaultProgram = new VaultProgram(this);
@@ -291,12 +328,11 @@ export class Main {
   }
 
   async logout() {
-    const userId = await this.userService.getUserId();
+    const userId = await this.stateService.getUserId();
     await Promise.all([
       this.syncService.setLastSync(new Date(0)),
       this.tokenService.clearToken(),
       this.cryptoService.clearKeys(),
-      this.userService.clear(),
       this.settingsService.clear(userId),
       this.cipherService.clear(userId),
       this.folderService.clear(userId),
@@ -304,29 +340,23 @@ export class Main {
       this.policyService.clear(userId),
       this.passwordGenerationService.clear(),
     ]);
+    await this.stateService.clean();
     process.env.BW_SESSION = null;
   }
 
   private async init() {
     await this.storageService.init();
+    await this.stateService.init();
     this.containerService.attachToWindow(global);
     await this.environmentService.setUrlsFromStorage();
-    // Dev Server URLs. Comment out the line above.
-    // this.apiService.setUrls({
-    //     base: null,
-    //     api: 'http://localhost:4000',
-    //     identity: 'http://localhost:33656',
-    // });
-    const locale = await this.storageService.get<string>(ConstantsService.localeKey);
+    const locale = await this.stateService.getLocale();
     await this.i18nService.init(locale);
     this.authService.init();
 
-    const installedVersion = await this.storageService.get<string>(
-      ConstantsService.installedVersionKey
-    );
+    const installedVersion = await this.stateService.getInstalledVersion();
     const currentVersion = await this.platformUtilsService.getApplicationVersion();
     if (installedVersion == null || installedVersion !== currentVersion) {
-      await this.storageService.save(ConstantsService.installedVersionKey, currentVersion);
+      await this.stateService.setInstalledVersion(currentVersion);
     }
   }
 }