Merge branch 'master' into feature/org-admin-refresh

libs/angular/src/components/register.component.ts

@@ -2,7 +2,6 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
 import { AbstractControl, UntypedFormBuilder, ValidatorFn, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
 
-import { InputsFieldMatch } from "@bitwarden/angular/validators/inputsFieldMatch.validator";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
@@ -24,6 +23,7 @@ import { RegisterRequest } from "@bitwarden/common/models/request/registerReques
 import { RegisterResponse } from "@bitwarden/common/models/response/authentication/registerResponse";
 
 import { PasswordColorText } from "../shared/components/password-strength/password-strength.component";
+import { InputsFieldMatch } from "../validators/inputsFieldMatch.validator";
 
 import { CaptchaProtectedComponent } from "./captchaProtected.component";
 

libs/angular/src/services/jslib-services.module.ts

@@ -1,7 +1,5 @@
 import { Injector, LOCALE_ID, NgModule } from "@angular/core";
 
-import { ThemingService } from "@bitwarden/angular/services/theming/theming.service";
-import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
 import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service";
 import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/abstractions/account/account-api.service.abstraction";
 import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/abstractions/account/account.service.abstraction";
@@ -127,6 +125,8 @@ import {
 } from "./injection-tokens";
 import { ModalService } from "./modal.service";
 import { PasswordRepromptService } from "./passwordReprompt.service";
+import { ThemingService } from "./theming/theming.service";
+import { AbstractThemingService } from "./theming/theming.service.abstraction";
 import { ValidationService } from "./validation.service";
 
 @NgModule({

libs/common/spec/models/domain/attachment.spec.ts

@@ -8,7 +8,7 @@ import { EncString } from "@bitwarden/common/models/domain/encString";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
 import { ContainerService } from "@bitwarden/common/services/container.service";
 
-import { makeStaticByteArray, mockEnc } from "../../utils";
+import { makeStaticByteArray, mockEnc, mockFromJson } from "../../utils";
 
 describe("Attachment", () => {
   let data: AttachmentData;
@@ -131,4 +131,25 @@ describe("Attachment", () => {
       });
     });
   });
+
+  describe("fromJSON", () => {
+    it("initializes nested objects", () => {
+      jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson);
+
+      const actual = Attachment.fromJSON({
+        key: "myKey",
+        fileName: "myFileName",
+      });
+
+      expect(actual).toEqual({
+        key: "myKey_fromJSON",
+        fileName: "myFileName_fromJSON",
+      });
+      expect(actual).toBeInstanceOf(Attachment);
+    });
+
+    it("returns null if object is null", () => {
+      expect(Attachment.fromJSON(null)).toBeNull();
+    });
+  });
 });

libs/common/spec/models/domain/card.spec.ts

@@ -1,7 +1,8 @@
 import { CardData } from "@bitwarden/common/models/data/cardData";
 import { Card } from "@bitwarden/common/models/domain/card";
+import { EncString } from "@bitwarden/common/models/domain/encString";
 
-import { mockEnc } from "../../utils";
+import { mockEnc, mockFromJson } from "../../utils";
 
 describe("Card", () => {
   let data: CardData;
@@ -70,4 +71,33 @@ describe("Card", () => {
       expYear: "expYear",
     });
   });
+
+  describe("fromJSON", () => {
+    it("initializes nested objects", () => {
+      jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson);
+
+      const actual = Card.fromJSON({
+        cardholderName: "mockCardHolder",
+        brand: "mockBrand",
+        number: "mockNumber",
+        expMonth: "mockExpMonth",
+        expYear: "mockExpYear",
+        code: "mockCode",
+      });
+
+      expect(actual).toEqual({
+        cardholderName: "mockCardHolder_fromJSON",
+        brand: "mockBrand_fromJSON",
+        number: "mockNumber_fromJSON",
+        expMonth: "mockExpMonth_fromJSON",
+        expYear: "mockExpYear_fromJSON",
+        code: "mockCode_fromJSON",
+      });
+      expect(actual).toBeInstanceOf(Card);
+    });
+
+    it("returns null if object is null", () => {
+      expect(Card.fromJSON(null)).toBeNull();
+    });
+  });
 });

libs/common/spec/models/domain/cipher.spec.ts

@@ -1,4 +1,5 @@
 import { Substitute, Arg } from "@fluffy-spoon/substitute";
+import { Jsonify } from "type-fest";
 
 import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType";
 import { CipherType } from "@bitwarden/common/enums/cipherType";
@@ -6,16 +7,20 @@ import { FieldType } from "@bitwarden/common/enums/fieldType";
 import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType";
 import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
 import { CipherData } from "@bitwarden/common/models/data/cipherData";
+import { Attachment } from "@bitwarden/common/models/domain/attachment";
 import { Card } from "@bitwarden/common/models/domain/card";
 import { Cipher } from "@bitwarden/common/models/domain/cipher";
+import { EncString } from "@bitwarden/common/models/domain/encString";
+import { Field } from "@bitwarden/common/models/domain/field";
 import { Identity } from "@bitwarden/common/models/domain/identity";
 import { Login } from "@bitwarden/common/models/domain/login";
+import { Password } from "@bitwarden/common/models/domain/password";
 import { SecureNote } from "@bitwarden/common/models/domain/secureNote";
 import { CardView } from "@bitwarden/common/models/view/cardView";
 import { IdentityView } from "@bitwarden/common/models/view/identityView";
 import { LoginView } from "@bitwarden/common/models/view/loginView";
 
-import { mockEnc } from "../../utils";
+import { mockEnc, mockFromJson } from "../../utils";
 
 describe("Cipher DTO", () => {
   it("Convert from empty CipherData", () => {
@@ -587,4 +592,63 @@ describe("Cipher DTO", () => {
       });
     });
   });
+
+  describe("fromJSON", () => {
+    it("initializes nested objects", () => {
+      jest.spyOn(Attachment, "fromJSON").mockImplementation(mockFromJson);
+      jest.spyOn(Field, "fromJSON").mockImplementation(mockFromJson);
+      jest.spyOn(Password, "fromJSON").mockImplementation(mockFromJson);
+      jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson);
+
+      const revisionDate = new Date("2022-08-04T01:06:40.441Z");
+      const deletedDate = new Date("2022-09-04T01:06:40.441Z");
+      const actual = Cipher.fromJSON({
+        name: "myName",
+        notes: "myNotes",
+        revisionDate: revisionDate.toISOString(),
+        attachments: ["attachment1", "attachment2"] as any,
+        fields: ["field1", "field2"] as any,
+        passwordHistory: ["ph1", "ph2"] as any,
+        deletedDate: deletedDate.toISOString(),
+      } as Jsonify<Cipher>);
+
+      expect(actual).toMatchObject({
+        name: "myName_fromJSON",
+        notes: "myNotes_fromJSON",
+        revisionDate: revisionDate,
+        attachments: ["attachment1_fromJSON", "attachment2_fromJSON"],
+        fields: ["field1_fromJSON", "field2_fromJSON"],
+        passwordHistory: ["ph1_fromJSON", "ph2_fromJSON"],
+        deletedDate: deletedDate,
+      });
+      expect(actual).toBeInstanceOf(Cipher);
+    });
+
+    test.each([
+      // Test description, CipherType, expected output
+      ["LoginView", CipherType.Login, { login: "myLogin_fromJSON" }],
+      ["CardView", CipherType.Card, { card: "myCard_fromJSON" }],
+      ["IdentityView", CipherType.Identity, { identity: "myIdentity_fromJSON" }],
+      ["Secure Note", CipherType.SecureNote, { secureNote: "mySecureNote_fromJSON" }],
+    ])("initializes %s", (description: string, cipherType: CipherType, expected: any) => {
+      jest.spyOn(Login, "fromJSON").mockImplementation(mockFromJson);
+      jest.spyOn(Identity, "fromJSON").mockImplementation(mockFromJson);
+      jest.spyOn(Card, "fromJSON").mockImplementation(mockFromJson);
+      jest.spyOn(SecureNote, "fromJSON").mockImplementation(mockFromJson);
+
+      const actual = Cipher.fromJSON({
+        login: "myLogin",
+        card: "myCard",
+        identity: "myIdentity",
+        secureNote: "mySecureNote",
+        type: cipherType,
+      } as any);
+
+      expect(actual).toMatchObject(expected);
+    });
+
+    it("returns null if object is null", () => {
+      expect(Cipher.fromJSON(null)).toBeNull();
+    });
+  });
 });

libs/common/spec/models/domain/encString.spec.ts

@@ -226,5 +226,9 @@ describe("EncString", () => {
 
       expect(encString.toJSON()).toBe(encString.encryptedString);
     });
+
+    it("returns null if object is null", () => {
+      expect(EncString.fromJSON(null)).toBeNull();
+    });
   });
 });

libs/common/spec/models/domain/field.spec.ts

@@ -1,8 +1,9 @@
 import { FieldType } from "@bitwarden/common/enums/fieldType";
 import { FieldData } from "@bitwarden/common/models/data/fieldData";
+import { EncString } from "@bitwarden/common/models/domain/encString";
 import { Field } from "@bitwarden/common/models/domain/field";
 
-import { mockEnc } from "../../utils";
+import { mockEnc, mockFromJson } from "../../utils";
 
 describe("Field", () => {
   let data: FieldData;
@@ -61,4 +62,25 @@ describe("Field", () => {
       showValue: false,
     });
   });
+
+  describe("fromJSON", () => {
+    it("initializes nested objects", () => {
+      jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson);
+
+      const actual = Field.fromJSON({
+        name: "myName",
+        value: "myValue",
+      });
+
+      expect(actual).toEqual({
+        name: "myName_fromJSON",
+        value: "myValue_fromJSON",
+      });
+      expect(actual).toBeInstanceOf(Field);
+    });
+
+    it("returns null if object is null", () => {
+      expect(Field.fromJSON(null)).toBeNull();
+    });
+  });
 });

libs/common/spec/models/domain/folder.spec.ts

@@ -2,7 +2,7 @@ import { FolderData } from "@bitwarden/common/models/data/folderData";
 import { EncString } from "@bitwarden/common/models/domain/encString";
 import { Folder } from "@bitwarden/common/models/domain/folder";
 
-import { mockEnc } from "../../utils";
+import { mockEnc, mockFromJson } from "../../utils";
 
 describe("Folder", () => {
   let data: FolderData;
@@ -42,7 +42,6 @@ describe("Folder", () => {
 
   describe("fromJSON", () => {
     jest.mock("@bitwarden/common/models/domain/encString");
-    const mockFromJson = (stub: any) => (stub + "_fromJSON") as any;
     jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson);
 
     it("initializes nested objects", () => {

libs/common/spec/models/domain/identity.spec.ts

@@ -1,7 +1,8 @@
 import { IdentityData } from "@bitwarden/common/models/data/identityData";
+import { EncString } from "@bitwarden/common/models/domain/encString";
 import { Identity } from "@bitwarden/common/models/domain/identity";
 
-import { mockEnc } from "../../utils";
+import { mockEnc, mockFromJson } from "../../utils";
 
 describe("Identity", () => {
   let data: IdentityData;
@@ -131,4 +132,57 @@ describe("Identity", () => {
       username: "mockUsername",
     });
   });
+
+  describe("fromJSON", () => {
+    it("initializes nested objects", () => {
+      jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson);
+
+      const actual = Identity.fromJSON({
+        firstName: "mockFirstName",
+        lastName: "mockLastName",
+        address1: "mockAddress1",
+        address2: "mockAddress2",
+        address3: "mockAddress3",
+        city: "mockCity",
+        company: "mockCompany",
+        country: "mockCountry",
+        email: "mockEmail",
+        licenseNumber: "mockLicenseNumber",
+        middleName: "mockMiddleName",
+        passportNumber: "mockPassportNumber",
+        phone: "mockPhone",
+        postalCode: "mockPostalCode",
+        ssn: "mockSsn",
+        state: "mockState",
+        title: "mockTitle",
+        username: "mockUsername",
+      });
+
+      expect(actual).toEqual({
+        firstName: "mockFirstName_fromJSON",
+        lastName: "mockLastName_fromJSON",
+        address1: "mockAddress1_fromJSON",
+        address2: "mockAddress2_fromJSON",
+        address3: "mockAddress3_fromJSON",
+        city: "mockCity_fromJSON",
+        company: "mockCompany_fromJSON",
+        country: "mockCountry_fromJSON",
+        email: "mockEmail_fromJSON",
+        licenseNumber: "mockLicenseNumber_fromJSON",
+        middleName: "mockMiddleName_fromJSON",
+        passportNumber: "mockPassportNumber_fromJSON",
+        phone: "mockPhone_fromJSON",
+        postalCode: "mockPostalCode_fromJSON",
+        ssn: "mockSsn_fromJSON",
+        state: "mockState_fromJSON",
+        title: "mockTitle_fromJSON",
+        username: "mockUsername_fromJSON",
+      });
+      expect(actual).toBeInstanceOf(Identity);
+    });
+
+    it("returns null if object is null", () => {
+      expect(Identity.fromJSON(null)).toBeNull();
+    });
+  });
 });

libs/common/spec/models/domain/login.spec.ts

@@ -2,11 +2,12 @@ import { Substitute, Arg } from "@fluffy-spoon/substitute";
 
 import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
 import { LoginData } from "@bitwarden/common/models/data/loginData";
+import { EncString } from "@bitwarden/common/models/domain/encString";
 import { Login } from "@bitwarden/common/models/domain/login";
 import { LoginUri } from "@bitwarden/common/models/domain/loginUri";
 import { LoginUriView } from "@bitwarden/common/models/view/loginUriView";
 
-import { mockEnc } from "../../utils";
+import { mockEnc, mockFromJson } from "../../utils";
 
 describe("Login DTO", () => {
   it("Convert from empty LoginData", () => {
@@ -98,4 +99,33 @@ describe("Login DTO", () => {
 
     expect(loginData).toEqual(data);
   });
+
+  describe("fromJSON", () => {
+    it("initializes nested objects", () => {
+      jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson);
+      jest.spyOn(LoginUri, "fromJSON").mockImplementation(mockFromJson);
+      const passwordRevisionDate = new Date("2022-01-31T12:00:00.000Z");
+
+      const actual = Login.fromJSON({
+        uris: ["loginUri1", "loginUri2"] as any,
+        username: "myUsername",
+        password: "myPassword",
+        passwordRevisionDate: passwordRevisionDate.toISOString(),
+        totp: "myTotp",
+      });
+
+      expect(actual).toEqual({
+        uris: ["loginUri1_fromJSON", "loginUri2_fromJSON"] as any,
+        username: "myUsername_fromJSON",
+        password: "myPassword_fromJSON",
+        passwordRevisionDate: passwordRevisionDate,
+        totp: "myTotp_fromJSON",
+      });
+      expect(actual).toBeInstanceOf(Login);
+    });
+
+    it("returns null if object is null", () => {
+      expect(Login.fromJSON(null)).toBeNull();
+    });
+  });
 });

libs/common/spec/models/domain/loginUri.spec.ts

@@ -1,8 +1,11 @@
+import { Jsonify } from "type-fest";
+
 import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
 import { LoginUriData } from "@bitwarden/common/models/data/loginUriData";
+import { EncString } from "@bitwarden/common/models/domain/encString";
 import { LoginUri } from "@bitwarden/common/models/domain/loginUri";
 
-import { mockEnc } from "../../utils";
+import { mockEnc, mockFromJson } from "../../utils";
 
 describe("LoginUri", () => {
   let data: LoginUriData;
@@ -54,4 +57,23 @@ describe("LoginUri", () => {
       match: 3,
     });
   });
+
+  describe("fromJSON", () => {
+    it("initializes nested objects", () => {
+      jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson);
+
+      const actual = LoginUri.fromJSON({
+        uri: "myUri",
+      } as Jsonify<LoginUri>);
+
+      expect(actual).toEqual({
+        uri: "myUri_fromJSON",
+      });
+      expect(actual).toBeInstanceOf(LoginUri);
+    });
+
+    it("returns null if object is null", () => {
+      expect(LoginUri.fromJSON(null)).toBeNull();
+    });
+  });
 });

libs/common/spec/models/domain/password.spec.ts

@@ -1,7 +1,8 @@
 import { PasswordHistoryData } from "@bitwarden/common/models/data/passwordHistoryData";
+import { EncString } from "@bitwarden/common/models/domain/encString";
 import { Password } from "@bitwarden/common/models/domain/password";
 
-import { mockEnc } from "../../utils";
+import { mockEnc, mockFromJson } from "../../utils";
 
 describe("Password", () => {
   let data: PasswordHistoryData;
@@ -48,4 +49,26 @@ describe("Password", () => {
       lastUsedDate: new Date("2022-01-31T12:00:00.000Z"),
     });
   });
+
+  describe("fromJSON", () => {
+    it("initializes nested objects", () => {
+      jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson);
+      const lastUsedDate = new Date("2022-01-31T12:00:00.000Z");
+
+      const actual = Password.fromJSON({
+        password: "myPassword",
+        lastUsedDate: lastUsedDate.toISOString(),
+      });
+
+      expect(actual).toEqual({
+        password: "myPassword_fromJSON",
+        lastUsedDate: lastUsedDate,
+      });
+      expect(actual).toBeInstanceOf(Password);
+    });
+
+    it("returns null if object is null", () => {
+      expect(Password.fromJSON(null)).toBeNull();
+    });
+  });
 });

libs/common/spec/models/domain/secureNote.spec.ts

@@ -43,4 +43,10 @@ describe("SecureNote", () => {
       type: 0,
     });
   });
+
+  describe("fromJSON", () => {
+    it("returns null if object is null", () => {
+      expect(SecureNote.fromJSON(null)).toBeNull();
+    });
+  });
 });

libs/common/spec/models/view/attachmentView.spec.ts

@@ -1,12 +1,13 @@
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
 import { AttachmentView } from "@bitwarden/common/models/view/attachmentView";
 
+import { mockFromJson } from "../../utils";
+
 jest.mock("@bitwarden/common/models/domain/symmetricCryptoKey");
 
 describe("AttachmentView", () => {
   it("fromJSON initializes nested objects", () => {
-    const mockFromJson = (stub: string) => stub + "_fromJSON";
-    jest.spyOn(SymmetricCryptoKey, "fromJSON").mockImplementation(mockFromJson as any);
+    jest.spyOn(SymmetricCryptoKey, "fromJSON").mockImplementation(mockFromJson);
 
     const actual = AttachmentView.fromJSON({
       key: "encKeyB64" as any,

libs/common/spec/models/view/cipherView.spec.ts

@@ -8,6 +8,8 @@ import { LoginView } from "@bitwarden/common/models/view/loginView";
 import { PasswordHistoryView } from "@bitwarden/common/models/view/passwordHistoryView";
 import { SecureNoteView } from "@bitwarden/common/models/view/secureNoteView";
 
+import { mockFromJson } from "../../utils";
+
 jest.mock("@bitwarden/common/models/view/loginView");
 jest.mock("@bitwarden/common/models/view/attachmentView");
 jest.mock("@bitwarden/common/models/view/fieldView");
@@ -22,8 +24,6 @@ describe("CipherView", () => {
   });
 
   describe("fromJSON", () => {
-    const mockFromJson = (stub: any) => (stub + "_fromJSON") as any;
-
     it("initializes nested objects", () => {
       jest.spyOn(AttachmentView, "fromJSON").mockImplementation(mockFromJson);
       jest.spyOn(FieldView, "fromJSON").mockImplementation(mockFromJson);

libs/common/spec/models/view/loginView.spec.ts

@@ -1,6 +1,8 @@
 import { LoginUriView } from "@bitwarden/common/models/view/loginUriView";
 import { LoginView } from "@bitwarden/common/models/view/loginView";
 
+import { mockFromJson } from "../../utils";
+
 jest.mock("@bitwarden/common/models/view/loginUriView");
 
 describe("LoginView", () => {
@@ -9,8 +11,7 @@ describe("LoginView", () => {
   });
 
   it("fromJSON initializes nested objects", () => {
-    const mockFromJson = (stub: string) => stub + "_fromJSON";
-    jest.spyOn(LoginUriView, "fromJSON").mockImplementation(mockFromJson as any);
+    jest.spyOn(LoginUriView, "fromJSON").mockImplementation(mockFromJson);
 
     const passwordRevisionDate = new Date();
 

libs/common/spec/utils.ts

@@ -35,3 +35,8 @@ export function makeStaticByteArray(length: number, start = 0) {
   }
   return arr;
 }
+
+/**
+ * Use to mock a return value of a static fromJSON method.
+ */
+export const mockFromJson = (stub: any) => (stub + "_fromJSON") as any;

libs/common/src/abstractions/abstractEncrypt.service.ts

@@ -1,8 +1,7 @@
-import { EncString } from "@bitwarden/common/models/domain/encString";
-import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
-
 import { IEncrypted } from "../interfaces/IEncrypted";
 import { EncArrayBuffer } from "../models/domain/encArrayBuffer";
+import { EncString } from "../models/domain/encString";
+import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
 
 export abstract class AbstractEncryptService {
   abstract encrypt(plainValue: string | ArrayBuffer, key: SymmetricCryptoKey): Promise<EncString>;

libs/common/src/abstractions/account/account-api.service.abstraction.ts

@@ -1,4 +1,4 @@
-import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest";
+import { SecretVerificationRequest } from "../../models/request/secretVerificationRequest";
 
 export abstract class AccountApiService {
   abstract deleteAccount(request: SecretVerificationRequest): Promise<void>;

libs/common/src/abstractions/config/config-api.service.abstraction.ts

@@ -1,4 +1,4 @@
-import { ServerConfigResponse } from "@bitwarden/common/models/response/server-config-response";
+import { ServerConfigResponse } from "../../models/response/server-config-response";
 
 export abstract class ConfigApiServiceAbstraction {
   get: () => Promise<ServerConfigResponse>;

libs/common/src/abstractions/config/server-config.ts

@@ -2,7 +2,7 @@ import {
   ServerConfigData,
   ThirdPartyServerConfigData,
   EnvironmentServerConfigData,
-} from "@bitwarden/common/models/data/server-config.data";
+} from "../../models/data/server-config.data";
 
 const dayInMilliseconds = 24 * 3600 * 1000;
 const eighteenHoursInMilliseconds = 18 * 3600 * 1000;

libs/common/src/abstractions/folder/folder-api.service.abstraction.ts

@@ -1,5 +1,5 @@
-import { Folder } from "@bitwarden/common/models/domain/folder";
-import { FolderResponse } from "@bitwarden/common/models/response/folderResponse";
+import { Folder } from "../../models/domain/folder";
+import { FolderResponse } from "../../models/response/folderResponse";
 
 export class FolderApiServiceAbstraction {
   save: (folder: Folder) => Promise<any>;

libs/common/src/abstractions/policy/policy-api.service.abstraction.ts

@@ -1,9 +1,9 @@
-import { PolicyType } from "@bitwarden/common/enums/policyType";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions";
-import { Policy } from "@bitwarden/common/models/domain/policy";
-import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest";
-import { ListResponse } from "@bitwarden/common/models/response/listResponse";
-import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse";
+import { PolicyType } from "../../enums/policyType";
+import { MasterPasswordPolicyOptions } from "../../models/domain/masterPasswordPolicyOptions";
+import { Policy } from "../../models/domain/policy";
+import { PolicyRequest } from "../../models/request/policyRequest";
+import { ListResponse } from "../../models/response/listResponse";
+import { PolicyResponse } from "../../models/response/policyResponse";
 
 export class PolicyApiServiceAbstraction {
   getPolicy: (organizationId: string, type: PolicyType) => Promise<PolicyResponse>;

libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts

@@ -1,4 +1,4 @@
-import { VerifyOTPRequest } from "@bitwarden/common/models/request/account/verifyOTPRequest";
+import { VerifyOTPRequest } from "../../models/request/account/verifyOTPRequest";
 
 export abstract class UserVerificationApiServiceAbstraction {
   postAccountVerifyOTP: (request: VerifyOTPRequest) => Promise<void>;

libs/common/src/misc/utils.ts

@@ -1,9 +1,8 @@
 /* eslint-disable no-useless-escape */
 import * as tldjs from "tldjs";
 
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-
 import { AbstractEncryptService } from "../abstractions/abstractEncrypt.service";
+import { CryptoService } from "../abstractions/crypto.service";
 import { I18nService } from "../abstractions/i18n.service";
 
 const nodeURL = typeof window === "undefined" ? require("url") : null;

libs/common/src/models/api/scimConfigApi.ts

@@ -1,5 +1,4 @@
-import { ScimProviderType } from "@bitwarden/common/enums/scimProviderType";
-
+import { ScimProviderType } from "../../enums/scimProviderType";
 import { BaseResponse } from "../response/baseResponse";
 
 export class ScimConfigApi extends BaseResponse {

libs/common/src/models/domain/account-keys.spec.ts

@@ -1,6 +1,5 @@
-import { Utils } from "@bitwarden/common/misc/utils";
-
 import { makeStaticByteArray } from "../../../spec/utils";
+import { Utils } from "../../misc/utils";
 
 import { AccountKeys, EncryptionPair } from "./account";
 import { SymmetricCryptoKey } from "./symmetricCryptoKey";

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

@@ -1,11 +1,10 @@
 import { Except, Jsonify } from "type-fest";
 
-import { Utils } from "@bitwarden/common/misc/utils";
-import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify";
-
 import { AuthenticationStatus } from "../../enums/authenticationStatus";
 import { KdfType } from "../../enums/kdfType";
 import { UriMatchType } from "../../enums/uriMatchType";
+import { Utils } from "../../misc/utils";
+import { DeepJsonify } from "../../types/deep-jsonify";
 import { CipherData } from "../data/cipherData";
 import { CollectionData } from "../data/collectionData";
 import { EncryptedOrganizationKeyData } from "../data/encryptedOrganizationKeyData";

libs/common/src/models/domain/attachment.ts

@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
 import { Utils } from "../../misc/utils";
 import { AttachmentData } from "../data/attachmentData";
 import { AttachmentView } from "../view/attachmentView";
@@ -90,4 +92,18 @@ export class Attachment extends Domain {
     );
     return a;
   }
+
+  static fromJSON(obj: Partial<Jsonify<Attachment>>): Attachment {
+    if (obj == null) {
+      return null;
+    }
+
+    const key = EncString.fromJSON(obj.key);
+    const fileName = EncString.fromJSON(obj.fileName);
+
+    return Object.assign(new Attachment(), obj, {
+      key,
+      fileName,
+    });
+  }
 }

libs/common/src/models/domain/card.ts

@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
 import { CardData } from "../data/cardData";
 import { CardView } from "../view/cardView";
 
@@ -62,4 +64,25 @@ export class Card extends Domain {
     });
     return c;
   }
+
+  static fromJSON(obj: Partial<Jsonify<Card>>): Card {
+    if (obj == null) {
+      return null;
+    }
+
+    const cardholderName = EncString.fromJSON(obj.cardholderName);
+    const brand = EncString.fromJSON(obj.brand);
+    const number = EncString.fromJSON(obj.number);
+    const expMonth = EncString.fromJSON(obj.expMonth);
+    const expYear = EncString.fromJSON(obj.expYear);
+    const code = EncString.fromJSON(obj.code);
+    return Object.assign(new Card(), obj, {
+      cardholderName,
+      brand,
+      number,
+      expMonth,
+      expYear,
+      code,
+    });
+  }
 }

libs/common/src/models/domain/cipher.ts

@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
 import { CipherRepromptType } from "../../enums/cipherRepromptType";
 import { CipherType } from "../../enums/cipherType";
 import { CipherData } from "../data/cipherData";
@@ -234,4 +236,48 @@ export class Cipher extends Domain {
     }
     return c;
   }
+
+  static fromJSON(obj: Jsonify<Cipher>) {
+    if (obj == null) {
+      return null;
+    }
+
+    const domain = new Cipher();
+    const name = EncString.fromJSON(obj.name);
+    const notes = EncString.fromJSON(obj.notes);
+    const revisionDate = obj.revisionDate == null ? null : new Date(obj.revisionDate);
+    const deletedDate = obj.deletedDate == null ? null : new Date(obj.deletedDate);
+    const attachments = obj.attachments?.map((a: any) => Attachment.fromJSON(a));
+    const fields = obj.fields?.map((f: any) => Field.fromJSON(f));
+    const passwordHistory = obj.passwordHistory?.map((ph: any) => Password.fromJSON(ph));
+
+    Object.assign(domain, obj, {
+      name,
+      notes,
+      revisionDate,
+      deletedDate,
+      attachments,
+      fields,
+      passwordHistory,
+    });
+
+    switch (obj.type) {
+      case CipherType.Card:
+        domain.card = Card.fromJSON(obj.card);
+        break;
+      case CipherType.Identity:
+        domain.identity = Identity.fromJSON(obj.identity);
+        break;
+      case CipherType.Login:
+        domain.login = Login.fromJSON(obj.login);
+        break;
+      case CipherType.SecureNote:
+        domain.secureNote = SecureNote.fromJSON(obj.secureNote);
+        break;
+      default:
+        break;
+    }
+
+    return domain;
+  }
 }

libs/common/src/models/domain/encArrayBuffer.ts

@@ -1,6 +1,6 @@
-import { EncryptionType } from "@bitwarden/common/enums/encryptionType";
-import { IEncrypted } from "@bitwarden/common/interfaces/IEncrypted";
-import { Utils } from "@bitwarden/common/misc/utils";
+import { EncryptionType } from "../../enums/encryptionType";
+import { IEncrypted } from "../../interfaces/IEncrypted";
+import { Utils } from "../../misc/utils";
 
 const ENC_TYPE_LENGTH = 1;
 const IV_LENGTH = 16;

libs/common/src/models/domain/encString.ts

@@ -1,8 +1,7 @@
 import { Jsonify } from "type-fest";
 
-import { IEncrypted } from "@bitwarden/common/interfaces/IEncrypted";
-
 import { EncryptionType } from "../../enums/encryptionType";
+import { IEncrypted } from "../../interfaces/IEncrypted";
 import { Utils } from "../../misc/utils";
 
 import { SymmetricCryptoKey } from "./symmetricCryptoKey";
@@ -45,6 +44,10 @@ export class EncString implements IEncrypted {
   }
 
   static fromJSON(obj: Jsonify<EncString>): EncString {
+    if (obj == null) {
+      return null;
+    }
+
     return new EncString(obj);
   }
 

libs/common/src/models/domain/encryption-pair.spec.ts

@@ -1,4 +1,4 @@
-import { Utils } from "@bitwarden/common/misc/utils";
+import { Utils } from "../../misc/utils";
 
 import { EncryptionPair } from "./account";
 

libs/common/src/models/domain/field.ts

@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
 import { FieldType } from "../../enums/fieldType";
 import { LinkedIdType } from "../../enums/linkedIdType";
 import { FieldData } from "../data/fieldData";
@@ -59,4 +61,18 @@ export class Field extends Domain {
     );
     return f;
   }
+
+  static fromJSON(obj: Partial<Jsonify<Field>>): Field {
+    if (obj == null) {
+      return null;
+    }
+
+    const name = EncString.fromJSON(obj.name);
+    const value = EncString.fromJSON(obj.value);
+
+    return Object.assign(new Field(), obj, {
+      name,
+      value,
+    });
+  }
 }

libs/common/src/models/domain/identity.ts

@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
 import { IdentityData } from "../data/identityData";
 import { IdentityView } from "../view/identityView";
 
@@ -110,4 +112,50 @@ export class Identity extends Domain {
     });
     return i;
   }
+
+  static fromJSON(obj: Jsonify<Identity>): Identity {
+    if (obj == null) {
+      return null;
+    }
+
+    const title = EncString.fromJSON(obj.title);
+    const firstName = EncString.fromJSON(obj.firstName);
+    const middleName = EncString.fromJSON(obj.middleName);
+    const lastName = EncString.fromJSON(obj.lastName);
+    const address1 = EncString.fromJSON(obj.address1);
+    const address2 = EncString.fromJSON(obj.address2);
+    const address3 = EncString.fromJSON(obj.address3);
+    const city = EncString.fromJSON(obj.city);
+    const state = EncString.fromJSON(obj.state);
+    const postalCode = EncString.fromJSON(obj.postalCode);
+    const country = EncString.fromJSON(obj.country);
+    const company = EncString.fromJSON(obj.company);
+    const email = EncString.fromJSON(obj.email);
+    const phone = EncString.fromJSON(obj.phone);
+    const ssn = EncString.fromJSON(obj.ssn);
+    const username = EncString.fromJSON(obj.username);
+    const passportNumber = EncString.fromJSON(obj.passportNumber);
+    const licenseNumber = EncString.fromJSON(obj.licenseNumber);
+
+    return Object.assign(new Identity(), obj, {
+      title,
+      firstName,
+      middleName,
+      lastName,
+      address1,
+      address2,
+      address3,
+      city,
+      state,
+      postalCode,
+      country,
+      company,
+      email,
+      phone,
+      ssn,
+      username,
+      passportNumber,
+      licenseNumber,
+    });
+  }
 }

libs/common/src/models/domain/logInCredentials.ts

@@ -1,6 +1,5 @@
-import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
-
 import { AuthenticationType } from "../../enums/authenticationType";
+import { SymmetricCryptoKey } from "../../models/domain/symmetricCryptoKey";
 import { TokenRequestTwoFactor } from "../request/identityToken/tokenRequestTwoFactor";
 
 export class PasswordLogInCredentials {

libs/common/src/models/domain/login.ts

@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
 import { LoginData } from "../data/loginData";
 import { LoginView } from "../view/loginView";
 
@@ -85,4 +87,25 @@ export class Login extends Domain {
 
     return l;
   }
+
+  static fromJSON(obj: Partial<Jsonify<Login>>): Login {
+    if (obj == null) {
+      return null;
+    }
+
+    const username = EncString.fromJSON(obj.username);
+    const password = EncString.fromJSON(obj.password);
+    const totp = EncString.fromJSON(obj.totp);
+    const passwordRevisionDate =
+      obj.passwordRevisionDate == null ? null : new Date(obj.passwordRevisionDate);
+    const uris = obj.uris?.map((uri: any) => LoginUri.fromJSON(uri));
+
+    return Object.assign(new Login(), obj, {
+      username,
+      password,
+      totp,
+      passwordRevisionDate: passwordRevisionDate,
+      uris: uris,
+    });
+  }
 }

libs/common/src/models/domain/loginUri.ts

@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
 import { UriMatchType } from "../../enums/uriMatchType";
 import { LoginUriData } from "../data/loginUriData";
 import { LoginUriView } from "../view/loginUriView";
@@ -51,4 +53,15 @@ export class LoginUri extends Domain {
     );
     return u;
   }
+
+  static fromJSON(obj: Jsonify<LoginUri>): LoginUri {
+    if (obj == null) {
+      return null;
+    }
+
+    const uri = EncString.fromJSON(obj.uri);
+    return Object.assign(new LoginUri(), obj, {
+      uri,
+    });
+  }
 }

libs/common/src/models/domain/password.ts

@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
 import { PasswordHistoryData } from "../data/passwordHistoryData";
 import { PasswordHistoryView } from "../view/passwordHistoryView";
 
@@ -40,4 +42,18 @@ export class Password extends Domain {
     });
     return ph;
   }
+
+  static fromJSON(obj: Partial<Jsonify<Password>>): Password {
+    if (obj == null) {
+      return null;
+    }
+
+    const password = EncString.fromJSON(obj.password);
+    const lastUsedDate = obj.lastUsedDate == null ? null : new Date(obj.lastUsedDate);
+
+    return Object.assign(new Password(), obj, {
+      password,
+      lastUsedDate,
+    });
+  }
 }

libs/common/src/models/domain/secureNote.ts

@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
 import { SecureNoteType } from "../../enums/secureNoteType";
 import { SecureNoteData } from "../data/secureNoteData";
 import { SecureNoteView } from "../view/secureNoteView";
@@ -26,4 +28,12 @@ export class SecureNote extends Domain {
     n.type = this.type;
     return n;
   }
+
+  static fromJSON(obj: Jsonify<SecureNote>): SecureNote {
+    if (obj == null) {
+      return null;
+    }
+
+    return Object.assign(new SecureNote(), obj);
+  }
 }

libs/common/src/models/domain/symmetricCryptoKey.ts

@@ -1,8 +1,7 @@
 import { Jsonify } from "type-fest";
 
-import { Utils } from "@bitwarden/common/misc/utils";
-
 import { EncryptionType } from "../../enums/encryptionType";
+import { Utils } from "../../misc/utils";
 
 export class SymmetricCryptoKey {
   key: ArrayBuffer;

libs/common/src/models/request/scimConfigRequest.ts

@@ -1,4 +1,4 @@
-import { ScimProviderType } from "@bitwarden/common/enums/scimProviderType";
+import { ScimProviderType } from "../../enums/scimProviderType";
 
 export class ScimConfigRequest {
   constructor(private enabled: boolean, private scimProvider: ScimProviderType = null) {}

libs/common/src/models/response/authRequestResponse.ts

@@ -1,4 +1,4 @@
-import { DeviceType } from "@bitwarden/common/enums/deviceType";
+import { DeviceType } from "../../enums/deviceType";
 
 import { BaseResponse } from "./baseResponse";
 

libs/common/src/services/account/account-api.service.ts

@@ -1,6 +1,6 @@
-import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/abstractions/account/account-api.service.abstraction";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest";
+import { AccountApiService as AccountApiServiceAbstraction } from "../../abstractions/account/account-api.service.abstraction";
+import { ApiService } from "../../abstractions/api.service";
+import { SecretVerificationRequest } from "../../models/request/secretVerificationRequest";
 
 export class AccountApiService implements AccountApiServiceAbstraction {
   constructor(private apiService: ApiService) {}

libs/common/src/services/account/account.service.ts

@@ -1,9 +1,8 @@
-import { AccountApiService } from "@bitwarden/common/abstractions/account/account-api.service.abstraction";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
-
+import { AccountApiService } from "../../abstractions/account/account-api.service.abstraction";
 import { AccountService as AccountServiceAbstraction } from "../../abstractions/account/account.service.abstraction";
+import { LogService } from "../../abstractions/log.service";
+import { MessagingService } from "../../abstractions/messaging.service";
+import { UserVerificationService } from "../../abstractions/userVerification/userVerification.service.abstraction";
 import { Verification } from "../../types/verification";
 
 export class AccountService implements AccountServiceAbstraction {

libs/common/src/services/anonymousHub.service.ts

@@ -32,7 +32,7 @@ export class AnonymousHubService implements AnonymousHubServiceAbstraction {
     this.url = this.environmentService.getNotificationsUrl();
 
     this.anonHubConnection = new HubConnectionBuilder()
-      .withUrl(this.url + "/anonymousHub?Token=" + token, {
+      .withUrl(this.url + "/anonymous-hub?Token=" + token, {
         skipNegotiation: true,
         transport: HttpTransportType.WebSockets,
       })

libs/common/src/services/config/config-api.service.ts

@@ -1,6 +1,6 @@
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { ConfigApiServiceAbstraction as ConfigApiServiceAbstraction } from "@bitwarden/common/abstractions/config/config-api.service.abstraction";
-import { ServerConfigResponse } from "@bitwarden/common/models/response/server-config-response";
+import { ApiService } from "../../abstractions/api.service";
+import { ConfigApiServiceAbstraction as ConfigApiServiceAbstraction } from "../../abstractions/config/config-api.service.abstraction";
+import { ServerConfigResponse } from "../../models/response/server-config-response";
 
 export class ConfigApiService implements ConfigApiServiceAbstraction {
   constructor(private apiService: ApiService) {}

libs/common/src/services/config/config.service.ts

@@ -1,11 +1,10 @@
 import { BehaviorSubject, concatMap, map, switchMap, timer, EMPTY } from "rxjs";
 
-import { ServerConfigData } from "@bitwarden/common/models/data/server-config.data";
-
 import { ConfigApiServiceAbstraction } from "../../abstractions/config/config-api.service.abstraction";
 import { ConfigServiceAbstraction } from "../../abstractions/config/config.service.abstraction";
 import { ServerConfig } from "../../abstractions/config/server-config";
 import { StateService } from "../../abstractions/state.service";
+import { ServerConfigData } from "../../models/data/server-config.data";
 
 export class ConfigService implements ConfigServiceAbstraction {
   private _serverConfig = new BehaviorSubject<ServerConfig | null>(null);

libs/common/src/services/encrypt.service.ts

@@ -1,14 +1,13 @@
-import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { Utils } from "@bitwarden/common/misc/utils";
-import { EncString } from "@bitwarden/common/models/domain/encString";
-import { EncryptedObject } from "@bitwarden/common/models/domain/encryptedObject";
-import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
-
 import { AbstractEncryptService } from "../abstractions/abstractEncrypt.service";
+import { CryptoFunctionService } from "../abstractions/cryptoFunction.service";
+import { LogService } from "../abstractions/log.service";
 import { EncryptionType } from "../enums/encryptionType";
 import { IEncrypted } from "../interfaces/IEncrypted";
+import { Utils } from "../misc/utils";
 import { EncArrayBuffer } from "../models/domain/encArrayBuffer";
+import { EncString } from "../models/domain/encString";
+import { EncryptedObject } from "../models/domain/encryptedObject";
+import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
 
 export class EncryptService implements AbstractEncryptService {
   constructor(

libs/common/src/services/folder/folder-api.service.ts

@@ -1,10 +1,10 @@
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction";
-import { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
-import { FolderData } from "@bitwarden/common/models/data/folderData";
-import { Folder } from "@bitwarden/common/models/domain/folder";
-import { FolderRequest } from "@bitwarden/common/models/request/folderRequest";
-import { FolderResponse } from "@bitwarden/common/models/response/folderResponse";
+import { ApiService } from "../../abstractions/api.service";
+import { FolderApiServiceAbstraction } from "../../abstractions/folder/folder-api.service.abstraction";
+import { InternalFolderService } from "../../abstractions/folder/folder.service.abstraction";
+import { FolderData } from "../../models/data/folderData";
+import { Folder } from "../../models/domain/folder";
+import { FolderRequest } from "../../models/request/folderRequest";
+import { FolderResponse } from "../../models/response/folderResponse";
 
 export class FolderApiService implements FolderApiServiceAbstraction {
   constructor(private folderService: InternalFolderService, private apiService: ApiService) {}

libs/common/src/services/memoryStorage.service.ts

@@ -1,7 +1,7 @@
 import {
   AbstractStorageService,
   MemoryStorageServiceInterface,
-} from "@bitwarden/common/abstractions/storage.service";
+} from "../abstractions/storage.service";
 
 export class MemoryStorageService
   extends AbstractStorageService

libs/common/src/services/noopEvent.service.ts

@@ -1,5 +1,5 @@
-import { EventService } from "@bitwarden/common/abstractions/event.service";
-import { EventType } from "@bitwarden/common/enums/eventType";
+import { EventService } from "../abstractions/event.service";
+import { EventType } from "../enums/eventType";
 
 /**
  * If you want to use this, don't.

libs/common/src/services/policy/policy-api.service.ts

@@ -1,15 +1,15 @@
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
-import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
-import { PolicyData } from "@bitwarden/common/models/data/policyData";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions";
-import { Policy } from "@bitwarden/common/models/domain/policy";
-import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest";
-import { ListResponse } from "@bitwarden/common/models/response/listResponse";
-import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse";
+import { ApiService } from "../../abstractions/api.service";
+import { OrganizationService } from "../../abstractions/organization/organization.service.abstraction";
+import { PolicyApiServiceAbstraction } from "../../abstractions/policy/policy-api.service.abstraction";
+import { InternalPolicyService } from "../../abstractions/policy/policy.service.abstraction";
+import { StateService } from "../../abstractions/state.service";
+import { PolicyType } from "../../enums/policyType";
+import { PolicyData } from "../../models/data/policyData";
+import { MasterPasswordPolicyOptions } from "../../models/domain/masterPasswordPolicyOptions";
+import { Policy } from "../../models/domain/policy";
+import { PolicyRequest } from "../../models/request/policyRequest";
+import { ListResponse } from "../../models/response/listResponse";
+import { PolicyResponse } from "../../models/response/policyResponse";
 
 export class PolicyApiService implements PolicyApiServiceAbstraction {
   constructor(

libs/components/src/avatar/avatar.stories.ts

@@ -6,6 +6,7 @@ export default {
   title: "Component Library/Avatar",
   component: AvatarComponent,
   args: {
+    id: undefined,
     text: "Walt Walterson",
     size: "default",
   },
@@ -28,13 +29,11 @@ Default.args = {
 
 export const Large = Template.bind({});
 Large.args = {
-  ...Default.args,
   size: "large",
 };
 
 export const Small = Template.bind({});
 Small.args = {
-  ...Default.args,
   size: "small",
 };
 
@@ -45,7 +44,6 @@ LightBackground.args = {
 
 export const Border = Template.bind({});
 Border.args = {
-  ...Default.args,
   border: true,
 };