Delete Unused Bits of StateService (#9858)

* Delete Unused Bits of StateService

* Fix Tests

libs/common/src/platform/models/domain/account-settings.spec.ts

@@ -1,9 +0,0 @@
-import { AccountSettings } from "./account";
-
-describe("AccountSettings", () => {
-  describe("fromJSON", () => {
-    it("should deserialize to an instance of itself", () => {
-      expect(AccountSettings.fromJSON(JSON.parse("{}"))).toBeInstanceOf(AccountSettings);
-    });
-  });
-});

libs/common/src/platform/models/domain/account.spec.ts

@@ -1,4 +1,4 @@
-import { Account, AccountKeys, AccountProfile, AccountSettings } from "./account";
+import { Account, AccountKeys, AccountProfile } from "./account";
 
 describe("Account", () => {
   describe("fromJSON", () => {
@@ -9,13 +9,11 @@ describe("Account", () => {
     it("should call all the sub-fromJSONs", () => {
       const keysSpy = jest.spyOn(AccountKeys, "fromJSON");
       const profileSpy = jest.spyOn(AccountProfile, "fromJSON");
-      const settingsSpy = jest.spyOn(AccountSettings, "fromJSON");
 
       Account.fromJSON({});
 
       expect(keysSpy).toHaveBeenCalled();
       expect(profileSpy).toHaveBeenCalled();
-      expect(settingsSpy).toHaveBeenCalled();
     });
   });
 });

libs/common/src/platform/models/domain/account.ts

@@ -1,14 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { UriMatchStrategySetting } from "../../../models/domain/domain-service";
-import { GeneratorOptions } from "../../../tools/generator/generator-options";
-import {
-  GeneratedPasswordHistory,
-  PasswordGeneratorOptions,
-} from "../../../tools/generator/password";
-import { UsernameGeneratorOptions } from "../../../tools/generator/username/username-generation-options";
 import { DeepJsonify } from "../../../types/deep-jsonify";
-import { KdfType } from "../../enums";
 import { Utils } from "../../misc/utils";
 
 import { SymmetricCryptoKey } from "./symmetric-crypto-key";
@@ -51,26 +43,6 @@ export class EncryptionPair<TEncrypted, TDecrypted> {
   }
 }
 
-export class DataEncryptionPair<TEncrypted, TDecrypted> {
-  encrypted?: Record<string, TEncrypted>;
-  decrypted?: TDecrypted[];
-}
-
-export class AccountData {
-  passwordGenerationHistory?: EncryptionPair<
-    GeneratedPasswordHistory[],
-    GeneratedPasswordHistory[]
-  > = new EncryptionPair<GeneratedPasswordHistory[], GeneratedPasswordHistory[]>();
-
-  static fromJSON(obj: DeepJsonify<AccountData>): AccountData {
-    if (obj == null) {
-      return null;
-    }
-
-    return Object.assign(new AccountData(), obj);
-  }
-}
-
 export class AccountKeys {
   publicKey?: Uint8Array;
 
@@ -127,10 +99,6 @@ export class AccountProfile {
   emailVerified?: boolean;
   lastSync?: string;
   userId?: string;
-  kdfIterations?: number;
-  kdfMemory?: number;
-  kdfParallelism?: number;
-  kdfType?: KdfType;
 
   static fromJSON(obj: Jsonify<AccountProfile>): AccountProfile {
     if (obj == null) {
@@ -141,33 +109,12 @@ export class AccountProfile {
   }
 }
 
-export class AccountSettings {
-  defaultUriMatch?: UriMatchStrategySetting;
-  passwordGenerationOptions?: PasswordGeneratorOptions;
-  usernameGenerationOptions?: UsernameGeneratorOptions;
-  generatorOptions?: GeneratorOptions;
-
-  static fromJSON(obj: Jsonify<AccountSettings>): AccountSettings {
-    if (obj == null) {
-      return null;
-    }
-
-    return Object.assign(new AccountSettings(), obj);
-  }
-}
-
 export class Account {
-  data?: AccountData = new AccountData();
   keys?: AccountKeys = new AccountKeys();
   profile?: AccountProfile = new AccountProfile();
-  settings?: AccountSettings = new AccountSettings();
 
   constructor(init: Partial<Account>) {
     Object.assign(this, {
-      data: {
-        ...new AccountData(),
-        ...init?.data,
-      },
       keys: {
         ...new AccountKeys(),
         ...init?.keys,
@@ -176,10 +123,6 @@ export class Account {
         ...new AccountProfile(),
         ...init?.profile,
       },
-      settings: {
-        ...new AccountSettings(),
-        ...init?.settings,
-      },
     });
   }
 
@@ -190,9 +133,7 @@ export class Account {
 
     return Object.assign(new Account({}), json, {
       keys: AccountKeys.fromJSON(json?.keys),
-      data: AccountData.fromJSON(json?.data),
       profile: AccountProfile.fromJSON(json?.profile),
-      settings: AccountSettings.fromJSON(json?.settings),
     });
   }
 }