Apply Prettier (#581)

common/src/models/api/cardApi.ts

@@ -1,23 +1,23 @@
-import { BaseResponse } from '../response/baseResponse';
+import { BaseResponse } from "../response/baseResponse";
 
 export class CardApi extends BaseResponse {
-    cardholderName: string;
-    brand: string;
-    number: string;
-    expMonth: string;
-    expYear: string;
-    code: string;
+  cardholderName: string;
+  brand: string;
+  number: string;
+  expMonth: string;
+  expYear: string;
+  code: string;
 
-    constructor(data: any = null) {
-        super(data);
-        if (data == null) {
-            return;
-        }
-        this.cardholderName = this.getResponseProperty('CardholderName');
-        this.brand = this.getResponseProperty('Brand');
-        this.number = this.getResponseProperty('Number');
-        this.expMonth = this.getResponseProperty('ExpMonth');
-        this.expYear = this.getResponseProperty('ExpYear');
-        this.code = this.getResponseProperty('Code');
+  constructor(data: any = null) {
+    super(data);
+    if (data == null) {
+      return;
     }
+    this.cardholderName = this.getResponseProperty("CardholderName");
+    this.brand = this.getResponseProperty("Brand");
+    this.number = this.getResponseProperty("Number");
+    this.expMonth = this.getResponseProperty("ExpMonth");
+    this.expYear = this.getResponseProperty("ExpYear");
+    this.code = this.getResponseProperty("Code");
+  }
 }

common/src/models/api/fieldApi.ts

@@ -1,22 +1,22 @@
-import { BaseResponse } from '../response/baseResponse';
+import { BaseResponse } from "../response/baseResponse";
 
-import { FieldType } from '../../enums/fieldType';
-import { LinkedIdType } from '../../enums/linkedIdType';
+import { FieldType } from "../../enums/fieldType";
+import { LinkedIdType } from "../../enums/linkedIdType";
 
 export class FieldApi extends BaseResponse {
-    name: string;
-    value: string;
-    type: FieldType;
-    linkedId: LinkedIdType;
+  name: string;
+  value: string;
+  type: FieldType;
+  linkedId: LinkedIdType;
 
-    constructor(data: any = null) {
-        super(data);
-        if (data == null) {
-            return;
-        }
-        this.type = this.getResponseProperty('Type');
-        this.name = this.getResponseProperty('Name');
-        this.value = this.getResponseProperty('Value');
-        this.linkedId = this.getResponseProperty('linkedId');
+  constructor(data: any = null) {
+    super(data);
+    if (data == null) {
+      return;
     }
+    this.type = this.getResponseProperty("Type");
+    this.name = this.getResponseProperty("Name");
+    this.value = this.getResponseProperty("Value");
+    this.linkedId = this.getResponseProperty("linkedId");
+  }
 }

common/src/models/api/identityApi.ts

@@ -1,47 +1,47 @@
-import { BaseResponse } from '../response/baseResponse';
+import { BaseResponse } from "../response/baseResponse";
 
 export class IdentityApi extends BaseResponse {
-    title: string;
-    firstName: string;
-    middleName: string;
-    lastName: string;
-    address1: string;
-    address2: string;
-    address3: string;
-    city: string;
-    state: string;
-    postalCode: string;
-    country: string;
-    company: string;
-    email: string;
-    phone: string;
-    ssn: string;
-    username: string;
-    passportNumber: string;
-    licenseNumber: string;
+  title: string;
+  firstName: string;
+  middleName: string;
+  lastName: string;
+  address1: string;
+  address2: string;
+  address3: string;
+  city: string;
+  state: string;
+  postalCode: string;
+  country: string;
+  company: string;
+  email: string;
+  phone: string;
+  ssn: string;
+  username: string;
+  passportNumber: string;
+  licenseNumber: string;
 
-    constructor(data: any = null) {
-        super(data);
-        if (data == null) {
-            return;
-        }
-        this.title = this.getResponseProperty('Title');
-        this.firstName = this.getResponseProperty('FirstName');
-        this.middleName = this.getResponseProperty('MiddleName');
-        this.lastName = this.getResponseProperty('LastName');
-        this.address1 = this.getResponseProperty('Address1');
-        this.address2 = this.getResponseProperty('Address2');
-        this.address3 = this.getResponseProperty('Address3');
-        this.city = this.getResponseProperty('City');
-        this.state = this.getResponseProperty('State');
-        this.postalCode = this.getResponseProperty('PostalCode');
-        this.country = this.getResponseProperty('Country');
-        this.company = this.getResponseProperty('Company');
-        this.email = this.getResponseProperty('Email');
-        this.phone = this.getResponseProperty('Phone');
-        this.ssn = this.getResponseProperty('SSN');
-        this.username = this.getResponseProperty('Username');
-        this.passportNumber = this.getResponseProperty('PassportNumber');
-        this.licenseNumber = this.getResponseProperty('LicenseNumber');
+  constructor(data: any = null) {
+    super(data);
+    if (data == null) {
+      return;
     }
+    this.title = this.getResponseProperty("Title");
+    this.firstName = this.getResponseProperty("FirstName");
+    this.middleName = this.getResponseProperty("MiddleName");
+    this.lastName = this.getResponseProperty("LastName");
+    this.address1 = this.getResponseProperty("Address1");
+    this.address2 = this.getResponseProperty("Address2");
+    this.address3 = this.getResponseProperty("Address3");
+    this.city = this.getResponseProperty("City");
+    this.state = this.getResponseProperty("State");
+    this.postalCode = this.getResponseProperty("PostalCode");
+    this.country = this.getResponseProperty("Country");
+    this.company = this.getResponseProperty("Company");
+    this.email = this.getResponseProperty("Email");
+    this.phone = this.getResponseProperty("Phone");
+    this.ssn = this.getResponseProperty("SSN");
+    this.username = this.getResponseProperty("Username");
+    this.passportNumber = this.getResponseProperty("PassportNumber");
+    this.licenseNumber = this.getResponseProperty("LicenseNumber");
+  }
 }

common/src/models/api/loginApi.ts

@@ -1,29 +1,29 @@
-import { BaseResponse } from '../response/baseResponse';
+import { BaseResponse } from "../response/baseResponse";
 
-import { LoginUriApi } from './loginUriApi';
+import { LoginUriApi } from "./loginUriApi";
 
 export class LoginApi extends BaseResponse {
-    uris: LoginUriApi[];
-    username: string;
-    password: string;
-    passwordRevisionDate: string;
-    totp: string;
-    autofillOnPageLoad: boolean;
+  uris: LoginUriApi[];
+  username: string;
+  password: string;
+  passwordRevisionDate: string;
+  totp: string;
+  autofillOnPageLoad: boolean;
 
-    constructor(data: any = null) {
-        super(data);
-        if (data == null) {
-            return;
-        }
-        this.username = this.getResponseProperty('Username');
-        this.password = this.getResponseProperty('Password');
-        this.passwordRevisionDate = this.getResponseProperty('PasswordRevisionDate');
-        this.totp = this.getResponseProperty('Totp');
-        this.autofillOnPageLoad = this.getResponseProperty('AutofillOnPageLoad');
-
-        const uris = this.getResponseProperty('Uris');
-        if (uris != null) {
-            this.uris = uris.map((u: any) => new LoginUriApi(u));
-        }
+  constructor(data: any = null) {
+    super(data);
+    if (data == null) {
+      return;
     }
+    this.username = this.getResponseProperty("Username");
+    this.password = this.getResponseProperty("Password");
+    this.passwordRevisionDate = this.getResponseProperty("PasswordRevisionDate");
+    this.totp = this.getResponseProperty("Totp");
+    this.autofillOnPageLoad = this.getResponseProperty("AutofillOnPageLoad");
+
+    const uris = this.getResponseProperty("Uris");
+    if (uris != null) {
+      this.uris = uris.map((u: any) => new LoginUriApi(u));
+    }
+  }
 }

common/src/models/api/loginUriApi.ts

@@ -1,18 +1,18 @@
-import { BaseResponse } from '../response/baseResponse';
+import { BaseResponse } from "../response/baseResponse";
 
-import { UriMatchType } from '../../enums/uriMatchType';
+import { UriMatchType } from "../../enums/uriMatchType";
 
 export class LoginUriApi extends BaseResponse {
-    uri: string;
-    match: UriMatchType = null;
+  uri: string;
+  match: UriMatchType = null;
 
-    constructor(data: any = null) {
-        super(data);
-        if (data == null) {
-            return;
-        }
-        this.uri = this.getResponseProperty('Uri');
-        const match = this.getResponseProperty('Match');
-        this.match = match != null ? match : null;
+  constructor(data: any = null) {
+    super(data);
+    if (data == null) {
+      return;
     }
+    this.uri = this.getResponseProperty("Uri");
+    const match = this.getResponseProperty("Match");
+    this.match = match != null ? match : null;
+  }
 }

common/src/models/api/permissionsApi.ts

@@ -1,55 +1,55 @@
-import { BaseResponse } from '../response/baseResponse';
+import { BaseResponse } from "../response/baseResponse";
 
 export class PermissionsApi extends BaseResponse {
-    accessEventLogs: boolean;
-    accessImportExport: boolean;
-    accessReports: boolean;
-    /**
-     * @deprecated Sep 29 2021: This permission has been split out to `createNewCollections`, `editAnyCollection`, and
-     * `deleteAnyCollection`. It exists here for backwards compatibility with Server versions <= 1.43.0
-     */
-    manageAllCollections: boolean;
-    createNewCollections: boolean;
-    editAnyCollection: boolean;
-    deleteAnyCollection: boolean;
-    /**
-     * @deprecated Sep 29 2021: This permission has been split out to `editAssignedCollections` and
-     * `deleteAssignedCollections`. It exists here for backwards compatibility with Server versions <= 1.43.0
-     */
-    manageAssignedCollections: boolean;
-    editAssignedCollections: boolean;
-    deleteAssignedCollections: boolean;
-    manageCiphers: boolean;
-    manageGroups: boolean;
-    manageSso: boolean;
-    managePolicies: boolean;
-    manageUsers: boolean;
-    manageResetPassword: boolean;
+  accessEventLogs: boolean;
+  accessImportExport: boolean;
+  accessReports: boolean;
+  /**
+   * @deprecated Sep 29 2021: This permission has been split out to `createNewCollections`, `editAnyCollection`, and
+   * `deleteAnyCollection`. It exists here for backwards compatibility with Server versions <= 1.43.0
+   */
+  manageAllCollections: boolean;
+  createNewCollections: boolean;
+  editAnyCollection: boolean;
+  deleteAnyCollection: boolean;
+  /**
+   * @deprecated Sep 29 2021: This permission has been split out to `editAssignedCollections` and
+   * `deleteAssignedCollections`. It exists here for backwards compatibility with Server versions <= 1.43.0
+   */
+  manageAssignedCollections: boolean;
+  editAssignedCollections: boolean;
+  deleteAssignedCollections: boolean;
+  manageCiphers: boolean;
+  manageGroups: boolean;
+  manageSso: boolean;
+  managePolicies: boolean;
+  manageUsers: boolean;
+  manageResetPassword: boolean;
 
-    constructor(data: any = null) {
-        super(data);
-        if (data == null) {
-            return this;
-        }
-        this.accessEventLogs = this.getResponseProperty('AccessEventLogs');
-        this.accessImportExport = this.getResponseProperty('AccessImportExport');
-        this.accessReports = this.getResponseProperty('AccessReports');
-
-        // For backwards compatibility with Server <= 1.43.0
-        this.manageAllCollections = this.getResponseProperty('ManageAllCollections');
-        this.manageAssignedCollections = this.getResponseProperty('ManageAssignedCollections');
-
-        this.createNewCollections = this.getResponseProperty('CreateNewCollections');
-        this.editAnyCollection = this.getResponseProperty('EditAnyCollection');
-        this.deleteAnyCollection = this.getResponseProperty('DeleteAnyCollection');
-        this.editAssignedCollections = this.getResponseProperty('EditAssignedCollections');
-        this.deleteAssignedCollections = this.getResponseProperty('DeleteAssignedCollections');
-
-        this.manageCiphers = this.getResponseProperty('ManageCiphers');
-        this.manageGroups = this.getResponseProperty('ManageGroups');
-        this.manageSso = this.getResponseProperty('ManageSso');
-        this.managePolicies = this.getResponseProperty('ManagePolicies');
-        this.manageUsers = this.getResponseProperty('ManageUsers');
-        this.manageResetPassword = this.getResponseProperty('ManageResetPassword');
+  constructor(data: any = null) {
+    super(data);
+    if (data == null) {
+      return this;
     }
+    this.accessEventLogs = this.getResponseProperty("AccessEventLogs");
+    this.accessImportExport = this.getResponseProperty("AccessImportExport");
+    this.accessReports = this.getResponseProperty("AccessReports");
+
+    // For backwards compatibility with Server <= 1.43.0
+    this.manageAllCollections = this.getResponseProperty("ManageAllCollections");
+    this.manageAssignedCollections = this.getResponseProperty("ManageAssignedCollections");
+
+    this.createNewCollections = this.getResponseProperty("CreateNewCollections");
+    this.editAnyCollection = this.getResponseProperty("EditAnyCollection");
+    this.deleteAnyCollection = this.getResponseProperty("DeleteAnyCollection");
+    this.editAssignedCollections = this.getResponseProperty("EditAssignedCollections");
+    this.deleteAssignedCollections = this.getResponseProperty("DeleteAssignedCollections");
+
+    this.manageCiphers = this.getResponseProperty("ManageCiphers");
+    this.manageGroups = this.getResponseProperty("ManageGroups");
+    this.manageSso = this.getResponseProperty("ManageSso");
+    this.managePolicies = this.getResponseProperty("ManagePolicies");
+    this.manageUsers = this.getResponseProperty("ManageUsers");
+    this.manageResetPassword = this.getResponseProperty("ManageResetPassword");
+  }
 }

common/src/models/api/secureNoteApi.ts

@@ -1,15 +1,15 @@
-import { BaseResponse } from '../response/baseResponse';
+import { BaseResponse } from "../response/baseResponse";
 
-import { SecureNoteType } from '../../enums/secureNoteType';
+import { SecureNoteType } from "../../enums/secureNoteType";
 
 export class SecureNoteApi extends BaseResponse {
-    type: SecureNoteType;
+  type: SecureNoteType;
 
-    constructor(data: any = null) {
-        super(data);
-        if (data == null) {
-            return;
-        }
-        this.type = this.getResponseProperty('Type');
+  constructor(data: any = null) {
+    super(data);
+    if (data == null) {
+      return;
     }
+    this.type = this.getResponseProperty("Type");
+  }
 }

common/src/models/api/sendFileApi.ts

@@ -1,21 +1,21 @@
-import { BaseResponse } from '../response/baseResponse';
+import { BaseResponse } from "../response/baseResponse";
 
 export class SendFileApi extends BaseResponse {
-    id: string;
-    fileName: string;
-    key: string;
-    size: string;
-    sizeName: string;
+  id: string;
+  fileName: string;
+  key: string;
+  size: string;
+  sizeName: string;
 
-    constructor(data: any = null) {
-        super(data);
-        if (data == null) {
-            return;
-        }
-        this.id = this.getResponseProperty('Id');
-        this.fileName = this.getResponseProperty('FileName');
-        this.key = this.getResponseProperty('Key');
-        this.size = this.getResponseProperty('Size');
-        this.sizeName = this.getResponseProperty('SizeName');
+  constructor(data: any = null) {
+    super(data);
+    if (data == null) {
+      return;
     }
+    this.id = this.getResponseProperty("Id");
+    this.fileName = this.getResponseProperty("FileName");
+    this.key = this.getResponseProperty("Key");
+    this.size = this.getResponseProperty("Size");
+    this.sizeName = this.getResponseProperty("SizeName");
+  }
 }

common/src/models/api/sendTextApi.ts

@@ -1,15 +1,15 @@
-import { BaseResponse } from '../response/baseResponse';
+import { BaseResponse } from "../response/baseResponse";
 
 export class SendTextApi extends BaseResponse {
-    text: string;
-    hidden: boolean;
+  text: string;
+  hidden: boolean;
 
-    constructor(data: any = null) {
-        super(data);
-        if (data == null) {
-            return;
-        }
-        this.text = this.getResponseProperty('Text');
-        this.hidden = this.getResponseProperty('Hidden') || false;
+  constructor(data: any = null) {
+    super(data);
+    if (data == null) {
+      return;
     }
+    this.text = this.getResponseProperty("Text");
+    this.hidden = this.getResponseProperty("Hidden") || false;
+  }
 }

common/src/models/api/ssoConfigApi.ts

@@ -1,118 +1,124 @@
-import { BaseResponse } from '../response/baseResponse';
+import { BaseResponse } from "../response/baseResponse";
 
 enum SsoType {
-    OpenIdConnect = 1,
-    Saml2 = 2,
+  OpenIdConnect = 1,
+  Saml2 = 2,
 }
 
 enum OpenIdConnectRedirectBehavior {
-    RedirectGet = 0,
-    FormPost = 1,
+  RedirectGet = 0,
+  FormPost = 1,
 }
 
 enum Saml2BindingType {
-    HttpRedirect = 1,
-    HttpPost = 2,
-    Artifact = 4,
+  HttpRedirect = 1,
+  HttpPost = 2,
+  Artifact = 4,
 }
 
 enum Saml2NameIdFormat {
-    NotConfigured = 0,
-    Unspecified = 1,
-    EmailAddress = 2,
-    X509SubjectName = 3,
-    WindowsDomainQualifiedName = 4,
-    KerberosPrincipalName = 5,
-    EntityIdentifier = 6,
-    Persistent = 7,
-    Transient = 8,
+  NotConfigured = 0,
+  Unspecified = 1,
+  EmailAddress = 2,
+  X509SubjectName = 3,
+  WindowsDomainQualifiedName = 4,
+  KerberosPrincipalName = 5,
+  EntityIdentifier = 6,
+  Persistent = 7,
+  Transient = 8,
 }
 
 enum Saml2SigningBehavior {
-    IfIdpWantAuthnRequestsSigned = 0,
-    Always = 1,
-    Never = 3,
+  IfIdpWantAuthnRequestsSigned = 0,
+  Always = 1,
+  Never = 3,
 }
 
 export class SsoConfigApi extends BaseResponse {
-    configType: SsoType;
+  configType: SsoType;
 
-    keyConnectorEnabled: boolean;
-    keyConnectorUrl: string;
+  keyConnectorEnabled: boolean;
+  keyConnectorUrl: string;
 
-    // OpenId
-    authority: string;
-    clientId: string;
-    clientSecret: string;
-    metadataAddress: string;
-    redirectBehavior: OpenIdConnectRedirectBehavior;
-    getClaimsFromUserInfoEndpoint: boolean;
-    additionalScopes: string;
-    additionalUserIdClaimTypes: string;
-    additionalEmailClaimTypes: string;
-    additionalNameClaimTypes: string;
-    acrValues: string;
-    expectedReturnAcrValue: string;
+  // OpenId
+  authority: string;
+  clientId: string;
+  clientSecret: string;
+  metadataAddress: string;
+  redirectBehavior: OpenIdConnectRedirectBehavior;
+  getClaimsFromUserInfoEndpoint: boolean;
+  additionalScopes: string;
+  additionalUserIdClaimTypes: string;
+  additionalEmailClaimTypes: string;
+  additionalNameClaimTypes: string;
+  acrValues: string;
+  expectedReturnAcrValue: string;
 
-    // SAML
-    spNameIdFormat: Saml2NameIdFormat;
-    spOutboundSigningAlgorithm: string;
-    spSigningBehavior: Saml2SigningBehavior;
-    spMinIncomingSigningAlgorithm: boolean;
-    spWantAssertionsSigned: boolean;
-    spValidateCertificates: boolean;
+  // SAML
+  spNameIdFormat: Saml2NameIdFormat;
+  spOutboundSigningAlgorithm: string;
+  spSigningBehavior: Saml2SigningBehavior;
+  spMinIncomingSigningAlgorithm: boolean;
+  spWantAssertionsSigned: boolean;
+  spValidateCertificates: boolean;
 
-    idpEntityId: string;
-    idpBindingType: Saml2BindingType;
-    idpSingleSignOnServiceUrl: string;
-    idpSingleLogoutServiceUrl: string;
-    idpArtifactResolutionServiceUrl: string;
-    idpX509PublicCert: string;
-    idpOutboundSigningAlgorithm: string;
-    idpAllowUnsolicitedAuthnResponse: boolean;
-    idpDisableOutboundLogoutRequests: boolean;
-    idpWantAuthnRequestsSigned: boolean;
+  idpEntityId: string;
+  idpBindingType: Saml2BindingType;
+  idpSingleSignOnServiceUrl: string;
+  idpSingleLogoutServiceUrl: string;
+  idpArtifactResolutionServiceUrl: string;
+  idpX509PublicCert: string;
+  idpOutboundSigningAlgorithm: string;
+  idpAllowUnsolicitedAuthnResponse: boolean;
+  idpDisableOutboundLogoutRequests: boolean;
+  idpWantAuthnRequestsSigned: boolean;
 
-    constructor(data: any = null) {
-        super(data);
-        if (data == null) {
-            return;
-        }
-
-        this.configType = this.getResponseProperty('ConfigType');
-
-        this.keyConnectorEnabled = this.getResponseProperty('KeyConnectorEnabled');
-        this.keyConnectorUrl = this.getResponseProperty('KeyConnectorUrl');
-
-        this.authority = this.getResponseProperty('Authority');
-        this.clientId = this.getResponseProperty('ClientId');
-        this.clientSecret = this.getResponseProperty('ClientSecret');
-        this.metadataAddress = this.getResponseProperty('MetadataAddress');
-        this.redirectBehavior = this.getResponseProperty('RedirectBehavior');
-        this.getClaimsFromUserInfoEndpoint = this.getResponseProperty('GetClaimsFromUserInfoEndpoint');
-        this.additionalScopes = this.getResponseProperty('AdditionalScopes');
-        this.additionalUserIdClaimTypes = this.getResponseProperty('AdditionalUserIdClaimTypes');
-        this.additionalEmailClaimTypes = this.getResponseProperty('AdditionalEmailClaimTypes');
-        this.additionalNameClaimTypes = this.getResponseProperty('AdditionalNameClaimTypes');
-        this.acrValues = this.getResponseProperty('AcrValues');
-        this.expectedReturnAcrValue = this.getResponseProperty('ExpectedReturnAcrValue');
-
-        this.spNameIdFormat = this.getResponseProperty('SpNameIdFormat');
-        this.spOutboundSigningAlgorithm = this.getResponseProperty('SpOutboundSigningAlgorithm');
-        this.spSigningBehavior = this.getResponseProperty('SpSigningBehavior');
-        this.spMinIncomingSigningAlgorithm = this.getResponseProperty('SpMinIncomingSigningAlgorithm');
-        this.spWantAssertionsSigned = this.getResponseProperty('SpWantAssertionsSigned');
-        this.spValidateCertificates = this.getResponseProperty('SpValidateCertificates');
-
-        this.idpEntityId = this.getResponseProperty('IdpEntityId');
-        this.idpBindingType = this.getResponseProperty('IdpBindingType');
-        this.idpSingleSignOnServiceUrl = this.getResponseProperty('IdpSingleSignOnServiceUrl');
-        this.idpSingleLogoutServiceUrl = this.getResponseProperty('IdpSingleLogoutServiceUrl');
-        this.idpArtifactResolutionServiceUrl = this.getResponseProperty('IdpArtifactResolutionServiceUrl');
-        this.idpX509PublicCert = this.getResponseProperty('IdpX509PublicCert');
-        this.idpOutboundSigningAlgorithm = this.getResponseProperty('IdpOutboundSigningAlgorithm');
-        this.idpAllowUnsolicitedAuthnResponse = this.getResponseProperty('IdpAllowUnsolicitedAuthnResponse');
-        this.idpDisableOutboundLogoutRequests = this.getResponseProperty('IdpDisableOutboundLogoutRequests');
-        this.idpWantAuthnRequestsSigned = this.getResponseProperty('IdpWantAuthnRequestsSigned');
+  constructor(data: any = null) {
+    super(data);
+    if (data == null) {
+      return;
     }
+
+    this.configType = this.getResponseProperty("ConfigType");
+
+    this.keyConnectorEnabled = this.getResponseProperty("KeyConnectorEnabled");
+    this.keyConnectorUrl = this.getResponseProperty("KeyConnectorUrl");
+
+    this.authority = this.getResponseProperty("Authority");
+    this.clientId = this.getResponseProperty("ClientId");
+    this.clientSecret = this.getResponseProperty("ClientSecret");
+    this.metadataAddress = this.getResponseProperty("MetadataAddress");
+    this.redirectBehavior = this.getResponseProperty("RedirectBehavior");
+    this.getClaimsFromUserInfoEndpoint = this.getResponseProperty("GetClaimsFromUserInfoEndpoint");
+    this.additionalScopes = this.getResponseProperty("AdditionalScopes");
+    this.additionalUserIdClaimTypes = this.getResponseProperty("AdditionalUserIdClaimTypes");
+    this.additionalEmailClaimTypes = this.getResponseProperty("AdditionalEmailClaimTypes");
+    this.additionalNameClaimTypes = this.getResponseProperty("AdditionalNameClaimTypes");
+    this.acrValues = this.getResponseProperty("AcrValues");
+    this.expectedReturnAcrValue = this.getResponseProperty("ExpectedReturnAcrValue");
+
+    this.spNameIdFormat = this.getResponseProperty("SpNameIdFormat");
+    this.spOutboundSigningAlgorithm = this.getResponseProperty("SpOutboundSigningAlgorithm");
+    this.spSigningBehavior = this.getResponseProperty("SpSigningBehavior");
+    this.spMinIncomingSigningAlgorithm = this.getResponseProperty("SpMinIncomingSigningAlgorithm");
+    this.spWantAssertionsSigned = this.getResponseProperty("SpWantAssertionsSigned");
+    this.spValidateCertificates = this.getResponseProperty("SpValidateCertificates");
+
+    this.idpEntityId = this.getResponseProperty("IdpEntityId");
+    this.idpBindingType = this.getResponseProperty("IdpBindingType");
+    this.idpSingleSignOnServiceUrl = this.getResponseProperty("IdpSingleSignOnServiceUrl");
+    this.idpSingleLogoutServiceUrl = this.getResponseProperty("IdpSingleLogoutServiceUrl");
+    this.idpArtifactResolutionServiceUrl = this.getResponseProperty(
+      "IdpArtifactResolutionServiceUrl"
+    );
+    this.idpX509PublicCert = this.getResponseProperty("IdpX509PublicCert");
+    this.idpOutboundSigningAlgorithm = this.getResponseProperty("IdpOutboundSigningAlgorithm");
+    this.idpAllowUnsolicitedAuthnResponse = this.getResponseProperty(
+      "IdpAllowUnsolicitedAuthnResponse"
+    );
+    this.idpDisableOutboundLogoutRequests = this.getResponseProperty(
+      "IdpDisableOutboundLogoutRequests"
+    );
+    this.idpWantAuthnRequestsSigned = this.getResponseProperty("IdpWantAuthnRequestsSigned");
+  }
 }

common/src/models/data/attachmentData.ts

@@ -1,22 +1,22 @@
-import { AttachmentResponse } from '../response/attachmentResponse';
+import { AttachmentResponse } from "../response/attachmentResponse";
 
 export class AttachmentData {
-    id: string;
-    url: string;
-    fileName: string;
-    key: string;
-    size: string;
-    sizeName: string;
+  id: string;
+  url: string;
+  fileName: string;
+  key: string;
+  size: string;
+  sizeName: string;
 
-    constructor(response?: AttachmentResponse) {
-        if (response == null) {
-            return;
-        }
-        this.id = response.id;
-        this.url = response.url;
-        this.fileName = response.fileName;
-        this.key = response.key;
-        this.size = response.size;
-        this.sizeName = response.sizeName;
+  constructor(response?: AttachmentResponse) {
+    if (response == null) {
+      return;
     }
+    this.id = response.id;
+    this.url = response.url;
+    this.fileName = response.fileName;
+    this.key = response.key;
+    this.size = response.size;
+    this.sizeName = response.sizeName;
+  }
 }

common/src/models/data/cardData.ts

@@ -1,23 +1,23 @@
-import { CardApi } from '../api/cardApi';
+import { CardApi } from "../api/cardApi";
 
 export class CardData {
-    cardholderName: string;
-    brand: string;
-    number: string;
-    expMonth: string;
-    expYear: string;
-    code: string;
+  cardholderName: string;
+  brand: string;
+  number: string;
+  expMonth: string;
+  expYear: string;
+  code: string;
 
-    constructor(data?: CardApi) {
-        if (data == null) {
-            return;
-        }
-
-        this.cardholderName = data.cardholderName;
-        this.brand = data.brand;
-        this.number = data.number;
-        this.expMonth = data.expMonth;
-        this.expYear = data.expYear;
-        this.code = data.code;
+  constructor(data?: CardApi) {
+    if (data == null) {
+      return;
     }
+
+    this.cardholderName = data.cardholderName;
+    this.brand = data.brand;
+    this.number = data.number;
+    this.expMonth = data.expMonth;
+    this.expYear = data.expYear;
+    this.code = data.code;
+  }
 }

common/src/models/data/cipherData.ts

@@ -1,87 +1,87 @@
-import { CipherRepromptType } from '../../enums/cipherRepromptType';
-import { CipherType } from '../../enums/cipherType';
+import { CipherRepromptType } from "../../enums/cipherRepromptType";
+import { CipherType } from "../../enums/cipherType";
 
-import { AttachmentData } from './attachmentData';
-import { CardData } from './cardData';
-import { FieldData } from './fieldData';
-import { IdentityData } from './identityData';
-import { LoginData } from './loginData';
-import { PasswordHistoryData } from './passwordHistoryData';
-import { SecureNoteData } from './secureNoteData';
+import { AttachmentData } from "./attachmentData";
+import { CardData } from "./cardData";
+import { FieldData } from "./fieldData";
+import { IdentityData } from "./identityData";
+import { LoginData } from "./loginData";
+import { PasswordHistoryData } from "./passwordHistoryData";
+import { SecureNoteData } from "./secureNoteData";
 
-import { CipherResponse } from '../response/cipherResponse';
+import { CipherResponse } from "../response/cipherResponse";
 
 export class CipherData {
-    id: string;
-    organizationId: string;
-    folderId: string;
-    userId: string;
-    edit: boolean;
-    viewPassword: boolean;
-    organizationUseTotp: boolean;
-    favorite: boolean;
-    revisionDate: string;
-    type: CipherType;
-    sizeName: string;
-    name: string;
-    notes: string;
-    login?: LoginData;
-    secureNote?: SecureNoteData;
-    card?: CardData;
-    identity?: IdentityData;
-    fields?: FieldData[];
-    attachments?: AttachmentData[];
-    passwordHistory?: PasswordHistoryData[];
-    collectionIds?: string[];
-    deletedDate: string;
-    reprompt: CipherRepromptType;
+  id: string;
+  organizationId: string;
+  folderId: string;
+  userId: string;
+  edit: boolean;
+  viewPassword: boolean;
+  organizationUseTotp: boolean;
+  favorite: boolean;
+  revisionDate: string;
+  type: CipherType;
+  sizeName: string;
+  name: string;
+  notes: string;
+  login?: LoginData;
+  secureNote?: SecureNoteData;
+  card?: CardData;
+  identity?: IdentityData;
+  fields?: FieldData[];
+  attachments?: AttachmentData[];
+  passwordHistory?: PasswordHistoryData[];
+  collectionIds?: string[];
+  deletedDate: string;
+  reprompt: CipherRepromptType;
 
-    constructor(response?: CipherResponse, userId?: string, collectionIds?: string[]) {
-        if (response == null) {
-            return;
-        }
-
-        this.id = response.id;
-        this.organizationId = response.organizationId;
-        this.folderId = response.folderId;
-        this.userId = userId;
-        this.edit = response.edit;
-        this.viewPassword = response.viewPassword;
-        this.organizationUseTotp = response.organizationUseTotp;
-        this.favorite = response.favorite;
-        this.revisionDate = response.revisionDate;
-        this.type = response.type;
-        this.name = response.name;
-        this.notes = response.notes;
-        this.collectionIds = collectionIds != null ? collectionIds : response.collectionIds;
-        this.deletedDate = response.deletedDate;
-        this.reprompt = response.reprompt;
-
-        switch (this.type) {
-            case CipherType.Login:
-                this.login = new LoginData(response.login);
-                break;
-            case CipherType.SecureNote:
-                this.secureNote = new SecureNoteData(response.secureNote);
-                break;
-            case CipherType.Card:
-                this.card = new CardData(response.card);
-                break;
-            case CipherType.Identity:
-                this.identity = new IdentityData(response.identity);
-                break;
-            default:
-                break;
-        }
-
-        if (response.fields != null) {
-            this.fields = response.fields.map(f => new FieldData(f));
-        }
-        if (response.attachments != null) {
-            this.attachments = response.attachments.map(a => new AttachmentData(a));
-        }
-        if (response.passwordHistory != null) {
-            this.passwordHistory = response.passwordHistory.map(ph => new PasswordHistoryData(ph));
-        }
+  constructor(response?: CipherResponse, userId?: string, collectionIds?: string[]) {
+    if (response == null) {
+      return;
     }
+
+    this.id = response.id;
+    this.organizationId = response.organizationId;
+    this.folderId = response.folderId;
+    this.userId = userId;
+    this.edit = response.edit;
+    this.viewPassword = response.viewPassword;
+    this.organizationUseTotp = response.organizationUseTotp;
+    this.favorite = response.favorite;
+    this.revisionDate = response.revisionDate;
+    this.type = response.type;
+    this.name = response.name;
+    this.notes = response.notes;
+    this.collectionIds = collectionIds != null ? collectionIds : response.collectionIds;
+    this.deletedDate = response.deletedDate;
+    this.reprompt = response.reprompt;
+
+    switch (this.type) {
+      case CipherType.Login:
+        this.login = new LoginData(response.login);
+        break;
+      case CipherType.SecureNote:
+        this.secureNote = new SecureNoteData(response.secureNote);
+        break;
+      case CipherType.Card:
+        this.card = new CardData(response.card);
+        break;
+      case CipherType.Identity:
+        this.identity = new IdentityData(response.identity);
+        break;
+      default:
+        break;
+    }
+
+    if (response.fields != null) {
+      this.fields = response.fields.map((f) => new FieldData(f));
+    }
+    if (response.attachments != null) {
+      this.attachments = response.attachments.map((a) => new AttachmentData(a));
+    }
+    if (response.passwordHistory != null) {
+      this.passwordHistory = response.passwordHistory.map((ph) => new PasswordHistoryData(ph));
+    }
+  }
 }

common/src/models/data/collectionData.ts

@@ -1,17 +1,17 @@
-import { CollectionDetailsResponse } from '../response/collectionResponse';
+import { CollectionDetailsResponse } from "../response/collectionResponse";
 
 export class CollectionData {
-    id: string;
-    organizationId: string;
-    name: string;
-    externalId: string;
-    readOnly: boolean;
+  id: string;
+  organizationId: string;
+  name: string;
+  externalId: string;
+  readOnly: boolean;
 
-    constructor(response: CollectionDetailsResponse) {
-        this.id = response.id;
-        this.organizationId = response.organizationId;
-        this.name = response.name;
-        this.externalId = response.externalId;
-        this.readOnly = response.readOnly;
-    }
+  constructor(response: CollectionDetailsResponse) {
+    this.id = response.id;
+    this.organizationId = response.organizationId;
+    this.name = response.name;
+    this.externalId = response.externalId;
+    this.readOnly = response.readOnly;
+  }
 }

common/src/models/data/eventData.ts

@@ -1,7 +1,7 @@
-import { EventType } from '../../enums/eventType';
+import { EventType } from "../../enums/eventType";
 
 export class EventData {
-    type: EventType;
-    cipherId: string;
-    date: string;
+  type: EventType;
+  cipherId: string;
+  date: string;
 }

common/src/models/data/fieldData.ts

@@ -1,21 +1,21 @@
-import { FieldType } from '../../enums/fieldType';
-import { LinkedIdType } from '../../enums/linkedIdType';
+import { FieldType } from "../../enums/fieldType";
+import { LinkedIdType } from "../../enums/linkedIdType";
 
-import { FieldApi } from '../api/fieldApi';
+import { FieldApi } from "../api/fieldApi";
 
 export class FieldData {
-    type: FieldType;
-    name: string;
-    value: string;
-    linkedId: LinkedIdType;
+  type: FieldType;
+  name: string;
+  value: string;
+  linkedId: LinkedIdType;
 
-    constructor(response?: FieldApi) {
-        if (response == null) {
-            return;
-        }
-        this.type = response.type;
-        this.name = response.name;
-        this.value = response.value;
-        this.linkedId = response.linkedId;
+  constructor(response?: FieldApi) {
+    if (response == null) {
+      return;
     }
+    this.type = response.type;
+    this.name = response.name;
+    this.value = response.value;
+    this.linkedId = response.linkedId;
+  }
 }

common/src/models/data/folderData.ts

@@ -1,15 +1,15 @@
-import { FolderResponse } from '../response/folderResponse';
+import { FolderResponse } from "../response/folderResponse";
 
 export class FolderData {
-    id: string;
-    userId: string;
-    name: string;
-    revisionDate: string;
+  id: string;
+  userId: string;
+  name: string;
+  revisionDate: string;
 
-    constructor(response: FolderResponse, userId: string) {
-        this.userId = userId;
-        this.name = response.name;
-        this.id = response.id;
-        this.revisionDate = response.revisionDate;
-    }
+  constructor(response: FolderResponse, userId: string) {
+    this.userId = userId;
+    this.name = response.name;
+    this.id = response.id;
+    this.revisionDate = response.revisionDate;
+  }
 }

common/src/models/data/identityData.ts

@@ -1,47 +1,47 @@
-import { IdentityApi } from '../api/identityApi';
+import { IdentityApi } from "../api/identityApi";
 
 export class IdentityData {
-    title: string;
-    firstName: string;
-    middleName: string;
-    lastName: string;
-    address1: string;
-    address2: string;
-    address3: string;
-    city: string;
-    state: string;
-    postalCode: string;
-    country: string;
-    company: string;
-    email: string;
-    phone: string;
-    ssn: string;
-    username: string;
-    passportNumber: string;
-    licenseNumber: string;
+  title: string;
+  firstName: string;
+  middleName: string;
+  lastName: string;
+  address1: string;
+  address2: string;
+  address3: string;
+  city: string;
+  state: string;
+  postalCode: string;
+  country: string;
+  company: string;
+  email: string;
+  phone: string;
+  ssn: string;
+  username: string;
+  passportNumber: string;
+  licenseNumber: string;
 
-    constructor(data?: IdentityApi) {
-        if (data == null) {
-            return;
-        }
-
-        this.title = data.title;
-        this.firstName = data.firstName;
-        this.middleName = data.middleName;
-        this.lastName = data.lastName;
-        this.address1 = data.address1;
-        this.address2 = data.address2;
-        this.address3 = data.address3;
-        this.city = data.city;
-        this.state = data.state;
-        this.postalCode = data.postalCode;
-        this.country = data.country;
-        this.company = data.company;
-        this.email = data.email;
-        this.phone = data.phone;
-        this.ssn = data.ssn;
-        this.username = data.username;
-        this.passportNumber = data.passportNumber;
-        this.licenseNumber = data.licenseNumber;
+  constructor(data?: IdentityApi) {
+    if (data == null) {
+      return;
     }
+
+    this.title = data.title;
+    this.firstName = data.firstName;
+    this.middleName = data.middleName;
+    this.lastName = data.lastName;
+    this.address1 = data.address1;
+    this.address2 = data.address2;
+    this.address3 = data.address3;
+    this.city = data.city;
+    this.state = data.state;
+    this.postalCode = data.postalCode;
+    this.country = data.country;
+    this.company = data.company;
+    this.email = data.email;
+    this.phone = data.phone;
+    this.ssn = data.ssn;
+    this.username = data.username;
+    this.passportNumber = data.passportNumber;
+    this.licenseNumber = data.licenseNumber;
+  }
 }

common/src/models/data/loginData.ts

@@ -1,28 +1,28 @@
-import { LoginApi } from '../api/loginApi';
+import { LoginApi } from "../api/loginApi";
 
-import { LoginUriData } from './loginUriData';
+import { LoginUriData } from "./loginUriData";
 
 export class LoginData {
-    uris: LoginUriData[];
-    username: string;
-    password: string;
-    passwordRevisionDate: string;
-    totp: string;
-    autofillOnPageLoad: boolean;
+  uris: LoginUriData[];
+  username: string;
+  password: string;
+  passwordRevisionDate: string;
+  totp: string;
+  autofillOnPageLoad: boolean;
 
-    constructor(data?: LoginApi) {
-        if (data == null) {
-            return;
-        }
-
-        this.username = data.username;
-        this.password = data.password;
-        this.passwordRevisionDate = data.passwordRevisionDate;
-        this.totp = data.totp;
-        this.autofillOnPageLoad = data.autofillOnPageLoad;
-
-        if (data.uris) {
-            this.uris = data.uris.map(u => new LoginUriData(u));
-        }
+  constructor(data?: LoginApi) {
+    if (data == null) {
+      return;
     }
+
+    this.username = data.username;
+    this.password = data.password;
+    this.passwordRevisionDate = data.passwordRevisionDate;
+    this.totp = data.totp;
+    this.autofillOnPageLoad = data.autofillOnPageLoad;
+
+    if (data.uris) {
+      this.uris = data.uris.map((u) => new LoginUriData(u));
+    }
+  }
 }

common/src/models/data/loginUriData.ts

@@ -1,16 +1,16 @@
-import { UriMatchType } from '../../enums/uriMatchType';
+import { UriMatchType } from "../../enums/uriMatchType";
 
-import { LoginUriApi } from '../api/loginUriApi';
+import { LoginUriApi } from "../api/loginUriApi";
 
 export class LoginUriData {
-    uri: string;
-    match: UriMatchType = null;
+  uri: string;
+  match: UriMatchType = null;
 
-    constructor(data?: LoginUriApi) {
-        if (data == null) {
-            return;
-        }
-        this.uri = data.uri;
-        this.match = data.match;
+  constructor(data?: LoginUriApi) {
+    if (data == null) {
+      return;
     }
+    this.uri = data.uri;
+    this.match = data.match;
+  }
 }

common/src/models/data/organizationData.ts

@@ -1,80 +1,80 @@
-import { ProfileOrganizationResponse } from '../response/profileOrganizationResponse';
+import { ProfileOrganizationResponse } from "../response/profileOrganizationResponse";
 
-import { OrganizationUserStatusType } from '../../enums/organizationUserStatusType';
-import { OrganizationUserType } from '../../enums/organizationUserType';
-import { ProductType } from '../../enums/productType';
+import { OrganizationUserStatusType } from "../../enums/organizationUserStatusType";
+import { OrganizationUserType } from "../../enums/organizationUserType";
+import { ProductType } from "../../enums/productType";
 
-import { PermissionsApi } from '../api/permissionsApi';
+import { PermissionsApi } from "../api/permissionsApi";
 
 export class OrganizationData {
-    id: string;
-    name: string;
-    status: OrganizationUserStatusType;
-    type: OrganizationUserType;
-    enabled: boolean;
-    usePolicies: boolean;
-    useGroups: boolean;
-    useDirectory: boolean;
-    useEvents: boolean;
-    useTotp: boolean;
-    use2fa: boolean;
-    useApi: boolean;
-    useSso: boolean;
-    useKeyConnector: boolean;
-    useResetPassword: boolean;
-    selfHost: boolean;
-    usersGetPremium: boolean;
-    seats: number;
-    maxCollections: number;
-    maxStorageGb?: number;
-    ssoBound: boolean;
-    identifier: string;
-    permissions: PermissionsApi;
-    resetPasswordEnrolled: boolean;
-    userId: string;
-    hasPublicAndPrivateKeys: boolean;
-    providerId: string;
-    providerName: string;
-    isProviderUser: boolean;
-    familySponsorshipFriendlyName: string;
-    familySponsorshipAvailable: boolean;
-    planProductType: ProductType;
-    keyConnectorEnabled: boolean;
-    keyConnectorUrl: string;
+  id: string;
+  name: string;
+  status: OrganizationUserStatusType;
+  type: OrganizationUserType;
+  enabled: boolean;
+  usePolicies: boolean;
+  useGroups: boolean;
+  useDirectory: boolean;
+  useEvents: boolean;
+  useTotp: boolean;
+  use2fa: boolean;
+  useApi: boolean;
+  useSso: boolean;
+  useKeyConnector: boolean;
+  useResetPassword: boolean;
+  selfHost: boolean;
+  usersGetPremium: boolean;
+  seats: number;
+  maxCollections: number;
+  maxStorageGb?: number;
+  ssoBound: boolean;
+  identifier: string;
+  permissions: PermissionsApi;
+  resetPasswordEnrolled: boolean;
+  userId: string;
+  hasPublicAndPrivateKeys: boolean;
+  providerId: string;
+  providerName: string;
+  isProviderUser: boolean;
+  familySponsorshipFriendlyName: string;
+  familySponsorshipAvailable: boolean;
+  planProductType: ProductType;
+  keyConnectorEnabled: boolean;
+  keyConnectorUrl: string;
 
-    constructor(response: ProfileOrganizationResponse) {
-        this.id = response.id;
-        this.name = response.name;
-        this.status = response.status;
-        this.type = response.type;
-        this.enabled = response.enabled;
-        this.usePolicies = response.usePolicies;
-        this.useGroups = response.useGroups;
-        this.useDirectory = response.useDirectory;
-        this.useEvents = response.useEvents;
-        this.useTotp = response.useTotp;
-        this.use2fa = response.use2fa;
-        this.useApi = response.useApi;
-        this.useSso = response.useSso;
-        this.useKeyConnector = response.useKeyConnector;
-        this.useResetPassword = response.useResetPassword;
-        this.selfHost = response.selfHost;
-        this.usersGetPremium = response.usersGetPremium;
-        this.seats = response.seats;
-        this.maxCollections = response.maxCollections;
-        this.maxStorageGb = response.maxStorageGb;
-        this.ssoBound = response.ssoBound;
-        this.identifier = response.identifier;
-        this.permissions = response.permissions;
-        this.resetPasswordEnrolled = response.resetPasswordEnrolled;
-        this.userId = response.userId;
-        this.hasPublicAndPrivateKeys = response.hasPublicAndPrivateKeys;
-        this.providerId = response.providerId;
-        this.providerName = response.providerName;
-        this.familySponsorshipFriendlyName = response.familySponsorshipFriendlyName;
-        this.familySponsorshipAvailable = response.familySponsorshipAvailable;
-        this.planProductType = response.planProductType;
-        this.keyConnectorEnabled = response.keyConnectorEnabled;
-        this.keyConnectorUrl = response.keyConnectorUrl;
-    }
+  constructor(response: ProfileOrganizationResponse) {
+    this.id = response.id;
+    this.name = response.name;
+    this.status = response.status;
+    this.type = response.type;
+    this.enabled = response.enabled;
+    this.usePolicies = response.usePolicies;
+    this.useGroups = response.useGroups;
+    this.useDirectory = response.useDirectory;
+    this.useEvents = response.useEvents;
+    this.useTotp = response.useTotp;
+    this.use2fa = response.use2fa;
+    this.useApi = response.useApi;
+    this.useSso = response.useSso;
+    this.useKeyConnector = response.useKeyConnector;
+    this.useResetPassword = response.useResetPassword;
+    this.selfHost = response.selfHost;
+    this.usersGetPremium = response.usersGetPremium;
+    this.seats = response.seats;
+    this.maxCollections = response.maxCollections;
+    this.maxStorageGb = response.maxStorageGb;
+    this.ssoBound = response.ssoBound;
+    this.identifier = response.identifier;
+    this.permissions = response.permissions;
+    this.resetPasswordEnrolled = response.resetPasswordEnrolled;
+    this.userId = response.userId;
+    this.hasPublicAndPrivateKeys = response.hasPublicAndPrivateKeys;
+    this.providerId = response.providerId;
+    this.providerName = response.providerName;
+    this.familySponsorshipFriendlyName = response.familySponsorshipFriendlyName;
+    this.familySponsorshipAvailable = response.familySponsorshipAvailable;
+    this.planProductType = response.planProductType;
+    this.keyConnectorEnabled = response.keyConnectorEnabled;
+    this.keyConnectorUrl = response.keyConnectorUrl;
+  }
 }

common/src/models/data/passwordHistoryData.ts

@@ -1,15 +1,15 @@
-import { PasswordHistoryResponse } from '../response/passwordHistoryResponse';
+import { PasswordHistoryResponse } from "../response/passwordHistoryResponse";
 
 export class PasswordHistoryData {
-    password: string;
-    lastUsedDate: string;
+  password: string;
+  lastUsedDate: string;
 
-    constructor(response?: PasswordHistoryResponse) {
-        if (response == null) {
-            return;
-        }
-
-        this.password = response.password;
-        this.lastUsedDate = response.lastUsedDate;
+  constructor(response?: PasswordHistoryResponse) {
+    if (response == null) {
+      return;
     }
+
+    this.password = response.password;
+    this.lastUsedDate = response.lastUsedDate;
+  }
 }

common/src/models/data/policyData.ts

@@ -1,19 +1,19 @@
-import { PolicyResponse } from '../response/policyResponse';
+import { PolicyResponse } from "../response/policyResponse";
 
-import { PolicyType } from '../../enums/policyType';
+import { PolicyType } from "../../enums/policyType";
 
 export class PolicyData {
-    id: string;
-    organizationId: string;
-    type: PolicyType;
-    data: any;
-    enabled: boolean;
+  id: string;
+  organizationId: string;
+  type: PolicyType;
+  data: any;
+  enabled: boolean;
 
-    constructor(response: PolicyResponse) {
-        this.id = response.id;
-        this.organizationId = response.organizationId;
-        this.type = response.type;
-        this.data = response.data;
-        this.enabled = response.enabled;
-    }
+  constructor(response: PolicyResponse) {
+    this.id = response.id;
+    this.organizationId = response.organizationId;
+    this.type = response.type;
+    this.data = response.data;
+    this.enabled = response.enabled;
+  }
 }

common/src/models/data/providerData.ts

@@ -1,24 +1,24 @@
-import { ProfileProviderResponse } from '../response/profileProviderResponse';
+import { ProfileProviderResponse } from "../response/profileProviderResponse";
 
-import { ProviderUserStatusType } from '../../enums/providerUserStatusType';
-import { ProviderUserType } from '../../enums/providerUserType';
+import { ProviderUserStatusType } from "../../enums/providerUserStatusType";
+import { ProviderUserType } from "../../enums/providerUserType";
 
 export class ProviderData {
-    id: string;
-    name: string;
-    status: ProviderUserStatusType;
-    type: ProviderUserType;
-    enabled: boolean;
-    userId: string;
-    useEvents: boolean;
+  id: string;
+  name: string;
+  status: ProviderUserStatusType;
+  type: ProviderUserType;
+  enabled: boolean;
+  userId: string;
+  useEvents: boolean;
 
-    constructor(response: ProfileProviderResponse) {
-        this.id = response.id;
-        this.name = response.name;
-        this.status = response.status;
-        this.type = response.type;
-        this.enabled = response.enabled;
-        this.userId = response.userId;
-        this.useEvents = response.useEvents;
-    }
+  constructor(response: ProfileProviderResponse) {
+    this.id = response.id;
+    this.name = response.name;
+    this.status = response.status;
+    this.type = response.type;
+    this.enabled = response.enabled;
+    this.userId = response.userId;
+    this.useEvents = response.useEvents;
+  }
 }

common/src/models/data/secureNoteData.ts

@@ -1,15 +1,15 @@
-import { SecureNoteType } from '../../enums/secureNoteType';
+import { SecureNoteType } from "../../enums/secureNoteType";
 
-import { SecureNoteApi } from '../api/secureNoteApi';
+import { SecureNoteApi } from "../api/secureNoteApi";
 
 export class SecureNoteData {
-    type: SecureNoteType;
+  type: SecureNoteType;
 
-    constructor(data?: SecureNoteApi) {
-        if (data == null) {
-            return;
-        }
-
-        this.type = data.type;
+  constructor(data?: SecureNoteApi) {
+    if (data == null) {
+      return;
     }
+
+    this.type = data.type;
+  }
 }

common/src/models/data/sendData.ts

@@ -1,59 +1,59 @@
-import { SendType } from '../../enums/sendType';
+import { SendType } from "../../enums/sendType";
 
-import { SendFileData } from './sendFileData';
-import { SendTextData } from './sendTextData';
+import { SendFileData } from "./sendFileData";
+import { SendTextData } from "./sendTextData";
 
-import { SendResponse } from '../response/sendResponse';
+import { SendResponse } from "../response/sendResponse";
 
 export class SendData {
-    id: string;
-    accessId: string;
-    userId: string;
-    type: SendType;
-    name: string;
-    notes: string;
-    file: SendFileData;
-    text: SendTextData;
-    key: string;
-    maxAccessCount?: number;
-    accessCount: number;
-    revisionDate: string;
-    expirationDate: string;
-    deletionDate: string;
-    password: string;
-    disabled: boolean;
-    hideEmail: boolean;
+  id: string;
+  accessId: string;
+  userId: string;
+  type: SendType;
+  name: string;
+  notes: string;
+  file: SendFileData;
+  text: SendTextData;
+  key: string;
+  maxAccessCount?: number;
+  accessCount: number;
+  revisionDate: string;
+  expirationDate: string;
+  deletionDate: string;
+  password: string;
+  disabled: boolean;
+  hideEmail: boolean;
 
-    constructor(response?: SendResponse, userId?: string) {
-        if (response == null) {
-            return;
-        }
-
-        this.id = response.id;
-        this.accessId = response.accessId;
-        this.userId = userId;
-        this.type = response.type;
-        this.name = response.name;
-        this.notes = response.notes;
-        this.key = response.key;
-        this.maxAccessCount = response.maxAccessCount;
-        this.accessCount = response.accessCount;
-        this.revisionDate = response.revisionDate;
-        this.expirationDate = response.expirationDate;
-        this.deletionDate = response.deletionDate;
-        this.password = response.password;
-        this.disabled = response.disable;
-        this.hideEmail = response.hideEmail;
-
-        switch (this.type) {
-            case SendType.Text:
-                this.text = new SendTextData(response.text);
-                break;
-            case SendType.File:
-                this.file = new SendFileData(response.file);
-                break;
-            default:
-                break;
-        }
+  constructor(response?: SendResponse, userId?: string) {
+    if (response == null) {
+      return;
     }
+
+    this.id = response.id;
+    this.accessId = response.accessId;
+    this.userId = userId;
+    this.type = response.type;
+    this.name = response.name;
+    this.notes = response.notes;
+    this.key = response.key;
+    this.maxAccessCount = response.maxAccessCount;
+    this.accessCount = response.accessCount;
+    this.revisionDate = response.revisionDate;
+    this.expirationDate = response.expirationDate;
+    this.deletionDate = response.deletionDate;
+    this.password = response.password;
+    this.disabled = response.disable;
+    this.hideEmail = response.hideEmail;
+
+    switch (this.type) {
+      case SendType.Text:
+        this.text = new SendTextData(response.text);
+        break;
+      case SendType.File:
+        this.file = new SendFileData(response.file);
+        break;
+      default:
+        break;
+    }
+  }
 }

common/src/models/data/sendFileData.ts

@@ -1,21 +1,21 @@
-import { SendFileApi } from '../api/sendFileApi';
+import { SendFileApi } from "../api/sendFileApi";
 
 export class SendFileData {
-    id: string;
-    fileName: string;
-    key: string;
-    size: string;
-    sizeName: string;
+  id: string;
+  fileName: string;
+  key: string;
+  size: string;
+  sizeName: string;
 
-    constructor(data?: SendFileApi) {
-        if (data == null) {
-            return;
-        }
-
-        this.id = data.id;
-        this.fileName = data.fileName;
-        this.key = data.key;
-        this.size = data.size;
-        this.sizeName = data.sizeName;
+  constructor(data?: SendFileApi) {
+    if (data == null) {
+      return;
     }
+
+    this.id = data.id;
+    this.fileName = data.fileName;
+    this.key = data.key;
+    this.size = data.size;
+    this.sizeName = data.sizeName;
+  }
 }

common/src/models/data/sendTextData.ts

@@ -1,15 +1,15 @@
-import { SendTextApi } from '../api/sendTextApi';
+import { SendTextApi } from "../api/sendTextApi";
 
 export class SendTextData {
-    text: string;
-    hidden: boolean;
+  text: string;
+  hidden: boolean;
 
-    constructor(data?: SendTextApi) {
-        if (data == null) {
-            return;
-        }
-
-        this.text = data.text;
-        this.hidden = data.hidden;
+  constructor(data?: SendTextApi) {
+    if (data == null) {
+      return;
     }
+
+    this.text = data.text;
+    this.hidden = data.hidden;
+  }
 }

common/src/models/domain/account.ts

@@ -1,168 +1,189 @@
-import { OrganizationData } from '../data/organizationData';
+import { OrganizationData } from "../data/organizationData";
 
-import { AuthenticationStatus } from '../../enums/authenticationStatus';
-import { KdfType } from '../../enums/kdfType';
-import { UriMatchType } from '../../enums/uriMatchType';
+import { AuthenticationStatus } from "../../enums/authenticationStatus";
+import { KdfType } from "../../enums/kdfType";
+import { UriMatchType } from "../../enums/uriMatchType";
 
-import { CipherView } from '../view/cipherView';
-import { CollectionView } from '../view/collectionView';
-import { FolderView } from '../view/folderView';
-import { SendView } from '../view/sendView';
+import { CipherView } from "../view/cipherView";
+import { CollectionView } from "../view/collectionView";
+import { FolderView } from "../view/folderView";
+import { SendView } from "../view/sendView";
 
-import { EncString } from './encString';
-import { GeneratedPasswordHistory } from './generatedPasswordHistory';
-import { Policy } from './policy';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import { EncString } from "./encString";
+import { GeneratedPasswordHistory } from "./generatedPasswordHistory";
+import { Policy } from "./policy";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
-import { CipherData } from '../data/cipherData';
-import { CollectionData } from '../data/collectionData';
-import { EventData } from '../data/eventData';
-import { FolderData } from '../data/folderData';
-import { PolicyData } from '../data/policyData';
-import { ProviderData } from '../data/providerData';
-import { SendData } from '../data/sendData';
+import { CipherData } from "../data/cipherData";
+import { CollectionData } from "../data/collectionData";
+import { EventData } from "../data/eventData";
+import { FolderData } from "../data/folderData";
+import { PolicyData } from "../data/policyData";
+import { ProviderData } from "../data/providerData";
+import { SendData } from "../data/sendData";
 
 export class EncryptionPair<TEncrypted, TDecrypted> {
-    encrypted?: TEncrypted;
-    decrypted?: TDecrypted;
+  encrypted?: TEncrypted;
+  decrypted?: TDecrypted;
 }
 
 export class DataEncryptionPair<TEncrypted, TDecrypted> {
-    encrypted?: { [id: string]: TEncrypted };
-    decrypted?: TDecrypted[];
+  encrypted?: { [id: string]: TEncrypted };
+  decrypted?: TDecrypted[];
 }
 
 export class AccountData {
-    ciphers?: DataEncryptionPair<CipherData, CipherView> = new DataEncryptionPair<CipherData, CipherView>();
-    folders?: DataEncryptionPair<FolderData, FolderView> = new DataEncryptionPair<FolderData, FolderView>();
-    localData?: any;
-    sends?: DataEncryptionPair<SendData, SendView> = new DataEncryptionPair<SendData, SendView>();
-    collections?: DataEncryptionPair<CollectionData, CollectionView> = new DataEncryptionPair<CollectionData, CollectionView>();
-    policies?: DataEncryptionPair<PolicyData, Policy> = new DataEncryptionPair<PolicyData, Policy>();
-    passwordGenerationHistory?: EncryptionPair<GeneratedPasswordHistory[], GeneratedPasswordHistory[]> = new EncryptionPair<GeneratedPasswordHistory[], GeneratedPasswordHistory[]>();
-    addEditCipherInfo?: any;
-    collapsedGroupings?: Set<string>;
-    eventCollection?: EventData[];
-    organizations?: { [id: string]: OrganizationData };
-    providers?: { [id: string]: ProviderData };
+  ciphers?: DataEncryptionPair<CipherData, CipherView> = new DataEncryptionPair<
+    CipherData,
+    CipherView
+  >();
+  folders?: DataEncryptionPair<FolderData, FolderView> = new DataEncryptionPair<
+    FolderData,
+    FolderView
+  >();
+  localData?: any;
+  sends?: DataEncryptionPair<SendData, SendView> = new DataEncryptionPair<SendData, SendView>();
+  collections?: DataEncryptionPair<CollectionData, CollectionView> = new DataEncryptionPair<
+    CollectionData,
+    CollectionView
+  >();
+  policies?: DataEncryptionPair<PolicyData, Policy> = new DataEncryptionPair<PolicyData, Policy>();
+  passwordGenerationHistory?: EncryptionPair<
+    GeneratedPasswordHistory[],
+    GeneratedPasswordHistory[]
+  > = new EncryptionPair<GeneratedPasswordHistory[], GeneratedPasswordHistory[]>();
+  addEditCipherInfo?: any;
+  collapsedGroupings?: Set<string>;
+  eventCollection?: EventData[];
+  organizations?: { [id: string]: OrganizationData };
+  providers?: { [id: string]: ProviderData };
 }
 
 export class AccountKeys {
-    cryptoMasterKey?: SymmetricCryptoKey;
-    cryptoMasterKeyAuto?: string;
-    cryptoMasterKeyB64?: string;
-    cryptoMasterKeyBiometric?: string;
-    cryptoSymmetricKey?: EncryptionPair<string, SymmetricCryptoKey> = new EncryptionPair<string, SymmetricCryptoKey>();
-    organizationKeys?: EncryptionPair<any, Map<string, SymmetricCryptoKey>> = new EncryptionPair<any, Map<string, SymmetricCryptoKey>>();
-    providerKeys?: EncryptionPair<any, Map<string, SymmetricCryptoKey>> = new EncryptionPair<any, Map<string, SymmetricCryptoKey>>();
-    privateKey?: EncryptionPair<string, ArrayBuffer> = new EncryptionPair<string, ArrayBuffer>();
-    legacyEtmKey?: SymmetricCryptoKey;
-    publicKey?: ArrayBuffer;
-    apiKeyClientSecret?: string;
+  cryptoMasterKey?: SymmetricCryptoKey;
+  cryptoMasterKeyAuto?: string;
+  cryptoMasterKeyB64?: string;
+  cryptoMasterKeyBiometric?: string;
+  cryptoSymmetricKey?: EncryptionPair<string, SymmetricCryptoKey> = new EncryptionPair<
+    string,
+    SymmetricCryptoKey
+  >();
+  organizationKeys?: EncryptionPair<any, Map<string, SymmetricCryptoKey>> = new EncryptionPair<
+    any,
+    Map<string, SymmetricCryptoKey>
+  >();
+  providerKeys?: EncryptionPair<any, Map<string, SymmetricCryptoKey>> = new EncryptionPair<
+    any,
+    Map<string, SymmetricCryptoKey>
+  >();
+  privateKey?: EncryptionPair<string, ArrayBuffer> = new EncryptionPair<string, ArrayBuffer>();
+  legacyEtmKey?: SymmetricCryptoKey;
+  publicKey?: ArrayBuffer;
+  apiKeyClientSecret?: string;
 }
 
 export class AccountProfile {
-    apiKeyClientId?: string;
-    authenticationStatus?: AuthenticationStatus;
-    convertAccountToKeyConnector?: boolean;
-    email?: string;
-    emailVerified?: boolean;
-    entityId?: string;
-    entityType?: string;
-    everBeenUnlocked?: boolean;
-    forcePasswordReset?: boolean;
-    hasPremiumPersonally?: boolean;
-    lastActive?: number;
-    lastSync?: string;
-    ssoCodeVerifier?: string;
-    ssoOrganizationIdentifier?: string;
-    ssoState?: string;
-    userId?: string;
-    usesKeyConnector?: boolean;
-    keyHash?: string;
-    kdfIterations?: number;
-    kdfType?: KdfType;
+  apiKeyClientId?: string;
+  authenticationStatus?: AuthenticationStatus;
+  convertAccountToKeyConnector?: boolean;
+  email?: string;
+  emailVerified?: boolean;
+  entityId?: string;
+  entityType?: string;
+  everBeenUnlocked?: boolean;
+  forcePasswordReset?: boolean;
+  hasPremiumPersonally?: boolean;
+  lastActive?: number;
+  lastSync?: string;
+  ssoCodeVerifier?: string;
+  ssoOrganizationIdentifier?: string;
+  ssoState?: string;
+  userId?: string;
+  usesKeyConnector?: boolean;
+  keyHash?: string;
+  kdfIterations?: number;
+  kdfType?: KdfType;
 }
 
 export class AccountSettings {
-    alwaysShowDock?: boolean;
-    autoConfirmFingerPrints?: boolean;
-    autoFillOnPageLoadDefault?: boolean;
-    biometricLocked?: boolean;
-    biometricUnlock?: boolean;
-    clearClipboard?: number;
-    defaultUriMatch?: UriMatchType;
-    disableAddLoginNotification?: boolean;
-    disableAutoBiometricsPrompt?: boolean;
-    disableAutoTotpCopy?: boolean;
-    disableBadgeCounter?: boolean;
-    disableChangedPasswordNotification?: boolean;
-    disableContextMenuItem?: boolean;
-    disableGa?: boolean;
-    dontShowCardsCurrentTab?: boolean;
-    dontShowIdentitiesCurrentTab?: boolean;
-    enableAlwaysOnTop?: boolean;
-    enableAutoFillOnPageLoad?: boolean;
-    enableBiometric?: boolean;
-    enableBrowserIntegration?: boolean;
-    enableBrowserIntegrationFingerprint?: boolean;
-    enableCloseToTray?: boolean;
-    enableFullWidth?: boolean;
-    enableGravitars?: boolean;
-    enableMinimizeToTray?: boolean;
-    enableStartToTray?: boolean;
-    enableTray?: boolean;
-    environmentUrls?: any = {
-        server: 'bitwarden.com',
-    };
-    equivalentDomains?: any;
-    minimizeOnCopyToClipboard?: boolean;
-    neverDomains?: { [id: string]: any };
-    openAtLogin?: boolean;
-    passwordGenerationOptions?: any;
-    pinProtected?: EncryptionPair<string, EncString> = new EncryptionPair<string, EncString>();
-    protectedPin?: string;
-    settings?: any; // TODO: Merge whatever is going on here into the AccountSettings model properly
-    vaultTimeout?: number;
-    vaultTimeoutAction?: string;
+  alwaysShowDock?: boolean;
+  autoConfirmFingerPrints?: boolean;
+  autoFillOnPageLoadDefault?: boolean;
+  biometricLocked?: boolean;
+  biometricUnlock?: boolean;
+  clearClipboard?: number;
+  defaultUriMatch?: UriMatchType;
+  disableAddLoginNotification?: boolean;
+  disableAutoBiometricsPrompt?: boolean;
+  disableAutoTotpCopy?: boolean;
+  disableBadgeCounter?: boolean;
+  disableChangedPasswordNotification?: boolean;
+  disableContextMenuItem?: boolean;
+  disableGa?: boolean;
+  dontShowCardsCurrentTab?: boolean;
+  dontShowIdentitiesCurrentTab?: boolean;
+  enableAlwaysOnTop?: boolean;
+  enableAutoFillOnPageLoad?: boolean;
+  enableBiometric?: boolean;
+  enableBrowserIntegration?: boolean;
+  enableBrowserIntegrationFingerprint?: boolean;
+  enableCloseToTray?: boolean;
+  enableFullWidth?: boolean;
+  enableGravitars?: boolean;
+  enableMinimizeToTray?: boolean;
+  enableStartToTray?: boolean;
+  enableTray?: boolean;
+  environmentUrls?: any = {
+    server: "bitwarden.com",
+  };
+  equivalentDomains?: any;
+  minimizeOnCopyToClipboard?: boolean;
+  neverDomains?: { [id: string]: any };
+  openAtLogin?: boolean;
+  passwordGenerationOptions?: any;
+  pinProtected?: EncryptionPair<string, EncString> = new EncryptionPair<string, EncString>();
+  protectedPin?: string;
+  settings?: any; // TODO: Merge whatever is going on here into the AccountSettings model properly
+  vaultTimeout?: number;
+  vaultTimeoutAction?: string;
 }
 
 export class AccountTokens {
-    accessToken?: string;
-    decodedToken?: any;
-    refreshToken?: string;
-    securityStamp?: string;
+  accessToken?: string;
+  decodedToken?: any;
+  refreshToken?: string;
+  securityStamp?: string;
 }
 
 export class Account {
-    data?: AccountData = new AccountData();
-    keys?: AccountKeys = new AccountKeys();
-    profile?: AccountProfile = new AccountProfile();
-    settings?: AccountSettings = new AccountSettings();
-    tokens?: AccountTokens = new AccountTokens();
+  data?: AccountData = new AccountData();
+  keys?: AccountKeys = new AccountKeys();
+  profile?: AccountProfile = new AccountProfile();
+  settings?: AccountSettings = new AccountSettings();
+  tokens?: AccountTokens = new AccountTokens();
 
-    constructor(init: Partial<Account>) {
-        Object.assign(this, {
-            data: {
-                ...new AccountData(),
-                ...init?.data,
-            },
-            keys: {
-                ...new AccountKeys(),
-                ...init?.keys,
-            },
-            profile: {
-                ...new AccountProfile(),
-                ...init?.profile,
-            },
-            settings: {
-                ...new AccountSettings(),
-                ...init?.settings,
-            },
-            tokens: {
-                ...new AccountTokens(),
-                ...init?.tokens,
-            },
-        });
-    }
+  constructor(init: Partial<Account>) {
+    Object.assign(this, {
+      data: {
+        ...new AccountData(),
+        ...init?.data,
+      },
+      keys: {
+        ...new AccountKeys(),
+        ...init?.keys,
+      },
+      profile: {
+        ...new AccountProfile(),
+        ...init?.profile,
+      },
+      settings: {
+        ...new AccountSettings(),
+        ...init?.settings,
+      },
+      tokens: {
+        ...new AccountTokens(),
+        ...init?.tokens,
+      },
+    });
+  }
 }

common/src/models/domain/attachment.ts

@@ -1,75 +1,91 @@
-import { AttachmentData } from '../data/attachmentData';
+import { AttachmentData } from "../data/attachmentData";
 
-import { AttachmentView } from '../view/attachmentView';
+import { AttachmentView } from "../view/attachmentView";
 
-import Domain from './domainBase';
-import { EncString } from './encString';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
-import { CryptoService } from '../../abstractions/crypto.service';
+import { CryptoService } from "../../abstractions/crypto.service";
 
-import { Utils } from '../../misc/utils';
+import { Utils } from "../../misc/utils";
 
 export class Attachment extends Domain {
-    id: string;
-    url: string;
-    size: string;
-    sizeName: string;
-    key: EncString;
-    fileName: EncString;
+  id: string;
+  url: string;
+  size: string;
+  sizeName: string;
+  key: EncString;
+  fileName: EncString;
 
-    constructor(obj?: AttachmentData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.size = obj.size;
-        this.buildDomainModel(this, obj, {
-            id: null,
-            url: null,
-            sizeName: null,
-            fileName: null,
-            key: null,
-        }, alreadyEncrypted, ['id', 'url', 'sizeName']);
+  constructor(obj?: AttachmentData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    async decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<AttachmentView> {
-        const view = await this.decryptObj(new AttachmentView(this), {
-            fileName: null,
-        }, orgId, encKey);
+    this.size = obj.size;
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        id: null,
+        url: null,
+        sizeName: null,
+        fileName: null,
+        key: null,
+      },
+      alreadyEncrypted,
+      ["id", "url", "sizeName"]
+    );
+  }
 
-        if (this.key != null) {
-            let cryptoService: CryptoService;
-            const containerService = (Utils.global as any).bitwardenContainerService;
-            if (containerService) {
-                cryptoService = containerService.getCryptoService();
-            } else {
-                throw new Error('global bitwardenContainerService not initialized.');
-            }
+  async decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<AttachmentView> {
+    const view = await this.decryptObj(
+      new AttachmentView(this),
+      {
+        fileName: null,
+      },
+      orgId,
+      encKey
+    );
 
-            try {
-                const orgKey = await cryptoService.getOrgKey(orgId);
-                const decValue = await cryptoService.decryptToBytes(this.key, orgKey ?? encKey);
-                view.key = new SymmetricCryptoKey(decValue);
-            } catch (e) {
-                // TODO: error?
-            }
-        }
+    if (this.key != null) {
+      let cryptoService: CryptoService;
+      const containerService = (Utils.global as any).bitwardenContainerService;
+      if (containerService) {
+        cryptoService = containerService.getCryptoService();
+      } else {
+        throw new Error("global bitwardenContainerService not initialized.");
+      }
 
-        return view;
+      try {
+        const orgKey = await cryptoService.getOrgKey(orgId);
+        const decValue = await cryptoService.decryptToBytes(this.key, orgKey ?? encKey);
+        view.key = new SymmetricCryptoKey(decValue);
+      } catch (e) {
+        // TODO: error?
+      }
     }
 
-    toAttachmentData(): AttachmentData {
-        const a = new AttachmentData();
-        a.size = this.size;
-        this.buildDataModel(this, a, {
-            id: null,
-            url: null,
-            sizeName: null,
-            fileName: null,
-            key: null,
-        }, ['id', 'url', 'sizeName']);
-        return a;
-    }
+    return view;
+  }
+
+  toAttachmentData(): AttachmentData {
+    const a = new AttachmentData();
+    a.size = this.size;
+    this.buildDataModel(
+      this,
+      a,
+      {
+        id: null,
+        url: null,
+        sizeName: null,
+        fileName: null,
+        key: null,
+      },
+      ["id", "url", "sizeName"]
+    );
+    return a;
+  }
 }

common/src/models/domain/authResult.ts

@@ -1,9 +1,9 @@
-import { TwoFactorProviderType } from '../../enums/twoFactorProviderType';
+import { TwoFactorProviderType } from "../../enums/twoFactorProviderType";
 
 export class AuthResult {
-    twoFactor: boolean = false;
-    captchaSiteKey: string = '';
-    resetMasterPassword: boolean = false;
-    forcePasswordReset: boolean = false;
-    twoFactorProviders: Map<TwoFactorProviderType, { [key: string]: string; }> = null;
+  twoFactor: boolean = false;
+  captchaSiteKey: string = "";
+  resetMasterPassword: boolean = false;
+  forcePasswordReset: boolean = false;
+  twoFactorProviders: Map<TwoFactorProviderType, { [key: string]: string }> = null;
 }

common/src/models/domain/card.ts

@@ -1,56 +1,67 @@
-import { CardData } from '../data/cardData';
+import { CardData } from "../data/cardData";
 
-import Domain from './domainBase';
-import { EncString } from './encString';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
 
-import { CardView } from '../view/cardView';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import { CardView } from "../view/cardView";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
 export class Card extends Domain {
-    cardholderName: EncString;
-    brand: EncString;
-    number: EncString;
-    expMonth: EncString;
-    expYear: EncString;
-    code: EncString;
+  cardholderName: EncString;
+  brand: EncString;
+  number: EncString;
+  expMonth: EncString;
+  expYear: EncString;
+  code: EncString;
 
-    constructor(obj?: CardData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.buildDomainModel(this, obj, {
-            cardholderName: null,
-            brand: null,
-            number: null,
-            expMonth: null,
-            expYear: null,
-            code: null,
-        }, alreadyEncrypted, []);
+  constructor(obj?: CardData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<CardView> {
-        return this.decryptObj(new CardView(this), {
-            cardholderName: null,
-            brand: null,
-            number: null,
-            expMonth: null,
-            expYear: null,
-            code: null,
-        }, orgId, encKey);
-    }
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        cardholderName: null,
+        brand: null,
+        number: null,
+        expMonth: null,
+        expYear: null,
+        code: null,
+      },
+      alreadyEncrypted,
+      []
+    );
+  }
 
-    toCardData(): CardData {
-        const c = new CardData();
-        this.buildDataModel(this, c, {
-            cardholderName: null,
-            brand: null,
-            number: null,
-            expMonth: null,
-            expYear: null,
-            code: null,
-        });
-        return c;
-    }
+  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<CardView> {
+    return this.decryptObj(
+      new CardView(this),
+      {
+        cardholderName: null,
+        brand: null,
+        number: null,
+        expMonth: null,
+        expYear: null,
+        code: null,
+      },
+      orgId,
+      encKey
+    );
+  }
+
+  toCardData(): CardData {
+    const c = new CardData();
+    this.buildDataModel(this, c, {
+      cardholderName: null,
+      brand: null,
+      number: null,
+      expMonth: null,
+      expYear: null,
+      code: null,
+    });
+    return c;
+  }
 }

common/src/models/domain/cipher.ts

@@ -1,224 +1,241 @@
-import { CipherRepromptType } from '../../enums/cipherRepromptType';
-import { CipherType } from '../../enums/cipherType';
+import { CipherRepromptType } from "../../enums/cipherRepromptType";
+import { CipherType } from "../../enums/cipherType";
 
-import { CipherData } from '../data/cipherData';
+import { CipherData } from "../data/cipherData";
 
-import { CipherView } from '../view/cipherView';
+import { CipherView } from "../view/cipherView";
 
-import { Attachment } from './attachment';
-import { Card } from './card';
-import Domain from './domainBase';
-import { EncString } from './encString';
-import { Field } from './field';
-import { Identity } from './identity';
-import { Login } from './login';
-import { Password } from './password';
-import { SecureNote } from './secureNote';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import { Attachment } from "./attachment";
+import { Card } from "./card";
+import Domain from "./domainBase";
+import { EncString } from "./encString";
+import { Field } from "./field";
+import { Identity } from "./identity";
+import { Login } from "./login";
+import { Password } from "./password";
+import { SecureNote } from "./secureNote";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
 export class Cipher extends Domain {
-    id: string;
-    organizationId: string;
-    folderId: string;
-    name: EncString;
-    notes: EncString;
-    type: CipherType;
-    favorite: boolean;
-    organizationUseTotp: boolean;
-    edit: boolean;
-    viewPassword: boolean;
-    revisionDate: Date;
-    localData: any;
-    login: Login;
-    identity: Identity;
-    card: Card;
-    secureNote: SecureNote;
-    attachments: Attachment[];
-    fields: Field[];
-    passwordHistory: Password[];
-    collectionIds: string[];
-    deletedDate: Date;
-    reprompt: CipherRepromptType;
+  id: string;
+  organizationId: string;
+  folderId: string;
+  name: EncString;
+  notes: EncString;
+  type: CipherType;
+  favorite: boolean;
+  organizationUseTotp: boolean;
+  edit: boolean;
+  viewPassword: boolean;
+  revisionDate: Date;
+  localData: any;
+  login: Login;
+  identity: Identity;
+  card: Card;
+  secureNote: SecureNote;
+  attachments: Attachment[];
+  fields: Field[];
+  passwordHistory: Password[];
+  collectionIds: string[];
+  deletedDate: Date;
+  reprompt: CipherRepromptType;
 
-    constructor(obj?: CipherData, alreadyEncrypted: boolean = false, localData: any = null) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.buildDomainModel(this, obj, {
-            id: null,
-            userId: null,
-            organizationId: null,
-            folderId: null,
-            name: null,
-            notes: null,
-        }, alreadyEncrypted, ['id', 'userId', 'organizationId', 'folderId']);
-
-        this.type = obj.type;
-        this.favorite = obj.favorite;
-        this.organizationUseTotp = obj.organizationUseTotp;
-        this.edit = obj.edit;
-        if (obj.viewPassword != null) {
-            this.viewPassword = obj.viewPassword;
-        } else {
-            this.viewPassword = true; // Default for already synced Ciphers without viewPassword
-        }
-        this.revisionDate = obj.revisionDate != null ? new Date(obj.revisionDate) : null;
-        this.collectionIds = obj.collectionIds;
-        this.localData = localData;
-        this.deletedDate = obj.deletedDate != null ? new Date(obj.deletedDate) : null;
-        this.reprompt = obj.reprompt;
-
-        switch (this.type) {
-            case CipherType.Login:
-                this.login = new Login(obj.login, alreadyEncrypted);
-                break;
-            case CipherType.SecureNote:
-                this.secureNote = new SecureNote(obj.secureNote, alreadyEncrypted);
-                break;
-            case CipherType.Card:
-                this.card = new Card(obj.card, alreadyEncrypted);
-                break;
-            case CipherType.Identity:
-                this.identity = new Identity(obj.identity, alreadyEncrypted);
-                break;
-            default:
-                break;
-        }
-
-        if (obj.attachments != null) {
-            this.attachments = obj.attachments.map(a => new Attachment(a, alreadyEncrypted));
-        } else {
-            this.attachments = null;
-        }
-
-        if (obj.fields != null) {
-            this.fields = obj.fields.map(f => new Field(f, alreadyEncrypted));
-        } else {
-            this.fields = null;
-        }
-
-        if (obj.passwordHistory != null) {
-            this.passwordHistory = obj.passwordHistory.map(ph => new Password(ph, alreadyEncrypted));
-        } else {
-            this.passwordHistory = null;
-        }
+  constructor(obj?: CipherData, alreadyEncrypted: boolean = false, localData: any = null) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    async decrypt(encKey?: SymmetricCryptoKey): Promise<CipherView> {
-        const model = new CipherView(this);
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        id: null,
+        userId: null,
+        organizationId: null,
+        folderId: null,
+        name: null,
+        notes: null,
+      },
+      alreadyEncrypted,
+      ["id", "userId", "organizationId", "folderId"]
+    );
 
-        await this.decryptObj(model, {
-            name: null,
-            notes: null,
-        }, this.organizationId, encKey);
+    this.type = obj.type;
+    this.favorite = obj.favorite;
+    this.organizationUseTotp = obj.organizationUseTotp;
+    this.edit = obj.edit;
+    if (obj.viewPassword != null) {
+      this.viewPassword = obj.viewPassword;
+    } else {
+      this.viewPassword = true; // Default for already synced Ciphers without viewPassword
+    }
+    this.revisionDate = obj.revisionDate != null ? new Date(obj.revisionDate) : null;
+    this.collectionIds = obj.collectionIds;
+    this.localData = localData;
+    this.deletedDate = obj.deletedDate != null ? new Date(obj.deletedDate) : null;
+    this.reprompt = obj.reprompt;
 
-        switch (this.type) {
-            case CipherType.Login:
-                model.login = await this.login.decrypt(this.organizationId, encKey);
-                break;
-            case CipherType.SecureNote:
-                model.secureNote = await this.secureNote.decrypt(this.organizationId, encKey);
-                break;
-            case CipherType.Card:
-                model.card = await this.card.decrypt(this.organizationId, encKey);
-                break;
-            case CipherType.Identity:
-                model.identity = await this.identity.decrypt(this.organizationId, encKey);
-                break;
-            default:
-                break;
-        }
-
-        const orgId = this.organizationId;
-
-        if (this.attachments != null && this.attachments.length > 0) {
-            const attachments: any[] = [];
-            await this.attachments.reduce((promise, attachment) => {
-                return promise.then(() => {
-                    return attachment.decrypt(orgId, encKey);
-                }).then(decAttachment => {
-                    attachments.push(decAttachment);
-                });
-            }, Promise.resolve());
-            model.attachments = attachments;
-        }
-
-        if (this.fields != null && this.fields.length > 0) {
-            const fields: any[] = [];
-            await this.fields.reduce((promise, field) => {
-                return promise.then(() => {
-                    return field.decrypt(orgId, encKey);
-                }).then(decField => {
-                    fields.push(decField);
-                });
-            }, Promise.resolve());
-            model.fields = fields;
-        }
-
-        if (this.passwordHistory != null && this.passwordHistory.length > 0) {
-            const passwordHistory: any[] = [];
-            await this.passwordHistory.reduce((promise, ph) => {
-                return promise.then(() => {
-                    return ph.decrypt(orgId, encKey);
-                }).then(decPh => {
-                    passwordHistory.push(decPh);
-                });
-            }, Promise.resolve());
-            model.passwordHistory = passwordHistory;
-        }
-
-        return model;
+    switch (this.type) {
+      case CipherType.Login:
+        this.login = new Login(obj.login, alreadyEncrypted);
+        break;
+      case CipherType.SecureNote:
+        this.secureNote = new SecureNote(obj.secureNote, alreadyEncrypted);
+        break;
+      case CipherType.Card:
+        this.card = new Card(obj.card, alreadyEncrypted);
+        break;
+      case CipherType.Identity:
+        this.identity = new Identity(obj.identity, alreadyEncrypted);
+        break;
+      default:
+        break;
     }
 
-    toCipherData(userId: string): CipherData {
-        const c = new CipherData();
-        c.id = this.id;
-        c.organizationId = this.organizationId;
-        c.folderId = this.folderId;
-        c.userId = this.organizationId != null ? userId : null;
-        c.edit = this.edit;
-        c.viewPassword = this.viewPassword;
-        c.organizationUseTotp = this.organizationUseTotp;
-        c.favorite = this.favorite;
-        c.revisionDate = this.revisionDate != null ? this.revisionDate.toISOString() : null;
-        c.type = this.type;
-        c.collectionIds = this.collectionIds;
-        c.deletedDate = this.deletedDate != null ? this.deletedDate.toISOString() : null;
-        c.reprompt = this.reprompt;
-
-        this.buildDataModel(this, c, {
-            name: null,
-            notes: null,
-        });
-
-        switch (c.type) {
-            case CipherType.Login:
-                c.login = this.login.toLoginData();
-                break;
-            case CipherType.SecureNote:
-                c.secureNote = this.secureNote.toSecureNoteData();
-                break;
-            case CipherType.Card:
-                c.card = this.card.toCardData();
-                break;
-            case CipherType.Identity:
-                c.identity = this.identity.toIdentityData();
-                break;
-            default:
-                break;
-        }
-
-        if (this.fields != null) {
-            c.fields = this.fields.map(f => f.toFieldData());
-        }
-        if (this.attachments != null) {
-            c.attachments = this.attachments.map(a => a.toAttachmentData());
-        }
-        if (this.passwordHistory != null) {
-            c.passwordHistory = this.passwordHistory.map(ph => ph.toPasswordHistoryData());
-        }
-        return c;
+    if (obj.attachments != null) {
+      this.attachments = obj.attachments.map((a) => new Attachment(a, alreadyEncrypted));
+    } else {
+      this.attachments = null;
     }
+
+    if (obj.fields != null) {
+      this.fields = obj.fields.map((f) => new Field(f, alreadyEncrypted));
+    } else {
+      this.fields = null;
+    }
+
+    if (obj.passwordHistory != null) {
+      this.passwordHistory = obj.passwordHistory.map((ph) => new Password(ph, alreadyEncrypted));
+    } else {
+      this.passwordHistory = null;
+    }
+  }
+
+  async decrypt(encKey?: SymmetricCryptoKey): Promise<CipherView> {
+    const model = new CipherView(this);
+
+    await this.decryptObj(
+      model,
+      {
+        name: null,
+        notes: null,
+      },
+      this.organizationId,
+      encKey
+    );
+
+    switch (this.type) {
+      case CipherType.Login:
+        model.login = await this.login.decrypt(this.organizationId, encKey);
+        break;
+      case CipherType.SecureNote:
+        model.secureNote = await this.secureNote.decrypt(this.organizationId, encKey);
+        break;
+      case CipherType.Card:
+        model.card = await this.card.decrypt(this.organizationId, encKey);
+        break;
+      case CipherType.Identity:
+        model.identity = await this.identity.decrypt(this.organizationId, encKey);
+        break;
+      default:
+        break;
+    }
+
+    const orgId = this.organizationId;
+
+    if (this.attachments != null && this.attachments.length > 0) {
+      const attachments: any[] = [];
+      await this.attachments.reduce((promise, attachment) => {
+        return promise
+          .then(() => {
+            return attachment.decrypt(orgId, encKey);
+          })
+          .then((decAttachment) => {
+            attachments.push(decAttachment);
+          });
+      }, Promise.resolve());
+      model.attachments = attachments;
+    }
+
+    if (this.fields != null && this.fields.length > 0) {
+      const fields: any[] = [];
+      await this.fields.reduce((promise, field) => {
+        return promise
+          .then(() => {
+            return field.decrypt(orgId, encKey);
+          })
+          .then((decField) => {
+            fields.push(decField);
+          });
+      }, Promise.resolve());
+      model.fields = fields;
+    }
+
+    if (this.passwordHistory != null && this.passwordHistory.length > 0) {
+      const passwordHistory: any[] = [];
+      await this.passwordHistory.reduce((promise, ph) => {
+        return promise
+          .then(() => {
+            return ph.decrypt(orgId, encKey);
+          })
+          .then((decPh) => {
+            passwordHistory.push(decPh);
+          });
+      }, Promise.resolve());
+      model.passwordHistory = passwordHistory;
+    }
+
+    return model;
+  }
+
+  toCipherData(userId: string): CipherData {
+    const c = new CipherData();
+    c.id = this.id;
+    c.organizationId = this.organizationId;
+    c.folderId = this.folderId;
+    c.userId = this.organizationId != null ? userId : null;
+    c.edit = this.edit;
+    c.viewPassword = this.viewPassword;
+    c.organizationUseTotp = this.organizationUseTotp;
+    c.favorite = this.favorite;
+    c.revisionDate = this.revisionDate != null ? this.revisionDate.toISOString() : null;
+    c.type = this.type;
+    c.collectionIds = this.collectionIds;
+    c.deletedDate = this.deletedDate != null ? this.deletedDate.toISOString() : null;
+    c.reprompt = this.reprompt;
+
+    this.buildDataModel(this, c, {
+      name: null,
+      notes: null,
+    });
+
+    switch (c.type) {
+      case CipherType.Login:
+        c.login = this.login.toLoginData();
+        break;
+      case CipherType.SecureNote:
+        c.secureNote = this.secureNote.toSecureNoteData();
+        break;
+      case CipherType.Card:
+        c.card = this.card.toCardData();
+        break;
+      case CipherType.Identity:
+        c.identity = this.identity.toIdentityData();
+        break;
+      default:
+        break;
+    }
+
+    if (this.fields != null) {
+      c.fields = this.fields.map((f) => f.toFieldData());
+    }
+    if (this.attachments != null) {
+      c.attachments = this.attachments.map((a) => a.toAttachmentData());
+    }
+    if (this.passwordHistory != null) {
+      c.passwordHistory = this.passwordHistory.map((ph) => ph.toPasswordHistoryData());
+    }
+    return c;
+  }
 }

common/src/models/domain/collection.ts

@@ -1,37 +1,47 @@
-import { CollectionData } from '../data/collectionData';
+import { CollectionData } from "../data/collectionData";
 
-import { CollectionView } from '../view/collectionView';
+import { CollectionView } from "../view/collectionView";
 
-import Domain from './domainBase';
-import { EncString } from './encString';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
 
 export class Collection extends Domain {
-    id: string;
-    organizationId: string;
-    name: EncString;
-    externalId: string;
-    readOnly: boolean;
-    hidePasswords: boolean;
+  id: string;
+  organizationId: string;
+  name: EncString;
+  externalId: string;
+  readOnly: boolean;
+  hidePasswords: boolean;
 
-    constructor(obj?: CollectionData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.buildDomainModel(this, obj, {
-            id: null,
-            organizationId: null,
-            name: null,
-            externalId: null,
-            readOnly: null,
-            hidePasswords: null,
-        }, alreadyEncrypted, ['id', 'organizationId', 'externalId', 'readOnly', 'hidePasswords']);
+  constructor(obj?: CollectionData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    decrypt(): Promise<CollectionView> {
-        return this.decryptObj(new CollectionView(this), {
-            name: null,
-        }, this.organizationId);
-    }
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        id: null,
+        organizationId: null,
+        name: null,
+        externalId: null,
+        readOnly: null,
+        hidePasswords: null,
+      },
+      alreadyEncrypted,
+      ["id", "organizationId", "externalId", "readOnly", "hidePasswords"]
+    );
+  }
+
+  decrypt(): Promise<CollectionView> {
+    return this.decryptObj(
+      new CollectionView(this),
+      {
+        name: null,
+      },
+      this.organizationId
+    );
+  }
 }

common/src/models/domain/decryptParameters.ts

@@ -1,8 +1,8 @@
 export class DecryptParameters<T> {
-    encKey: T;
-    data: T;
-    iv: T;
-    macKey: T;
-    mac: T;
-    macData: T;
+  encKey: T;
+  data: T;
+  iv: T;
+  macKey: T;
+  mac: T;
+  macData: T;
 }

common/src/models/domain/domainBase.ts

@@ -1,66 +1,82 @@
-import { EncString } from './encString';
+import { EncString } from "./encString";
 
-import { View } from '../view/view';
+import { View } from "../view/view";
 
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
 export default class Domain {
-    protected buildDomainModel<D extends Domain>(domain: D, dataObj: any, map: any,
-        alreadyEncrypted: boolean, notEncList: any[] = []) {
-        for (const prop in map) {
-            if (!map.hasOwnProperty(prop)) {
-                continue;
-            }
+  protected buildDomainModel<D extends Domain>(
+    domain: D,
+    dataObj: any,
+    map: any,
+    alreadyEncrypted: boolean,
+    notEncList: any[] = []
+  ) {
+    for (const prop in map) {
+      if (!map.hasOwnProperty(prop)) {
+        continue;
+      }
 
-            const objProp = dataObj[(map[prop] || prop)];
-            if (alreadyEncrypted === true || notEncList.indexOf(prop) > -1) {
-                (domain as any)[prop] = objProp ? objProp : null;
-            } else {
-                (domain as any)[prop] = objProp ? new EncString(objProp) : null;
-            }
-        }
+      const objProp = dataObj[map[prop] || prop];
+      if (alreadyEncrypted === true || notEncList.indexOf(prop) > -1) {
+        (domain as any)[prop] = objProp ? objProp : null;
+      } else {
+        (domain as any)[prop] = objProp ? new EncString(objProp) : null;
+      }
     }
-    protected buildDataModel<D extends Domain>(domain: D, dataObj: any, map: any, notEncStringList: any[] = []) {
-        for (const prop in map) {
-            if (!map.hasOwnProperty(prop)) {
-                continue;
-            }
+  }
+  protected buildDataModel<D extends Domain>(
+    domain: D,
+    dataObj: any,
+    map: any,
+    notEncStringList: any[] = []
+  ) {
+    for (const prop in map) {
+      if (!map.hasOwnProperty(prop)) {
+        continue;
+      }
 
-            const objProp = (domain as any)[(map[prop] || prop)];
-            if (notEncStringList.indexOf(prop) > -1) {
-                (dataObj as any)[prop] = objProp != null ? objProp : null;
-            } else {
-                (dataObj as any)[prop] = objProp != null ? (objProp as EncString).encryptedString : null;
+      const objProp = (domain as any)[map[prop] || prop];
+      if (notEncStringList.indexOf(prop) > -1) {
+        (dataObj as any)[prop] = objProp != null ? objProp : null;
+      } else {
+        (dataObj as any)[prop] = objProp != null ? (objProp as EncString).encryptedString : null;
+      }
+    }
+  }
+
+  protected async decryptObj<T extends View>(
+    viewModel: T,
+    map: any,
+    orgId: string,
+    key: SymmetricCryptoKey = null
+  ): Promise<T> {
+    const promises = [];
+    const self: any = this;
+
+    for (const prop in map) {
+      if (!map.hasOwnProperty(prop)) {
+        continue;
+      }
+
+      // tslint:disable-next-line
+      (function (theProp) {
+        const p = Promise.resolve()
+          .then(() => {
+            const mapProp = map[theProp] || theProp;
+            if (self[mapProp]) {
+              return self[mapProp].decrypt(orgId, key);
             }
-        }
+            return null;
+          })
+          .then((val: any) => {
+            (viewModel as any)[theProp] = val;
+          });
+        promises.push(p);
+      })(prop);
     }
 
-    protected async decryptObj<T extends View>(viewModel: T, map: any, orgId: string,
-        key: SymmetricCryptoKey = null): Promise<T> {
-        const promises = [];
-        const self: any = this;
-
-        for (const prop in map) {
-            if (!map.hasOwnProperty(prop)) {
-                continue;
-            }
-
-            // tslint:disable-next-line
-            (function (theProp) {
-                const p = Promise.resolve().then(() => {
-                    const mapProp = map[theProp] || theProp;
-                    if (self[mapProp]) {
-                        return self[mapProp].decrypt(orgId, key);
-                    }
-                    return null;
-                }).then((val: any) => {
-                    (viewModel as any)[theProp] = val;
-                });
-                promises.push(p);
-            })(prop);
-        }
-
-        await Promise.all(promises);
-        return viewModel;
-    }
+    await Promise.all(promises);
+    return viewModel;
+  }
 }

common/src/models/domain/encArrayBuffer.ts

@@ -1,3 +1,3 @@
 export class EncArrayBuffer {
-    constructor(public buffer: ArrayBuffer) { }
+  constructor(public buffer: ArrayBuffer) {}
 }

common/src/models/domain/encString.ts

@@ -1,117 +1,124 @@
-import { EncryptionType } from '../../enums/encryptionType';
+import { EncryptionType } from "../../enums/encryptionType";
 
-import { CryptoService } from '../../abstractions/crypto.service';
+import { CryptoService } from "../../abstractions/crypto.service";
 
-import { Utils } from '../../misc/utils';
+import { Utils } from "../../misc/utils";
 
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
 export class EncString {
-    encryptedString?: string;
-    encryptionType?: EncryptionType;
-    decryptedValue?: string;
-    data?: string;
-    iv?: string;
-    mac?: string;
+  encryptedString?: string;
+  encryptionType?: EncryptionType;
+  decryptedValue?: string;
+  data?: string;
+  iv?: string;
+  mac?: string;
 
-    constructor(encryptedStringOrType: string | EncryptionType, data?: string, iv?: string, mac?: string) {
-        if (data != null) {
-            // data and header
-            const encType = encryptedStringOrType as EncryptionType;
+  constructor(
+    encryptedStringOrType: string | EncryptionType,
+    data?: string,
+    iv?: string,
+    mac?: string
+  ) {
+    if (data != null) {
+      // data and header
+      const encType = encryptedStringOrType as EncryptionType;
 
-            if (iv != null) {
-                this.encryptedString = encType + '.' + iv + '|' + data;
-            } else {
-                this.encryptedString = encType + '.' + data;
-            }
+      if (iv != null) {
+        this.encryptedString = encType + "." + iv + "|" + data;
+      } else {
+        this.encryptedString = encType + "." + data;
+      }
 
-            // mac
-            if (mac != null) {
-                this.encryptedString += ('|' + mac);
-            }
+      // mac
+      if (mac != null) {
+        this.encryptedString += "|" + mac;
+      }
 
-            this.encryptionType = encType;
-            this.data = data;
-            this.iv = iv;
-            this.mac = mac;
+      this.encryptionType = encType;
+      this.data = data;
+      this.iv = iv;
+      this.mac = mac;
 
-            return;
-        }
-
-        this.encryptedString = encryptedStringOrType as string;
-        if (!this.encryptedString) {
-            return;
-        }
-
-        const headerPieces = this.encryptedString.split('.');
-        let encPieces: string[] = null;
-
-        if (headerPieces.length === 2) {
-            try {
-                this.encryptionType = parseInt(headerPieces[0], null);
-                encPieces = headerPieces[1].split('|');
-            } catch (e) {
-                return;
-            }
-        } else {
-            encPieces = this.encryptedString.split('|');
-            this.encryptionType = encPieces.length === 3 ? EncryptionType.AesCbc128_HmacSha256_B64 :
-                EncryptionType.AesCbc256_B64;
-        }
-
-        switch (this.encryptionType) {
-            case EncryptionType.AesCbc128_HmacSha256_B64:
-            case EncryptionType.AesCbc256_HmacSha256_B64:
-                if (encPieces.length !== 3) {
-                    return;
-                }
-
-                this.iv = encPieces[0];
-                this.data = encPieces[1];
-                this.mac = encPieces[2];
-                break;
-            case EncryptionType.AesCbc256_B64:
-                if (encPieces.length !== 2) {
-                    return;
-                }
-
-                this.iv = encPieces[0];
-                this.data = encPieces[1];
-                break;
-            case EncryptionType.Rsa2048_OaepSha256_B64:
-            case EncryptionType.Rsa2048_OaepSha1_B64:
-                if (encPieces.length !== 1) {
-                    return;
-                }
-
-                this.data = encPieces[0];
-                break;
-            default:
-                return;
-        }
+      return;
     }
 
-    async decrypt(orgId: string, key: SymmetricCryptoKey = null): Promise<string> {
-        if (this.decryptedValue != null) {
-            return this.decryptedValue;
-        }
-
-        let cryptoService: CryptoService;
-        const containerService = (Utils.global as any).bitwardenContainerService;
-        if (containerService) {
-            cryptoService = containerService.getCryptoService();
-        } else {
-            throw new Error('global bitwardenContainerService not initialized.');
-        }
-
-        try {
-            if (key == null) {
-                key = await cryptoService.getOrgKey(orgId);
-            }
-            this.decryptedValue = await cryptoService.decryptToUtf8(this, key);
-        } catch (e) {
-            this.decryptedValue = '[error: cannot decrypt]';
-        }
-        return this.decryptedValue;
+    this.encryptedString = encryptedStringOrType as string;
+    if (!this.encryptedString) {
+      return;
     }
+
+    const headerPieces = this.encryptedString.split(".");
+    let encPieces: string[] = null;
+
+    if (headerPieces.length === 2) {
+      try {
+        this.encryptionType = parseInt(headerPieces[0], null);
+        encPieces = headerPieces[1].split("|");
+      } catch (e) {
+        return;
+      }
+    } else {
+      encPieces = this.encryptedString.split("|");
+      this.encryptionType =
+        encPieces.length === 3
+          ? EncryptionType.AesCbc128_HmacSha256_B64
+          : EncryptionType.AesCbc256_B64;
+    }
+
+    switch (this.encryptionType) {
+      case EncryptionType.AesCbc128_HmacSha256_B64:
+      case EncryptionType.AesCbc256_HmacSha256_B64:
+        if (encPieces.length !== 3) {
+          return;
+        }
+
+        this.iv = encPieces[0];
+        this.data = encPieces[1];
+        this.mac = encPieces[2];
+        break;
+      case EncryptionType.AesCbc256_B64:
+        if (encPieces.length !== 2) {
+          return;
+        }
+
+        this.iv = encPieces[0];
+        this.data = encPieces[1];
+        break;
+      case EncryptionType.Rsa2048_OaepSha256_B64:
+      case EncryptionType.Rsa2048_OaepSha1_B64:
+        if (encPieces.length !== 1) {
+          return;
+        }
+
+        this.data = encPieces[0];
+        break;
+      default:
+        return;
+    }
+  }
+
+  async decrypt(orgId: string, key: SymmetricCryptoKey = null): Promise<string> {
+    if (this.decryptedValue != null) {
+      return this.decryptedValue;
+    }
+
+    let cryptoService: CryptoService;
+    const containerService = (Utils.global as any).bitwardenContainerService;
+    if (containerService) {
+      cryptoService = containerService.getCryptoService();
+    } else {
+      throw new Error("global bitwardenContainerService not initialized.");
+    }
+
+    try {
+      if (key == null) {
+        key = await cryptoService.getOrgKey(orgId);
+      }
+      this.decryptedValue = await cryptoService.decryptToUtf8(this, key);
+    } catch (e) {
+      this.decryptedValue = "[error: cannot decrypt]";
+    }
+    return this.decryptedValue;
+  }
 }

common/src/models/domain/encryptedObject.ts

@@ -1,8 +1,8 @@
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
 export class EncryptedObject {
-    iv: ArrayBuffer;
-    data: ArrayBuffer;
-    mac: ArrayBuffer;
-    key: SymmetricCryptoKey;
+  iv: ArrayBuffer;
+  data: ArrayBuffer;
+  mac: ArrayBuffer;
+  key: SymmetricCryptoKey;
 }

common/src/models/domain/environmentUrls.ts

@@ -1,6 +1,6 @@
 export class EnvironmentUrls {
-    base: string;
-    api: string;
-    identity: string;
-    events: string;
+  base: string;
+  api: string;
+  identity: string;
+  events: string;
 }

common/src/models/domain/field.ts

@@ -1,49 +1,65 @@
-import { FieldType } from '../../enums/fieldType';
-import { LinkedIdType } from '../../enums/linkedIdType';
+import { FieldType } from "../../enums/fieldType";
+import { LinkedIdType } from "../../enums/linkedIdType";
 
-import { FieldData } from '../data/fieldData';
+import { FieldData } from "../data/fieldData";
 
-import Domain from './domainBase';
-import { EncString } from './encString';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
 
-import { FieldView } from '../view/fieldView';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import { FieldView } from "../view/fieldView";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
 export class Field extends Domain {
-    name: EncString;
-    value: EncString;
-    type: FieldType;
-    linkedId: LinkedIdType;
+  name: EncString;
+  value: EncString;
+  type: FieldType;
+  linkedId: LinkedIdType;
 
-    constructor(obj?: FieldData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.type = obj.type;
-        this.linkedId = obj.linkedId;
-        this.buildDomainModel(this, obj, {
-            name: null,
-            value: null,
-        }, alreadyEncrypted, []);
+  constructor(obj?: FieldData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<FieldView> {
-        return this.decryptObj(new FieldView(this), {
-            name: null,
-            value: null,
-        }, orgId, encKey);
-    }
+    this.type = obj.type;
+    this.linkedId = obj.linkedId;
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        name: null,
+        value: null,
+      },
+      alreadyEncrypted,
+      []
+    );
+  }
 
-    toFieldData(): FieldData {
-        const f = new FieldData();
-        this.buildDataModel(this, f, {
-            name: null,
-            value: null,
-            type: null,
-            linkedId: null,
-        }, ['type', 'linkedId']);
-        return f;
-    }
+  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<FieldView> {
+    return this.decryptObj(
+      new FieldView(this),
+      {
+        name: null,
+        value: null,
+      },
+      orgId,
+      encKey
+    );
+  }
+
+  toFieldData(): FieldData {
+    const f = new FieldData();
+    this.buildDataModel(
+      this,
+      f,
+      {
+        name: null,
+        value: null,
+        type: null,
+        linkedId: null,
+      },
+      ["type", "linkedId"]
+    );
+    return f;
+  }
 }

common/src/models/domain/folder.ts

@@ -1,32 +1,42 @@
-import { FolderData } from '../data/folderData';
+import { FolderData } from "../data/folderData";
 
-import { FolderView } from '../view/folderView';
+import { FolderView } from "../view/folderView";
 
-import Domain from './domainBase';
-import { EncString } from './encString';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
 
 export class Folder extends Domain {
-    id: string;
-    name: EncString;
-    revisionDate: Date;
+  id: string;
+  name: EncString;
+  revisionDate: Date;
 
-    constructor(obj?: FolderData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.buildDomainModel(this, obj, {
-            id: null,
-            name: null,
-        }, alreadyEncrypted, ['id']);
-
-        this.revisionDate = obj.revisionDate != null ? new Date(obj.revisionDate) : null;
+  constructor(obj?: FolderData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    decrypt(): Promise<FolderView> {
-        return this.decryptObj(new FolderView(this), {
-            name: null,
-        }, null);
-    }
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        id: null,
+        name: null,
+      },
+      alreadyEncrypted,
+      ["id"]
+    );
+
+    this.revisionDate = obj.revisionDate != null ? new Date(obj.revisionDate) : null;
+  }
+
+  decrypt(): Promise<FolderView> {
+    return this.decryptObj(
+      new FolderView(this),
+      {
+        name: null,
+      },
+      null
+    );
+  }
 }

common/src/models/domain/generatedPasswordHistory.ts

@@ -1,9 +1,9 @@
 export class GeneratedPasswordHistory {
-    password: string;
-    date: number;
+  password: string;
+  date: number;
 
-    constructor(password: string, date: number) {
-        this.password = password;
-        this.date = date;
-    }
+  constructor(password: string, date: number) {
+    this.password = password;
+    this.date = date;
+  }
 }

common/src/models/domain/globalState.ts

@@ -1,24 +1,24 @@
 export class GlobalState {
-    enableAlwaysOnTop?: boolean;
-    installedVersion?: string;
-    lastActive?: number;
-    locale?: string;
-    openAtLogin?: boolean;
-    organizationInvitation?: any;
-    rememberedEmail?: string;
-    theme?: string;
-    window?: Map<string, any> = new Map<string, any>();
-    twoFactorToken?: string;
-    disableFavicon?: boolean;
-    biometricAwaitingAcceptance?: boolean;
-    biometricFingerprintValidated?: boolean;
-    vaultTimeout?: number;
-    vaultTimeoutAction?: string;
-    loginRedirect?: any;
-    mainWindowSize?: number;
-    enableBiometrics?: boolean;
-    biometricText?: string;
-    noAutoPromptBiometrics?: boolean;
-    noAutoPromptBiometricsText?: string;
-    stateVersion: number;
+  enableAlwaysOnTop?: boolean;
+  installedVersion?: string;
+  lastActive?: number;
+  locale?: string;
+  openAtLogin?: boolean;
+  organizationInvitation?: any;
+  rememberedEmail?: string;
+  theme?: string;
+  window?: Map<string, any> = new Map<string, any>();
+  twoFactorToken?: string;
+  disableFavicon?: boolean;
+  biometricAwaitingAcceptance?: boolean;
+  biometricFingerprintValidated?: boolean;
+  vaultTimeout?: number;
+  vaultTimeoutAction?: string;
+  loginRedirect?: any;
+  mainWindowSize?: number;
+  enableBiometrics?: boolean;
+  biometricText?: string;
+  noAutoPromptBiometrics?: boolean;
+  noAutoPromptBiometricsText?: string;
+  stateVersion: number;
 }

common/src/models/domain/identity.ts

@@ -1,104 +1,115 @@
-import { IdentityData } from '../data/identityData';
+import { IdentityData } from "../data/identityData";
 
-import Domain from './domainBase';
-import { EncString } from './encString';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
-import { IdentityView } from '../view/identityView';
+import { IdentityView } from "../view/identityView";
 
 export class Identity extends Domain {
-    title: EncString;
-    firstName: EncString;
-    middleName: EncString;
-    lastName: EncString;
-    address1: EncString;
-    address2: EncString;
-    address3: EncString;
-    city: EncString;
-    state: EncString;
-    postalCode: EncString;
-    country: EncString;
-    company: EncString;
-    email: EncString;
-    phone: EncString;
-    ssn: EncString;
-    username: EncString;
-    passportNumber: EncString;
-    licenseNumber: EncString;
+  title: EncString;
+  firstName: EncString;
+  middleName: EncString;
+  lastName: EncString;
+  address1: EncString;
+  address2: EncString;
+  address3: EncString;
+  city: EncString;
+  state: EncString;
+  postalCode: EncString;
+  country: EncString;
+  company: EncString;
+  email: EncString;
+  phone: EncString;
+  ssn: EncString;
+  username: EncString;
+  passportNumber: EncString;
+  licenseNumber: EncString;
 
-    constructor(obj?: IdentityData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.buildDomainModel(this, obj, {
-            title: null,
-            firstName: null,
-            middleName: null,
-            lastName: null,
-            address1: null,
-            address2: null,
-            address3: null,
-            city: null,
-            state: null,
-            postalCode: null,
-            country: null,
-            company: null,
-            email: null,
-            phone: null,
-            ssn: null,
-            username: null,
-            passportNumber: null,
-            licenseNumber: null,
-        }, alreadyEncrypted, []);
+  constructor(obj?: IdentityData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<IdentityView> {
-        return this.decryptObj(new IdentityView(this), {
-            title: null,
-            firstName: null,
-            middleName: null,
-            lastName: null,
-            address1: null,
-            address2: null,
-            address3: null,
-            city: null,
-            state: null,
-            postalCode: null,
-            country: null,
-            company: null,
-            email: null,
-            phone: null,
-            ssn: null,
-            username: null,
-            passportNumber: null,
-            licenseNumber: null,
-        }, orgId, encKey);
-    }
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        title: null,
+        firstName: null,
+        middleName: null,
+        lastName: null,
+        address1: null,
+        address2: null,
+        address3: null,
+        city: null,
+        state: null,
+        postalCode: null,
+        country: null,
+        company: null,
+        email: null,
+        phone: null,
+        ssn: null,
+        username: null,
+        passportNumber: null,
+        licenseNumber: null,
+      },
+      alreadyEncrypted,
+      []
+    );
+  }
 
-    toIdentityData(): IdentityData {
-        const i = new IdentityData();
-        this.buildDataModel(this, i, {
-            title: null,
-            firstName: null,
-            middleName: null,
-            lastName: null,
-            address1: null,
-            address2: null,
-            address3: null,
-            city: null,
-            state: null,
-            postalCode: null,
-            country: null,
-            company: null,
-            email: null,
-            phone: null,
-            ssn: null,
-            username: null,
-            passportNumber: null,
-            licenseNumber: null,
-        });
-        return i;
-    }
+  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<IdentityView> {
+    return this.decryptObj(
+      new IdentityView(this),
+      {
+        title: null,
+        firstName: null,
+        middleName: null,
+        lastName: null,
+        address1: null,
+        address2: null,
+        address3: null,
+        city: null,
+        state: null,
+        postalCode: null,
+        country: null,
+        company: null,
+        email: null,
+        phone: null,
+        ssn: null,
+        username: null,
+        passportNumber: null,
+        licenseNumber: null,
+      },
+      orgId,
+      encKey
+    );
+  }
+
+  toIdentityData(): IdentityData {
+    const i = new IdentityData();
+    this.buildDataModel(this, i, {
+      title: null,
+      firstName: null,
+      middleName: null,
+      lastName: null,
+      address1: null,
+      address2: null,
+      address3: null,
+      city: null,
+      state: null,
+      postalCode: null,
+      country: null,
+      company: null,
+      email: null,
+      phone: null,
+      ssn: null,
+      username: null,
+      passportNumber: null,
+      licenseNumber: null,
+    });
+    return i;
+  }
 }

common/src/models/domain/importResult.ts

@@ -1,13 +1,13 @@
-import { CipherView } from '../view/cipherView';
-import { CollectionView } from '../view/collectionView';
-import { FolderView } from '../view/folderView';
+import { CipherView } from "../view/cipherView";
+import { CollectionView } from "../view/collectionView";
+import { FolderView } from "../view/folderView";
 
 export class ImportResult {
-    success = false;
-    errorMessage: string;
-    ciphers: CipherView[] = [];
-    folders: FolderView[] = [];
-    folderRelationships: [number, number][] = [];
-    collections: CollectionView[] = [];
-    collectionRelationships: [number, number][] = [];
+  success = false;
+  errorMessage: string;
+  ciphers: CipherView[] = [];
+  folders: FolderView[] = [];
+  folderRelationships: [number, number][] = [];
+  collections: CollectionView[] = [];
+  collectionRelationships: [number, number][] = [];
 }

common/src/models/domain/login.ts

@@ -1,78 +1,91 @@
-import { LoginUri } from './loginUri';
+import { LoginUri } from "./loginUri";
 
-import { LoginData } from '../data/loginData';
+import { LoginData } from "../data/loginData";
 
-import { LoginView } from '../view/loginView';
+import { LoginView } from "../view/loginView";
 
-import Domain from './domainBase';
-import { EncString } from './encString';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
 export class Login extends Domain {
-    uris: LoginUri[];
-    username: EncString;
-    password: EncString;
-    passwordRevisionDate?: Date;
-    totp: EncString;
-    autofillOnPageLoad: boolean;
+  uris: LoginUri[];
+  username: EncString;
+  password: EncString;
+  passwordRevisionDate?: Date;
+  totp: EncString;
+  autofillOnPageLoad: boolean;
 
-    constructor(obj?: LoginData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.passwordRevisionDate = obj.passwordRevisionDate != null ? new Date(obj.passwordRevisionDate) : null;
-        this.autofillOnPageLoad = obj.autofillOnPageLoad;
-        this.buildDomainModel(this, obj, {
-            username: null,
-            password: null,
-            totp: null,
-        }, alreadyEncrypted, []);
-
-        if (obj.uris) {
-            this.uris = [];
-            obj.uris.forEach(u => {
-                this.uris.push(new LoginUri(u, alreadyEncrypted));
-            });
-        }
+  constructor(obj?: LoginData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    async decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<LoginView> {
-        const view = await this.decryptObj(new LoginView(this), {
-            username: null,
-            password: null,
-            totp: null,
-        }, orgId, encKey);
+    this.passwordRevisionDate =
+      obj.passwordRevisionDate != null ? new Date(obj.passwordRevisionDate) : null;
+    this.autofillOnPageLoad = obj.autofillOnPageLoad;
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        username: null,
+        password: null,
+        totp: null,
+      },
+      alreadyEncrypted,
+      []
+    );
 
-        if (this.uris != null) {
-            view.uris = [];
-            for (let i = 0; i < this.uris.length; i++) {
-                const uri = await this.uris[i].decrypt(orgId, encKey);
-                view.uris.push(uri);
-            }
-        }
+    if (obj.uris) {
+      this.uris = [];
+      obj.uris.forEach((u) => {
+        this.uris.push(new LoginUri(u, alreadyEncrypted));
+      });
+    }
+  }
 
-        return view;
+  async decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<LoginView> {
+    const view = await this.decryptObj(
+      new LoginView(this),
+      {
+        username: null,
+        password: null,
+        totp: null,
+      },
+      orgId,
+      encKey
+    );
+
+    if (this.uris != null) {
+      view.uris = [];
+      for (let i = 0; i < this.uris.length; i++) {
+        const uri = await this.uris[i].decrypt(orgId, encKey);
+        view.uris.push(uri);
+      }
     }
 
-    toLoginData(): LoginData {
-        const l = new LoginData();
-        l.passwordRevisionDate = this.passwordRevisionDate != null ? this.passwordRevisionDate.toISOString() : null;
-        l.autofillOnPageLoad = this.autofillOnPageLoad;
-        this.buildDataModel(this, l, {
-            username: null,
-            password: null,
-            totp: null,
-        });
+    return view;
+  }
 
-        if (this.uris != null && this.uris.length > 0) {
-            l.uris = [];
-            this.uris.forEach(u => {
-                l.uris.push(u.toLoginUriData());
-            });
-        }
+  toLoginData(): LoginData {
+    const l = new LoginData();
+    l.passwordRevisionDate =
+      this.passwordRevisionDate != null ? this.passwordRevisionDate.toISOString() : null;
+    l.autofillOnPageLoad = this.autofillOnPageLoad;
+    this.buildDataModel(this, l, {
+      username: null,
+      password: null,
+      totp: null,
+    });
 
-        return l;
+    if (this.uris != null && this.uris.length > 0) {
+      l.uris = [];
+      this.uris.forEach((u) => {
+        l.uris.push(u.toLoginUriData());
+      });
     }
+
+    return l;
+  }
 }

common/src/models/domain/loginUri.ts

@@ -1,40 +1,56 @@
-import { UriMatchType } from '../../enums/uriMatchType';
+import { UriMatchType } from "../../enums/uriMatchType";
 
-import { LoginUriData } from '../data/loginUriData';
+import { LoginUriData } from "../data/loginUriData";
 
-import { LoginUriView } from '../view/loginUriView';
+import { LoginUriView } from "../view/loginUriView";
 
-import Domain from './domainBase';
-import { EncString } from './encString';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
 export class LoginUri extends Domain {
-    uri: EncString;
-    match: UriMatchType;
+  uri: EncString;
+  match: UriMatchType;
 
-    constructor(obj?: LoginUriData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.match = obj.match;
-        this.buildDomainModel(this, obj, {
-            uri: null,
-        }, alreadyEncrypted, []);
+  constructor(obj?: LoginUriData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<LoginUriView> {
-        return this.decryptObj(new LoginUriView(this), {
-            uri: null,
-        }, orgId, encKey);
-    }
+    this.match = obj.match;
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        uri: null,
+      },
+      alreadyEncrypted,
+      []
+    );
+  }
 
-    toLoginUriData(): LoginUriData {
-        const u = new LoginUriData();
-        this.buildDataModel(this, u, {
-            uri: null,
-        }, ['match']);
-        return u;
-    }
+  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<LoginUriView> {
+    return this.decryptObj(
+      new LoginUriView(this),
+      {
+        uri: null,
+      },
+      orgId,
+      encKey
+    );
+  }
+
+  toLoginUriData(): LoginUriData {
+    const u = new LoginUriData();
+    this.buildDataModel(
+      this,
+      u,
+      {
+        uri: null,
+      },
+      ["match"]
+    );
+    return u;
+  }
 }

common/src/models/domain/masterPasswordPolicyOptions.ts

@@ -1,10 +1,10 @@
-import Domain from './domainBase';
+import Domain from "./domainBase";
 
 export class MasterPasswordPolicyOptions extends Domain {
-    minComplexity: number = 0;
-    minLength: number = 0;
-    requireUpper: boolean = false;
-    requireLower: boolean = false;
-    requireNumbers: boolean = false;
-    requireSpecial: boolean = false;
+  minComplexity: number = 0;
+  minLength: number = 0;
+  requireUpper: boolean = false;
+  requireLower: boolean = false;
+  requireNumbers: boolean = false;
+  requireSpecial: boolean = false;
 }

common/src/models/domain/organization.ts

@@ -1,169 +1,185 @@
-import { OrganizationData } from '../data/organizationData';
-
-import { OrganizationUserStatusType } from '../../enums/organizationUserStatusType';
-import { OrganizationUserType } from '../../enums/organizationUserType';
-import { ProductType } from '../../enums/productType';
-import { PermissionsApi } from '../api/permissionsApi';
+import { OrganizationData } from "../data/organizationData";
 
+import { OrganizationUserStatusType } from "../../enums/organizationUserStatusType";
+import { OrganizationUserType } from "../../enums/organizationUserType";
+import { ProductType } from "../../enums/productType";
+import { PermissionsApi } from "../api/permissionsApi";
 
 export class Organization {
-    id: string;
-    name: string;
-    status: OrganizationUserStatusType;
-    type: OrganizationUserType;
-    enabled: boolean;
-    usePolicies: boolean;
-    useGroups: boolean;
-    useDirectory: boolean;
-    useEvents: boolean;
-    useTotp: boolean;
-    use2fa: boolean;
-    useApi: boolean;
-    useSso: boolean;
-    useKeyConnector: boolean;
-    useResetPassword: boolean;
-    selfHost: boolean;
-    usersGetPremium: boolean;
-    seats: number;
-    maxCollections: number;
-    maxStorageGb?: number;
-    ssoBound: boolean;
-    identifier: string;
-    permissions: PermissionsApi;
-    resetPasswordEnrolled: boolean;
-    userId: string;
-    hasPublicAndPrivateKeys: boolean;
-    providerId: string;
-    providerName: string;
-    isProviderUser: boolean;
-    familySponsorshipFriendlyName: string;
-    familySponsorshipAvailable: boolean;
-    planProductType: ProductType;
-    keyConnectorEnabled: boolean;
-    keyConnectorUrl: string;
+  id: string;
+  name: string;
+  status: OrganizationUserStatusType;
+  type: OrganizationUserType;
+  enabled: boolean;
+  usePolicies: boolean;
+  useGroups: boolean;
+  useDirectory: boolean;
+  useEvents: boolean;
+  useTotp: boolean;
+  use2fa: boolean;
+  useApi: boolean;
+  useSso: boolean;
+  useKeyConnector: boolean;
+  useResetPassword: boolean;
+  selfHost: boolean;
+  usersGetPremium: boolean;
+  seats: number;
+  maxCollections: number;
+  maxStorageGb?: number;
+  ssoBound: boolean;
+  identifier: string;
+  permissions: PermissionsApi;
+  resetPasswordEnrolled: boolean;
+  userId: string;
+  hasPublicAndPrivateKeys: boolean;
+  providerId: string;
+  providerName: string;
+  isProviderUser: boolean;
+  familySponsorshipFriendlyName: string;
+  familySponsorshipAvailable: boolean;
+  planProductType: ProductType;
+  keyConnectorEnabled: boolean;
+  keyConnectorUrl: string;
 
-    constructor(obj?: OrganizationData) {
-        if (obj == null) {
-            return;
-        }
-
-        this.id = obj.id;
-        this.name = obj.name;
-        this.status = obj.status;
-        this.type = obj.type;
-        this.enabled = obj.enabled;
-        this.usePolicies = obj.usePolicies;
-        this.useGroups = obj.useGroups;
-        this.useDirectory = obj.useDirectory;
-        this.useEvents = obj.useEvents;
-        this.useTotp = obj.useTotp;
-        this.use2fa = obj.use2fa;
-        this.useApi = obj.useApi;
-        this.useSso = obj.useSso;
-        this.useKeyConnector = obj.useKeyConnector;
-        this.useResetPassword = obj.useResetPassword;
-        this.selfHost = obj.selfHost;
-        this.usersGetPremium = obj.usersGetPremium;
-        this.seats = obj.seats;
-        this.maxCollections = obj.maxCollections;
-        this.maxStorageGb = obj.maxStorageGb;
-        this.ssoBound = obj.ssoBound;
-        this.identifier = obj.identifier;
-        this.permissions = obj.permissions;
-        this.resetPasswordEnrolled = obj.resetPasswordEnrolled;
-        this.userId = obj.userId;
-        this.hasPublicAndPrivateKeys = obj.hasPublicAndPrivateKeys;
-        this.providerId = obj.providerId;
-        this.providerName = obj.providerName;
-        this.isProviderUser = obj.isProviderUser;
-        this.familySponsorshipFriendlyName = obj.familySponsorshipFriendlyName;
-        this.familySponsorshipAvailable = obj.familySponsorshipAvailable;
-        this.planProductType = obj.planProductType;
-        this.keyConnectorEnabled = obj.keyConnectorEnabled;
-        this.keyConnectorUrl = obj.keyConnectorUrl;
+  constructor(obj?: OrganizationData) {
+    if (obj == null) {
+      return;
     }
 
-    get canAccess() {
-        if (this.type === OrganizationUserType.Owner) {
-            return true;
-        }
-        return this.enabled && this.status === OrganizationUserStatusType.Confirmed;
-    }
+    this.id = obj.id;
+    this.name = obj.name;
+    this.status = obj.status;
+    this.type = obj.type;
+    this.enabled = obj.enabled;
+    this.usePolicies = obj.usePolicies;
+    this.useGroups = obj.useGroups;
+    this.useDirectory = obj.useDirectory;
+    this.useEvents = obj.useEvents;
+    this.useTotp = obj.useTotp;
+    this.use2fa = obj.use2fa;
+    this.useApi = obj.useApi;
+    this.useSso = obj.useSso;
+    this.useKeyConnector = obj.useKeyConnector;
+    this.useResetPassword = obj.useResetPassword;
+    this.selfHost = obj.selfHost;
+    this.usersGetPremium = obj.usersGetPremium;
+    this.seats = obj.seats;
+    this.maxCollections = obj.maxCollections;
+    this.maxStorageGb = obj.maxStorageGb;
+    this.ssoBound = obj.ssoBound;
+    this.identifier = obj.identifier;
+    this.permissions = obj.permissions;
+    this.resetPasswordEnrolled = obj.resetPasswordEnrolled;
+    this.userId = obj.userId;
+    this.hasPublicAndPrivateKeys = obj.hasPublicAndPrivateKeys;
+    this.providerId = obj.providerId;
+    this.providerName = obj.providerName;
+    this.isProviderUser = obj.isProviderUser;
+    this.familySponsorshipFriendlyName = obj.familySponsorshipFriendlyName;
+    this.familySponsorshipAvailable = obj.familySponsorshipAvailable;
+    this.planProductType = obj.planProductType;
+    this.keyConnectorEnabled = obj.keyConnectorEnabled;
+    this.keyConnectorUrl = obj.keyConnectorUrl;
+  }
 
-    get isManager() {
-        return this.type === OrganizationUserType.Manager || this.type === OrganizationUserType.Owner ||
-            this.type === OrganizationUserType.Admin;
+  get canAccess() {
+    if (this.type === OrganizationUserType.Owner) {
+      return true;
     }
+    return this.enabled && this.status === OrganizationUserStatusType.Confirmed;
+  }
 
-    get isAdmin() {
-        return this.type === OrganizationUserType.Owner || this.type === OrganizationUserType.Admin;
-    }
+  get isManager() {
+    return (
+      this.type === OrganizationUserType.Manager ||
+      this.type === OrganizationUserType.Owner ||
+      this.type === OrganizationUserType.Admin
+    );
+  }
 
-    get isOwner() {
-        return this.type === OrganizationUserType.Owner || this.isProviderUser;
-    }
+  get isAdmin() {
+    return this.type === OrganizationUserType.Owner || this.type === OrganizationUserType.Admin;
+  }
 
-    get canAccessEventLogs() {
-        return this.isAdmin || this.permissions.accessEventLogs;
-    }
+  get isOwner() {
+    return this.type === OrganizationUserType.Owner || this.isProviderUser;
+  }
 
-    get canAccessImportExport() {
-        return this.isAdmin || this.permissions.accessImportExport;
-    }
+  get canAccessEventLogs() {
+    return this.isAdmin || this.permissions.accessEventLogs;
+  }
 
-    get canAccessReports() {
-        return this.isAdmin || this.permissions.accessReports;
-    }
+  get canAccessImportExport() {
+    return this.isAdmin || this.permissions.accessImportExport;
+  }
 
-    get canCreateNewCollections() {
-        return this.isManager || (this.permissions.createNewCollections ?? this.permissions.manageAllCollections);
-    }
+  get canAccessReports() {
+    return this.isAdmin || this.permissions.accessReports;
+  }
 
-    get canEditAnyCollection() {
-        return this.isAdmin || (this.permissions.editAnyCollection ?? this.permissions.manageAllCollections);
-    }
+  get canCreateNewCollections() {
+    return (
+      this.isManager ||
+      (this.permissions.createNewCollections ?? this.permissions.manageAllCollections)
+    );
+  }
 
-    get canDeleteAnyCollection() {
-        return this.isAdmin || (this.permissions.deleteAnyCollection ?? this.permissions.manageAllCollections);
-    }
+  get canEditAnyCollection() {
+    return (
+      this.isAdmin || (this.permissions.editAnyCollection ?? this.permissions.manageAllCollections)
+    );
+  }
 
-    get canViewAllCollections() {
-        return this.canCreateNewCollections || this.canEditAnyCollection || this.canDeleteAnyCollection;
-    }
+  get canDeleteAnyCollection() {
+    return (
+      this.isAdmin ||
+      (this.permissions.deleteAnyCollection ?? this.permissions.manageAllCollections)
+    );
+  }
 
-    get canEditAssignedCollections() {
-        return this.isManager || (this.permissions.editAssignedCollections ?? this.permissions.manageAssignedCollections);
-    }
+  get canViewAllCollections() {
+    return this.canCreateNewCollections || this.canEditAnyCollection || this.canDeleteAnyCollection;
+  }
 
-    get canDeleteAssignedCollections() {
-        return this.isManager || (this.permissions.deleteAssignedCollections ?? this.permissions.manageAssignedCollections);
-    }
+  get canEditAssignedCollections() {
+    return (
+      this.isManager ||
+      (this.permissions.editAssignedCollections ?? this.permissions.manageAssignedCollections)
+    );
+  }
 
-    get canViewAssignedCollections() {
-        return this.canDeleteAssignedCollections || this.canEditAssignedCollections;
-    }
+  get canDeleteAssignedCollections() {
+    return (
+      this.isManager ||
+      (this.permissions.deleteAssignedCollections ?? this.permissions.manageAssignedCollections)
+    );
+  }
 
-    get canManageGroups() {
-        return this.isAdmin || this.permissions.manageGroups;
-    }
+  get canViewAssignedCollections() {
+    return this.canDeleteAssignedCollections || this.canEditAssignedCollections;
+  }
 
-    get canManageSso() {
-        return this.isAdmin || this.permissions.manageSso;
-    }
+  get canManageGroups() {
+    return this.isAdmin || this.permissions.manageGroups;
+  }
 
-    get canManagePolicies() {
-        return this.isAdmin || this.permissions.managePolicies;
-    }
+  get canManageSso() {
+    return this.isAdmin || this.permissions.manageSso;
+  }
 
-    get canManageUsers() {
-        return this.isAdmin || this.permissions.manageUsers;
-    }
+  get canManagePolicies() {
+    return this.isAdmin || this.permissions.managePolicies;
+  }
 
-    get canManageUsersPassword() {
-        return this.isAdmin || this.permissions.manageResetPassword;
-    }
+  get canManageUsers() {
+    return this.isAdmin || this.permissions.manageUsers;
+  }
 
-    get isExemptFromPolicies() {
-        return this.canManagePolicies;
-    }
+  get canManageUsersPassword() {
+    return this.isAdmin || this.permissions.manageResetPassword;
+  }
+
+  get isExemptFromPolicies() {
+    return this.canManagePolicies;
+  }
 }

common/src/models/domain/password.ts

@@ -1,39 +1,49 @@
-import { PasswordHistoryData } from '../data/passwordHistoryData';
+import { PasswordHistoryData } from "../data/passwordHistoryData";
 
-import Domain from './domainBase';
-import { EncString } from './encString';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
 
-import { PasswordHistoryView } from '../view/passwordHistoryView';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import { PasswordHistoryView } from "../view/passwordHistoryView";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
 export class Password extends Domain {
-    password: EncString;
-    lastUsedDate: Date;
+  password: EncString;
+  lastUsedDate: Date;
 
-    constructor(obj?: PasswordHistoryData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.buildDomainModel(this, obj, {
-            password: null,
-        }, alreadyEncrypted);
-        this.lastUsedDate = new Date(obj.lastUsedDate);
+  constructor(obj?: PasswordHistoryData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<PasswordHistoryView> {
-         return this.decryptObj(new PasswordHistoryView(this), {
-            password: null,
-        }, orgId, encKey);
-    }
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        password: null,
+      },
+      alreadyEncrypted
+    );
+    this.lastUsedDate = new Date(obj.lastUsedDate);
+  }
 
-    toPasswordHistoryData(): PasswordHistoryData {
-        const ph = new PasswordHistoryData();
-        ph.lastUsedDate = this.lastUsedDate.toISOString();
-        this.buildDataModel(this, ph, {
-            password: null,
-        });
-        return ph;
-    }
+  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<PasswordHistoryView> {
+    return this.decryptObj(
+      new PasswordHistoryView(this),
+      {
+        password: null,
+      },
+      orgId,
+      encKey
+    );
+  }
+
+  toPasswordHistoryData(): PasswordHistoryData {
+    const ph = new PasswordHistoryData();
+    ph.lastUsedDate = this.lastUsedDate.toISOString();
+    this.buildDataModel(this, ph, {
+      password: null,
+    });
+    return ph;
+  }
 }

common/src/models/domain/passwordGeneratorPolicyOptions.ts

@@ -1,29 +1,31 @@
-import Domain from './domainBase';
+import Domain from "./domainBase";
 
 export class PasswordGeneratorPolicyOptions extends Domain {
-    defaultType: string = '';
-    minLength: number = 0;
-    useUppercase: boolean = false;
-    useLowercase: boolean = false;
-    useNumbers: boolean = false;
-    numberCount: number = 0;
-    useSpecial: boolean = false;
-    specialCount: number = 0;
-    minNumberWords: number = 0;
-    capitalize: boolean = false;
-    includeNumber: boolean = false;
+  defaultType: string = "";
+  minLength: number = 0;
+  useUppercase: boolean = false;
+  useLowercase: boolean = false;
+  useNumbers: boolean = false;
+  numberCount: number = 0;
+  useSpecial: boolean = false;
+  specialCount: number = 0;
+  minNumberWords: number = 0;
+  capitalize: boolean = false;
+  includeNumber: boolean = false;
 
-    inEffect() {
-        return this.defaultType !== '' ||
-            this.minLength > 0 ||
-            this.numberCount > 0 ||
-            this.specialCount > 0 ||
-            this.useUppercase ||
-            this.useLowercase ||
-            this.useNumbers ||
-            this.useSpecial ||
-            this.minNumberWords > 0 ||
-            this.capitalize ||
-            this.includeNumber;
-    }
+  inEffect() {
+    return (
+      this.defaultType !== "" ||
+      this.minLength > 0 ||
+      this.numberCount > 0 ||
+      this.specialCount > 0 ||
+      this.useUppercase ||
+      this.useLowercase ||
+      this.useNumbers ||
+      this.useSpecial ||
+      this.minNumberWords > 0 ||
+      this.capitalize ||
+      this.includeNumber
+    );
+  }
 }

common/src/models/domain/policy.ts

@@ -1,26 +1,26 @@
-import { PolicyData } from '../data/policyData';
+import { PolicyData } from "../data/policyData";
 
-import Domain from './domainBase';
+import Domain from "./domainBase";
 
-import { PolicyType } from '../../enums/policyType';
+import { PolicyType } from "../../enums/policyType";
 
 export class Policy extends Domain {
-    id: string;
-    organizationId: string;
-    type: PolicyType;
-    data: any;
-    enabled: boolean;
+  id: string;
+  organizationId: string;
+  type: PolicyType;
+  data: any;
+  enabled: boolean;
 
-    constructor(obj?: PolicyData) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.id = obj.id;
-        this.organizationId = obj.organizationId;
-        this.type = obj.type;
-        this.data = obj.data;
-        this.enabled = obj.enabled;
+  constructor(obj?: PolicyData) {
+    super();
+    if (obj == null) {
+      return;
     }
+
+    this.id = obj.id;
+    this.organizationId = obj.organizationId;
+    this.type = obj.type;
+    this.data = obj.data;
+    this.enabled = obj.enabled;
+  }
 }

common/src/models/domain/provider.ts

@@ -1,50 +1,50 @@
-import { ProviderUserStatusType } from '../../enums/providerUserStatusType';
-import { ProviderUserType } from '../../enums/providerUserType';
-import { ProviderData } from '../data/providerData';
+import { ProviderUserStatusType } from "../../enums/providerUserStatusType";
+import { ProviderUserType } from "../../enums/providerUserType";
+import { ProviderData } from "../data/providerData";
 
 export class Provider {
-    id: string;
-    name: string;
-    status: ProviderUserStatusType;
-    type: ProviderUserType;
-    enabled: boolean;
-    userId: string;
-    useEvents: boolean;
+  id: string;
+  name: string;
+  status: ProviderUserStatusType;
+  type: ProviderUserType;
+  enabled: boolean;
+  userId: string;
+  useEvents: boolean;
 
-    constructor(obj?: ProviderData) {
-        if (obj == null) {
-            return;
-        }
-
-        this.id = obj.id;
-        this.name = obj.name;
-        this.status = obj.status;
-        this.type = obj.type;
-        this.enabled = obj.enabled;
-        this.userId = obj.userId;
-        this.useEvents = obj.useEvents;
+  constructor(obj?: ProviderData) {
+    if (obj == null) {
+      return;
     }
 
-    get canAccess() {
-        if (this.isProviderAdmin) {
-            return true;
-        }
-        return this.enabled && this.status === ProviderUserStatusType.Confirmed;
-    }
+    this.id = obj.id;
+    this.name = obj.name;
+    this.status = obj.status;
+    this.type = obj.type;
+    this.enabled = obj.enabled;
+    this.userId = obj.userId;
+    this.useEvents = obj.useEvents;
+  }
 
-    get canCreateOrganizations() {
-        return this.enabled && this.isProviderAdmin;
+  get canAccess() {
+    if (this.isProviderAdmin) {
+      return true;
     }
+    return this.enabled && this.status === ProviderUserStatusType.Confirmed;
+  }
 
-    get canManageUsers() {
-        return this.isProviderAdmin;
-    }
+  get canCreateOrganizations() {
+    return this.enabled && this.isProviderAdmin;
+  }
 
-    get canAccessEventLogs() {
-        return this.isProviderAdmin;
-    }
+  get canManageUsers() {
+    return this.isProviderAdmin;
+  }
 
-    get isProviderAdmin() {
-        return this.type === ProviderUserType.ProviderAdmin;
-    }
+  get canAccessEventLogs() {
+    return this.isProviderAdmin;
+  }
+
+  get isProviderAdmin() {
+    return this.type === ProviderUserType.ProviderAdmin;
+  }
 }

common/src/models/domain/resetPasswordPolicyOptions.ts

@@ -1,5 +1,5 @@
-import Domain from './domainBase';
+import Domain from "./domainBase";
 
 export class ResetPasswordPolicyOptions extends Domain {
-    autoEnrollEnabled: boolean = false;
+  autoEnrollEnabled: boolean = false;
 }

common/src/models/domain/secureNote.ts

@@ -1,31 +1,31 @@
-import { SecureNoteType } from '../../enums/secureNoteType';
+import { SecureNoteType } from "../../enums/secureNoteType";
 
-import { SecureNoteData } from '../data/secureNoteData';
+import { SecureNoteData } from "../data/secureNoteData";
 
-import Domain from './domainBase';
+import Domain from "./domainBase";
 
-import { SecureNoteView } from '../view/secureNoteView';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import { SecureNoteView } from "../view/secureNoteView";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
 export class SecureNote extends Domain {
-    type: SecureNoteType;
+  type: SecureNoteType;
 
-    constructor(obj?: SecureNoteData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.type = obj.type;
+  constructor(obj?: SecureNoteData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<SecureNoteView> {
-        return Promise.resolve(new SecureNoteView(this));
-    }
+    this.type = obj.type;
+  }
 
-    toSecureNoteData(): SecureNoteData {
-        const n = new SecureNoteData();
-        n.type = this.type;
-        return n;
-    }
+  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<SecureNoteView> {
+    return Promise.resolve(new SecureNoteView(this));
+  }
+
+  toSecureNoteData(): SecureNoteData {
+    const n = new SecureNoteData();
+    n.type = this.type;
+    return n;
+  }
 }

common/src/models/domain/send.ts

@@ -1,108 +1,119 @@
-import { CryptoService } from '../../abstractions/crypto.service';
+import { CryptoService } from "../../abstractions/crypto.service";
 
-import { SendType } from '../../enums/sendType';
+import { SendType } from "../../enums/sendType";
 
-import { Utils } from '../../misc/utils';
+import { Utils } from "../../misc/utils";
 
-import { SendData } from '../data/sendData';
+import { SendData } from "../data/sendData";
 
-import { SendView } from '../view/sendView';
+import { SendView } from "../view/sendView";
 
-import Domain from './domainBase';
-import { EncString } from './encString';
-import { SendFile } from './sendFile';
-import { SendText } from './sendText';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
+import { SendFile } from "./sendFile";
+import { SendText } from "./sendText";
 
 export class Send extends Domain {
-    id: string;
-    accessId: string;
-    userId: string;
-    type: SendType;
-    name: EncString;
-    notes: EncString;
-    file: SendFile;
-    text: SendText;
-    key: EncString;
-    maxAccessCount?: number;
-    accessCount: number;
-    revisionDate: Date;
-    expirationDate: Date;
-    deletionDate: Date;
-    password: string;
-    disabled: boolean;
-    hideEmail: boolean;
+  id: string;
+  accessId: string;
+  userId: string;
+  type: SendType;
+  name: EncString;
+  notes: EncString;
+  file: SendFile;
+  text: SendText;
+  key: EncString;
+  maxAccessCount?: number;
+  accessCount: number;
+  revisionDate: Date;
+  expirationDate: Date;
+  deletionDate: Date;
+  password: string;
+  disabled: boolean;
+  hideEmail: boolean;
 
-    constructor(obj?: SendData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.buildDomainModel(this, obj, {
-            id: null,
-            accessId: null,
-            userId: null,
-            name: null,
-            notes: null,
-            key: null,
-        }, alreadyEncrypted, ['id', 'accessId', 'userId']);
-
-        this.type = obj.type;
-        this.maxAccessCount = obj.maxAccessCount;
-        this.accessCount = obj.accessCount;
-        this.password = obj.password;
-        this.disabled = obj.disabled;
-        this.revisionDate = obj.revisionDate != null ? new Date(obj.revisionDate) : null;
-        this.deletionDate = obj.deletionDate != null ? new Date(obj.deletionDate) : null;
-        this.expirationDate = obj.expirationDate != null ? new Date(obj.expirationDate) : null;
-        this.hideEmail = obj.hideEmail;
-
-        switch (this.type) {
-            case SendType.Text:
-                this.text = new SendText(obj.text, alreadyEncrypted);
-                break;
-            case SendType.File:
-                this.file = new SendFile(obj.file, alreadyEncrypted);
-                break;
-            default:
-                break;
-        }
+  constructor(obj?: SendData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    async decrypt(): Promise<SendView> {
-        const model = new SendView(this);
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        id: null,
+        accessId: null,
+        userId: null,
+        name: null,
+        notes: null,
+        key: null,
+      },
+      alreadyEncrypted,
+      ["id", "accessId", "userId"]
+    );
 
-        let cryptoService: CryptoService;
-        const containerService = (Utils.global as any).bitwardenContainerService;
-        if (containerService) {
-            cryptoService = containerService.getCryptoService();
-        } else {
-            throw new Error('global bitwardenContainerService not initialized.');
-        }
+    this.type = obj.type;
+    this.maxAccessCount = obj.maxAccessCount;
+    this.accessCount = obj.accessCount;
+    this.password = obj.password;
+    this.disabled = obj.disabled;
+    this.revisionDate = obj.revisionDate != null ? new Date(obj.revisionDate) : null;
+    this.deletionDate = obj.deletionDate != null ? new Date(obj.deletionDate) : null;
+    this.expirationDate = obj.expirationDate != null ? new Date(obj.expirationDate) : null;
+    this.hideEmail = obj.hideEmail;
 
-        try {
-            model.key = await cryptoService.decryptToBytes(this.key, null);
-            model.cryptoKey = await cryptoService.makeSendKey(model.key);
-        } catch (e) {
-            // TODO: error?
-        }
-
-        await this.decryptObj(model, {
-            name: null,
-            notes: null,
-        }, null, model.cryptoKey);
-
-        switch (this.type) {
-            case SendType.File:
-                model.file = await this.file.decrypt(model.cryptoKey);
-                break;
-            case SendType.Text:
-                model.text = await this.text.decrypt(model.cryptoKey);
-                break;
-            default:
-                break;
-        }
-
-        return model;
+    switch (this.type) {
+      case SendType.Text:
+        this.text = new SendText(obj.text, alreadyEncrypted);
+        break;
+      case SendType.File:
+        this.file = new SendFile(obj.file, alreadyEncrypted);
+        break;
+      default:
+        break;
     }
+  }
+
+  async decrypt(): Promise<SendView> {
+    const model = new SendView(this);
+
+    let cryptoService: CryptoService;
+    const containerService = (Utils.global as any).bitwardenContainerService;
+    if (containerService) {
+      cryptoService = containerService.getCryptoService();
+    } else {
+      throw new Error("global bitwardenContainerService not initialized.");
+    }
+
+    try {
+      model.key = await cryptoService.decryptToBytes(this.key, null);
+      model.cryptoKey = await cryptoService.makeSendKey(model.key);
+    } catch (e) {
+      // TODO: error?
+    }
+
+    await this.decryptObj(
+      model,
+      {
+        name: null,
+        notes: null,
+      },
+      null,
+      model.cryptoKey
+    );
+
+    switch (this.type) {
+      case SendType.File:
+        model.file = await this.file.decrypt(model.cryptoKey);
+        break;
+      case SendType.Text:
+        model.text = await this.text.decrypt(model.cryptoKey);
+        break;
+      default:
+        break;
+    }
+
+    return model;
+  }
 }

common/src/models/domain/sendAccess.ts

@@ -1,69 +1,80 @@
-import { SendType } from '../../enums/sendType';
+import { SendType } from "../../enums/sendType";
 
-import { SendAccessResponse } from '../response/sendAccessResponse';
+import { SendAccessResponse } from "../response/sendAccessResponse";
 
-import { SendAccessView } from '../view/sendAccessView';
+import { SendAccessView } from "../view/sendAccessView";
 
-import Domain from './domainBase';
-import { EncString } from './encString';
-import { SendFile } from './sendFile';
-import { SendText } from './sendText';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
+import { SendFile } from "./sendFile";
+import { SendText } from "./sendText";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
 export class SendAccess extends Domain {
-    id: string;
-    type: SendType;
-    name: EncString;
-    file: SendFile;
-    text: SendText;
-    expirationDate: Date;
-    creatorIdentifier: string;
+  id: string;
+  type: SendType;
+  name: EncString;
+  file: SendFile;
+  text: SendText;
+  expirationDate: Date;
+  creatorIdentifier: string;
 
-    constructor(obj?: SendAccessResponse, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.buildDomainModel(this, obj, {
-            id: null,
-            name: null,
-            expirationDate: null,
-            creatorIdentifier: null,
-        }, alreadyEncrypted, ['id', 'expirationDate', 'creatorIdentifier']);
-
-        this.type = obj.type;
-
-        switch (this.type) {
-            case SendType.Text:
-                this.text = new SendText(obj.text, alreadyEncrypted);
-                break;
-            case SendType.File:
-                this.file = new SendFile(obj.file, alreadyEncrypted);
-                break;
-            default:
-                break;
-        }
+  constructor(obj?: SendAccessResponse, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    async decrypt(key: SymmetricCryptoKey): Promise<SendAccessView> {
-        const model = new SendAccessView(this);
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        id: null,
+        name: null,
+        expirationDate: null,
+        creatorIdentifier: null,
+      },
+      alreadyEncrypted,
+      ["id", "expirationDate", "creatorIdentifier"]
+    );
 
-        await this.decryptObj(model, {
-            name: null,
-        }, null, key);
+    this.type = obj.type;
 
-        switch (this.type) {
-            case SendType.File:
-                model.file = await this.file.decrypt(key);
-                break;
-            case SendType.Text:
-                model.text = await this.text.decrypt(key);
-                break;
-            default:
-                break;
-        }
-
-        return model;
+    switch (this.type) {
+      case SendType.Text:
+        this.text = new SendText(obj.text, alreadyEncrypted);
+        break;
+      case SendType.File:
+        this.file = new SendFile(obj.file, alreadyEncrypted);
+        break;
+      default:
+        break;
     }
+  }
+
+  async decrypt(key: SymmetricCryptoKey): Promise<SendAccessView> {
+    const model = new SendAccessView(this);
+
+    await this.decryptObj(
+      model,
+      {
+        name: null,
+      },
+      null,
+      key
+    );
+
+    switch (this.type) {
+      case SendType.File:
+        model.file = await this.file.decrypt(key);
+        break;
+      case SendType.Text:
+        model.text = await this.text.decrypt(key);
+        break;
+      default:
+        break;
+    }
+
+    return model;
+  }
 }

common/src/models/domain/sendFile.ts

@@ -1,35 +1,46 @@
-import Domain from './domainBase';
-import { EncString } from './encString';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
-import { SendFileData } from '../data/sendFileData';
+import { SendFileData } from "../data/sendFileData";
 
-import { SendFileView } from '../view/sendFileView';
+import { SendFileView } from "../view/sendFileView";
 
 export class SendFile extends Domain {
-    id: string;
-    size: string;
-    sizeName: string;
-    fileName: EncString;
+  id: string;
+  size: string;
+  sizeName: string;
+  fileName: EncString;
 
-    constructor(obj?: SendFileData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.size = obj.size;
-        this.buildDomainModel(this, obj, {
-            id: null,
-            sizeName: null,
-            fileName: null,
-        }, alreadyEncrypted, ['id', 'sizeName']);
+  constructor(obj?: SendFileData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    async decrypt(key: SymmetricCryptoKey): Promise<SendFileView> {
-        const view = await this.decryptObj(new SendFileView(this), {
-            fileName: null,
-        }, null, key);
-        return view;
-    }
+    this.size = obj.size;
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        id: null,
+        sizeName: null,
+        fileName: null,
+      },
+      alreadyEncrypted,
+      ["id", "sizeName"]
+    );
+  }
+
+  async decrypt(key: SymmetricCryptoKey): Promise<SendFileView> {
+    const view = await this.decryptObj(
+      new SendFileView(this),
+      {
+        fileName: null,
+      },
+      null,
+      key
+    );
+    return view;
+  }
 }

common/src/models/domain/sendText.ts

@@ -1,30 +1,41 @@
-import Domain from './domainBase';
-import { EncString } from './encString';
-import { SymmetricCryptoKey } from './symmetricCryptoKey';
+import Domain from "./domainBase";
+import { EncString } from "./encString";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
 
-import { SendTextData } from '../data/sendTextData';
+import { SendTextData } from "../data/sendTextData";
 
-import { SendTextView } from '../view/sendTextView';
+import { SendTextView } from "../view/sendTextView";
 
 export class SendText extends Domain {
-    text: EncString;
-    hidden: boolean;
+  text: EncString;
+  hidden: boolean;
 
-    constructor(obj?: SendTextData, alreadyEncrypted: boolean = false) {
-        super();
-        if (obj == null) {
-            return;
-        }
-
-        this.hidden = obj.hidden;
-        this.buildDomainModel(this, obj, {
-            text: null,
-        }, alreadyEncrypted, []);
+  constructor(obj?: SendTextData, alreadyEncrypted: boolean = false) {
+    super();
+    if (obj == null) {
+      return;
     }
 
-    decrypt(key: SymmetricCryptoKey): Promise<SendTextView> {
-        return this.decryptObj(new SendTextView(this), {
-            text: null,
-        }, null, key);
-    }
+    this.hidden = obj.hidden;
+    this.buildDomainModel(
+      this,
+      obj,
+      {
+        text: null,
+      },
+      alreadyEncrypted,
+      []
+    );
+  }
+
+  decrypt(key: SymmetricCryptoKey): Promise<SendTextView> {
+    return this.decryptObj(
+      new SendTextView(this),
+      {
+        text: null,
+      },
+      null,
+      key
+    );
+  }
 }

common/src/models/domain/sortedCiphersCache.ts

@@ -1,82 +1,87 @@
-import { CipherView } from '../view/cipherView';
+import { CipherView } from "../view/cipherView";
 
 const CacheTTL = 3000;
 
 export class SortedCiphersCache {
-    private readonly sortedCiphersByUrl: Map<string, Ciphers> = new Map<string, Ciphers>();
-    private readonly timeouts: Map<string, any> = new Map<string, any>();
+  private readonly sortedCiphersByUrl: Map<string, Ciphers> = new Map<string, Ciphers>();
+  private readonly timeouts: Map<string, any> = new Map<string, any>();
 
-    constructor(private readonly comparator: (a: CipherView, b: CipherView) => number) { }
+  constructor(private readonly comparator: (a: CipherView, b: CipherView) => number) {}
 
-    isCached(url: string) {
-        return this.sortedCiphersByUrl.has(url);
+  isCached(url: string) {
+    return this.sortedCiphersByUrl.has(url);
+  }
+
+  addCiphers(url: string, ciphers: CipherView[]) {
+    ciphers.sort(this.comparator);
+    this.sortedCiphersByUrl.set(url, new Ciphers(ciphers));
+    this.resetTimer(url);
+  }
+
+  getLastUsed(url: string) {
+    this.resetTimer(url);
+    return this.isCached(url) ? this.sortedCiphersByUrl.get(url).getLastUsed() : null;
+  }
+
+  getLastLaunched(url: string) {
+    return this.isCached(url) ? this.sortedCiphersByUrl.get(url).getLastLaunched() : null;
+  }
+
+  getNext(url: string) {
+    this.resetTimer(url);
+    return this.isCached(url) ? this.sortedCiphersByUrl.get(url).getNext() : null;
+  }
+
+  updateLastUsedIndex(url: string) {
+    if (this.isCached(url)) {
+      this.sortedCiphersByUrl.get(url).updateLastUsedIndex();
     }
+  }
 
-    addCiphers(url: string, ciphers: CipherView[]) {
-        ciphers.sort(this.comparator);
-        this.sortedCiphersByUrl.set(url, new Ciphers(ciphers));
-        this.resetTimer(url);
-    }
+  clear() {
+    this.sortedCiphersByUrl.clear();
+    this.timeouts.clear();
+  }
 
-    getLastUsed(url: string) {
-        this.resetTimer(url);
-        return this.isCached(url) ? this.sortedCiphersByUrl.get(url).getLastUsed() : null;
-    }
-
-    getLastLaunched(url: string) {
-        return this.isCached(url) ? this.sortedCiphersByUrl.get(url).getLastLaunched() : null;
-    }
-
-    getNext(url: string) {
-        this.resetTimer(url);
-        return this.isCached(url) ? this.sortedCiphersByUrl.get(url).getNext() : null;
-    }
-
-    updateLastUsedIndex(url: string) {
-        if (this.isCached(url)) {
-            this.sortedCiphersByUrl.get(url).updateLastUsedIndex();
-        }
-    }
-
-    clear() {
-        this.sortedCiphersByUrl.clear();
-        this.timeouts.clear();
-    }
-
-    private resetTimer(url: string) {
-        clearTimeout(this.timeouts.get(url));
-        this.timeouts.set(url, setTimeout(() => {
-            this.sortedCiphersByUrl.delete(url);
-            this.timeouts.delete(url);
-        }, CacheTTL));
-    }
+  private resetTimer(url: string) {
+    clearTimeout(this.timeouts.get(url));
+    this.timeouts.set(
+      url,
+      setTimeout(() => {
+        this.sortedCiphersByUrl.delete(url);
+        this.timeouts.delete(url);
+      }, CacheTTL)
+    );
+  }
 }
 
 class Ciphers {
-    lastUsedIndex = -1;
+  lastUsedIndex = -1;
 
-    constructor(private readonly ciphers: CipherView[]) { }
+  constructor(private readonly ciphers: CipherView[]) {}
 
-    getLastUsed() {
-        this.lastUsedIndex = Math.max(this.lastUsedIndex, 0);
-        return this.ciphers[this.lastUsedIndex];
-    }
+  getLastUsed() {
+    this.lastUsedIndex = Math.max(this.lastUsedIndex, 0);
+    return this.ciphers[this.lastUsedIndex];
+  }
 
-    getLastLaunched() {
-        const usedCiphers = this.ciphers.filter(cipher => cipher.localData?.lastLaunched);
-        const sortedCiphers = usedCiphers.sort((x, y) => y.localData.lastLaunched.valueOf() - x.localData.lastLaunched.valueOf());
-        return sortedCiphers[0];
-    }
+  getLastLaunched() {
+    const usedCiphers = this.ciphers.filter((cipher) => cipher.localData?.lastLaunched);
+    const sortedCiphers = usedCiphers.sort(
+      (x, y) => y.localData.lastLaunched.valueOf() - x.localData.lastLaunched.valueOf()
+    );
+    return sortedCiphers[0];
+  }
 
-    getNextIndex() {
-        return (this.lastUsedIndex + 1) % this.ciphers.length;
-    }
+  getNextIndex() {
+    return (this.lastUsedIndex + 1) % this.ciphers.length;
+  }
 
-    getNext() {
-        return this.ciphers[this.getNextIndex()];
-    }
+  getNext() {
+    return this.ciphers[this.getNextIndex()];
+  }
 
-    updateLastUsedIndex() {
-        this.lastUsedIndex = this.getNextIndex();
-    }
+  updateLastUsedIndex() {
+    this.lastUsedIndex = this.getNextIndex();
+  }
 }

common/src/models/domain/state.ts

@@ -1,9 +1,8 @@
-import { Account } from './account';
-import { GlobalState } from './globalState';
+import { Account } from "./account";
+import { GlobalState } from "./globalState";
 
 export class State {
-   accounts: { [userId: string]: Account } = {};
-   globals: GlobalState = new GlobalState();
-   activeUserId: string;
+  accounts: { [userId: string]: Account } = {};
+  globals: GlobalState = new GlobalState();
+  activeUserId: string;
 }
-

common/src/models/domain/storageOptions.ts

@@ -1,10 +1,10 @@
-import { HtmlStorageLocation } from '../../enums/htmlStorageLocation';
-import { StorageLocation } from '../../enums/storageLocation';
+import { HtmlStorageLocation } from "../../enums/htmlStorageLocation";
+import { StorageLocation } from "../../enums/storageLocation";
 
 export type StorageOptions = {
-    storageLocation?: StorageLocation;
-    useSecureStorage?: boolean;
-    userId?: string;
-    htmlStorageLocation?: HtmlStorageLocation;
-    keySuffix?: string,
+  storageLocation?: StorageLocation;
+  useSecureStorage?: boolean;
+  userId?: string;
+  htmlStorageLocation?: HtmlStorageLocation;
+  keySuffix?: string;
 };

common/src/models/domain/symmetricCryptoKey.ts

@@ -1,58 +1,58 @@
-import { EncryptionType } from '../../enums/encryptionType';
+import { EncryptionType } from "../../enums/encryptionType";
 
-import { Utils } from '../../misc/utils';
+import { Utils } from "../../misc/utils";
 
 export class SymmetricCryptoKey {
-    key: ArrayBuffer;
-    encKey?: ArrayBuffer;
-    macKey?: ArrayBuffer;
-    encType: EncryptionType;
+  key: ArrayBuffer;
+  encKey?: ArrayBuffer;
+  macKey?: ArrayBuffer;
+  encType: EncryptionType;
 
-    keyB64: string;
-    encKeyB64: string;
-    macKeyB64: string;
+  keyB64: string;
+  encKeyB64: string;
+  macKeyB64: string;
 
-    meta: any;
+  meta: any;
 
-    constructor(key: ArrayBuffer, encType?: EncryptionType) {
-        if (key == null) {
-            throw new Error('Must provide key');
-        }
-
-        if (encType == null) {
-            if (key.byteLength === 32) {
-                encType = EncryptionType.AesCbc256_B64;
-            } else if (key.byteLength === 64) {
-                encType = EncryptionType.AesCbc256_HmacSha256_B64;
-            } else {
-                throw new Error('Unable to determine encType.');
-            }
-        }
-
-        this.key = key;
-        this.encType = encType;
-
-        if (encType === EncryptionType.AesCbc256_B64 && key.byteLength === 32) {
-            this.encKey = key;
-            this.macKey = null;
-        } else if (encType === EncryptionType.AesCbc128_HmacSha256_B64 && key.byteLength === 32) {
-            this.encKey = key.slice(0, 16);
-            this.macKey = key.slice(16, 32);
-        } else if (encType === EncryptionType.AesCbc256_HmacSha256_B64 && key.byteLength === 64) {
-            this.encKey = key.slice(0, 32);
-            this.macKey = key.slice(32, 64);
-        } else {
-            throw new Error('Unsupported encType/key length.');
-        }
-
-        if (this.key != null) {
-            this.keyB64 = Utils.fromBufferToB64(this.key);
-        }
-        if (this.encKey != null) {
-            this.encKeyB64 = Utils.fromBufferToB64(this.encKey);
-        }
-        if (this.macKey != null) {
-            this.macKeyB64 = Utils.fromBufferToB64(this.macKey);
-        }
+  constructor(key: ArrayBuffer, encType?: EncryptionType) {
+    if (key == null) {
+      throw new Error("Must provide key");
     }
+
+    if (encType == null) {
+      if (key.byteLength === 32) {
+        encType = EncryptionType.AesCbc256_B64;
+      } else if (key.byteLength === 64) {
+        encType = EncryptionType.AesCbc256_HmacSha256_B64;
+      } else {
+        throw new Error("Unable to determine encType.");
+      }
+    }
+
+    this.key = key;
+    this.encType = encType;
+
+    if (encType === EncryptionType.AesCbc256_B64 && key.byteLength === 32) {
+      this.encKey = key;
+      this.macKey = null;
+    } else if (encType === EncryptionType.AesCbc128_HmacSha256_B64 && key.byteLength === 32) {
+      this.encKey = key.slice(0, 16);
+      this.macKey = key.slice(16, 32);
+    } else if (encType === EncryptionType.AesCbc256_HmacSha256_B64 && key.byteLength === 64) {
+      this.encKey = key.slice(0, 32);
+      this.macKey = key.slice(32, 64);
+    } else {
+      throw new Error("Unsupported encType/key length.");
+    }
+
+    if (this.key != null) {
+      this.keyB64 = Utils.fromBufferToB64(this.key);
+    }
+    if (this.encKey != null) {
+      this.encKeyB64 = Utils.fromBufferToB64(this.encKey);
+    }
+    if (this.macKey != null) {
+      this.macKeyB64 = Utils.fromBufferToB64(this.macKey);
+    }
+  }
 }

common/src/models/domain/treeNode.ts

@@ -1,16 +1,16 @@
 export class TreeNode<T extends ITreeNodeObject> {
-    parent: T;
-    node: T;
-    children: TreeNode<T>[] = [];
+  parent: T;
+  node: T;
+  children: TreeNode<T>[] = [];
 
-    constructor(node: T, name: string, parent: T) {
-        this.parent = parent;
-        this.node = node;
-        this.node.name = name;
-    }
+  constructor(node: T, name: string, parent: T) {
+    this.parent = parent;
+    this.node = node;
+    this.node.name = name;
+  }
 }
 
 export interface ITreeNodeObject {
-    id: string;
-    name: string;
+  id: string;
+  name: string;
 }

common/src/models/export/card.ts

@@ -1,66 +1,66 @@
-import { CardView } from '../view/cardView';
+import { CardView } from "../view/cardView";
 
-import { Card as CardDomain } from '../domain/card';
-import { EncString } from '../domain/encString';
+import { Card as CardDomain } from "../domain/card";
+import { EncString } from "../domain/encString";
 
 export class Card {
-    static template(): Card {
-        const req = new Card();
-        req.cardholderName = 'John Doe';
-        req.brand = 'visa';
-        req.number = '4242424242424242';
-        req.expMonth = '04';
-        req.expYear = '2023';
-        req.code = '123';
-        return req;
+  static template(): Card {
+    const req = new Card();
+    req.cardholderName = "John Doe";
+    req.brand = "visa";
+    req.number = "4242424242424242";
+    req.expMonth = "04";
+    req.expYear = "2023";
+    req.code = "123";
+    return req;
+  }
+
+  static toView(req: Card, view = new CardView()) {
+    view.cardholderName = req.cardholderName;
+    view.brand = req.brand;
+    view.number = req.number;
+    view.expMonth = req.expMonth;
+    view.expYear = req.expYear;
+    view.code = req.code;
+    return view;
+  }
+
+  static toDomain(req: Card, domain = new CardDomain()) {
+    domain.cardholderName = req.cardholderName != null ? new EncString(req.cardholderName) : null;
+    domain.brand = req.brand != null ? new EncString(req.brand) : null;
+    domain.number = req.number != null ? new EncString(req.number) : null;
+    domain.expMonth = req.expMonth != null ? new EncString(req.expMonth) : null;
+    domain.expYear = req.expYear != null ? new EncString(req.expYear) : null;
+    domain.code = req.code != null ? new EncString(req.code) : null;
+    return domain;
+  }
+
+  cardholderName: string;
+  brand: string;
+  number: string;
+  expMonth: string;
+  expYear: string;
+  code: string;
+
+  constructor(o?: CardView | CardDomain) {
+    if (o == null) {
+      return;
     }
 
-    static toView(req: Card, view = new CardView()) {
-        view.cardholderName = req.cardholderName;
-        view.brand = req.brand;
-        view.number = req.number;
-        view.expMonth = req.expMonth;
-        view.expYear = req.expYear;
-        view.code = req.code;
-        return view;
-    }
-
-    static toDomain(req: Card, domain = new CardDomain()) {
-        domain.cardholderName = req.cardholderName != null ? new EncString(req.cardholderName) : null;
-        domain.brand = req.brand != null ? new EncString(req.brand) : null;
-        domain.number = req.number != null ? new EncString(req.number) : null;
-        domain.expMonth = req.expMonth != null ? new EncString(req.expMonth) : null;
-        domain.expYear = req.expYear != null ? new EncString(req.expYear) : null;
-        domain.code = req.code != null ? new EncString(req.code) : null;
-        return domain;
-    }
-
-    cardholderName: string;
-    brand: string;
-    number: string;
-    expMonth: string;
-    expYear: string;
-    code: string;
-
-    constructor(o?: CardView | CardDomain) {
-        if (o == null) {
-            return;
-        }
-
-        if (o instanceof CardView) {
-            this.cardholderName = o.cardholderName;
-            this.brand = o.brand;
-            this.number = o.number;
-            this.expMonth = o.expMonth;
-            this.expYear = o.expYear;
-            this.code = o.code;
-        } else {
-            this.cardholderName = o.cardholderName?.encryptedString;
-            this.brand = o.brand?.encryptedString;
-            this.number = o.number?.encryptedString;
-            this.expMonth = o.expMonth?.encryptedString;
-            this.expYear = o.expYear?.encryptedString;
-            this.code = o.code?.encryptedString;
-        }
+    if (o instanceof CardView) {
+      this.cardholderName = o.cardholderName;
+      this.brand = o.brand;
+      this.number = o.number;
+      this.expMonth = o.expMonth;
+      this.expYear = o.expYear;
+      this.code = o.code;
+    } else {
+      this.cardholderName = o.cardholderName?.encryptedString;
+      this.brand = o.brand?.encryptedString;
+      this.number = o.number?.encryptedString;
+      this.expMonth = o.expMonth?.encryptedString;
+      this.expYear = o.expYear?.encryptedString;
+      this.code = o.code?.encryptedString;
     }
+  }
 }

common/src/models/export/cipher.ts

@@ -1,158 +1,158 @@
-import { CipherRepromptType } from '../../enums/cipherRepromptType';
-import { CipherType } from '../../enums/cipherType';
+import { CipherRepromptType } from "../../enums/cipherRepromptType";
+import { CipherType } from "../../enums/cipherType";
 
-import { CipherView } from '../view/cipherView';
+import { CipherView } from "../view/cipherView";
 
-import { Cipher as CipherDomain } from '../domain/cipher';
-import { EncString } from '../domain/encString';
+import { Cipher as CipherDomain } from "../domain/cipher";
+import { EncString } from "../domain/encString";
 
-import { Card } from './card';
-import { Field } from './field';
-import { Identity } from './identity';
-import { Login } from './login';
-import { SecureNote } from './secureNote';
+import { Card } from "./card";
+import { Field } from "./field";
+import { Identity } from "./identity";
+import { Login } from "./login";
+import { SecureNote } from "./secureNote";
 
 export class Cipher {
-    static template(): Cipher {
-        const req = new Cipher();
-        req.organizationId = null;
-        req.collectionIds = null;
-        req.folderId = null;
-        req.type = CipherType.Login;
-        req.name = 'Item name';
-        req.notes = 'Some notes about this item.';
-        req.favorite = false;
-        req.fields = [];
-        req.login = null;
-        req.secureNote = null;
-        req.card = null;
-        req.identity = null;
-        req.reprompt = CipherRepromptType.None;
-        return req;
+  static template(): Cipher {
+    const req = new Cipher();
+    req.organizationId = null;
+    req.collectionIds = null;
+    req.folderId = null;
+    req.type = CipherType.Login;
+    req.name = "Item name";
+    req.notes = "Some notes about this item.";
+    req.favorite = false;
+    req.fields = [];
+    req.login = null;
+    req.secureNote = null;
+    req.card = null;
+    req.identity = null;
+    req.reprompt = CipherRepromptType.None;
+    return req;
+  }
+
+  static toView(req: Cipher, view = new CipherView()) {
+    view.type = req.type;
+    view.folderId = req.folderId;
+    if (view.organizationId == null) {
+      view.organizationId = req.organizationId;
+    }
+    if (view.collectionIds || req.collectionIds) {
+      const set = new Set((view.collectionIds ?? []).concat(req.collectionIds ?? []));
+      view.collectionIds = Array.from(set.values());
+    }
+    view.name = req.name;
+    view.notes = req.notes;
+    view.favorite = req.favorite;
+    view.reprompt = req.reprompt ?? CipherRepromptType.None;
+
+    if (req.fields != null) {
+      view.fields = req.fields.map((f) => Field.toView(f));
     }
 
-    static toView(req: Cipher, view = new CipherView()) {
-        view.type = req.type;
-        view.folderId = req.folderId;
-        if (view.organizationId == null) {
-            view.organizationId = req.organizationId;
-        }
-        if (view.collectionIds || req.collectionIds) {
-            const set = new Set((view.collectionIds ?? []).concat(req.collectionIds ?? []));
-            view.collectionIds = Array.from(set.values());
-        }
-        view.name = req.name;
-        view.notes = req.notes;
-        view.favorite = req.favorite;
-        view.reprompt = req.reprompt ?? CipherRepromptType.None;
-
-        if (req.fields != null) {
-            view.fields = req.fields.map(f => Field.toView(f));
-        }
-
-        switch (req.type) {
-            case CipherType.Login:
-                view.login = Login.toView(req.login);
-                break;
-            case CipherType.SecureNote:
-                view.secureNote = SecureNote.toView(req.secureNote);
-                break;
-            case CipherType.Card:
-                view.card = Card.toView(req.card);
-                break;
-            case CipherType.Identity:
-                view.identity = Identity.toView(req.identity);
-                break;
-        }
-
-        return view;
+    switch (req.type) {
+      case CipherType.Login:
+        view.login = Login.toView(req.login);
+        break;
+      case CipherType.SecureNote:
+        view.secureNote = SecureNote.toView(req.secureNote);
+        break;
+      case CipherType.Card:
+        view.card = Card.toView(req.card);
+        break;
+      case CipherType.Identity:
+        view.identity = Identity.toView(req.identity);
+        break;
     }
 
-    static toDomain(req: Cipher, domain = new CipherDomain()) {
-        domain.type = req.type;
-        domain.folderId = req.folderId;
-        if (domain.organizationId == null) {
-            domain.organizationId = req.organizationId;
-        }
-        domain.name = req.name != null ? new EncString(req.name) : null;
-        domain.notes = req.notes != null ? new EncString(req.notes) : null;
-        domain.favorite = req.favorite;
-        domain.reprompt = req.reprompt ?? CipherRepromptType.None;
+    return view;
+  }
 
-        if (req.fields != null) {
-            domain.fields = req.fields.map(f => Field.toDomain(f));
-        }
+  static toDomain(req: Cipher, domain = new CipherDomain()) {
+    domain.type = req.type;
+    domain.folderId = req.folderId;
+    if (domain.organizationId == null) {
+      domain.organizationId = req.organizationId;
+    }
+    domain.name = req.name != null ? new EncString(req.name) : null;
+    domain.notes = req.notes != null ? new EncString(req.notes) : null;
+    domain.favorite = req.favorite;
+    domain.reprompt = req.reprompt ?? CipherRepromptType.None;
 
-        switch (req.type) {
-            case CipherType.Login:
-                domain.login = Login.toDomain(req.login);
-                break;
-            case CipherType.SecureNote:
-                domain.secureNote = SecureNote.toDomain(req.secureNote);
-                break;
-            case CipherType.Card:
-                domain.card = Card.toDomain(req.card);
-                break;
-            case CipherType.Identity:
-                domain.identity = Identity.toDomain(req.identity);
-                break;
-        }
-
-        return domain;
+    if (req.fields != null) {
+      domain.fields = req.fields.map((f) => Field.toDomain(f));
     }
 
-    type: CipherType;
-    folderId: string;
-    organizationId: string;
-    collectionIds: string[];
-    name: string;
-    notes: string;
-    favorite: boolean;
-    fields: Field[];
-    login: Login;
-    secureNote: SecureNote;
-    card: Card;
-    identity: Identity;
-    reprompt: CipherRepromptType;
-
-    // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
-    build(o: CipherView | CipherDomain) {
-        this.organizationId = o.organizationId;
-        this.folderId = o.folderId;
-        this.type = o.type;
-        this.reprompt = o.reprompt;
-
-        if (o instanceof CipherView) {
-            this.name = o.name;
-            this.notes = o.notes;
-        } else {
-            this.name = o.name?.encryptedString;
-            this.notes = o.notes?.encryptedString;
-        }
-
-        this.favorite = o.favorite;
-
-        if (o.fields != null) {
-            if (o instanceof CipherView) {
-                this.fields = o.fields.map(f => new Field(f));
-            } else {
-                this.fields = o.fields.map(f => new Field(f));
-            }
-        }
-
-        switch (o.type) {
-            case CipherType.Login:
-                this.login = new Login(o.login);
-                break;
-            case CipherType.SecureNote:
-                this.secureNote = new SecureNote(o.secureNote);
-                break;
-            case CipherType.Card:
-                this.card = new Card(o.card);
-                break;
-            case CipherType.Identity:
-                this.identity = new Identity(o.identity);
-                break;
-        }
+    switch (req.type) {
+      case CipherType.Login:
+        domain.login = Login.toDomain(req.login);
+        break;
+      case CipherType.SecureNote:
+        domain.secureNote = SecureNote.toDomain(req.secureNote);
+        break;
+      case CipherType.Card:
+        domain.card = Card.toDomain(req.card);
+        break;
+      case CipherType.Identity:
+        domain.identity = Identity.toDomain(req.identity);
+        break;
     }
+
+    return domain;
+  }
+
+  type: CipherType;
+  folderId: string;
+  organizationId: string;
+  collectionIds: string[];
+  name: string;
+  notes: string;
+  favorite: boolean;
+  fields: Field[];
+  login: Login;
+  secureNote: SecureNote;
+  card: Card;
+  identity: Identity;
+  reprompt: CipherRepromptType;
+
+  // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
+  build(o: CipherView | CipherDomain) {
+    this.organizationId = o.organizationId;
+    this.folderId = o.folderId;
+    this.type = o.type;
+    this.reprompt = o.reprompt;
+
+    if (o instanceof CipherView) {
+      this.name = o.name;
+      this.notes = o.notes;
+    } else {
+      this.name = o.name?.encryptedString;
+      this.notes = o.notes?.encryptedString;
+    }
+
+    this.favorite = o.favorite;
+
+    if (o.fields != null) {
+      if (o instanceof CipherView) {
+        this.fields = o.fields.map((f) => new Field(f));
+      } else {
+        this.fields = o.fields.map((f) => new Field(f));
+      }
+    }
+
+    switch (o.type) {
+      case CipherType.Login:
+        this.login = new Login(o.login);
+        break;
+      case CipherType.SecureNote:
+        this.secureNote = new SecureNote(o.secureNote);
+        break;
+      case CipherType.Card:
+        this.card = new Card(o.card);
+        break;
+      case CipherType.Identity:
+        this.identity = new Identity(o.identity);
+        break;
+    }
+  }
 }

common/src/models/export/cipherWithIds.ts

@@ -1,17 +1,17 @@
-import { Cipher } from './cipher';
+import { Cipher } from "./cipher";
 
-import { CipherView } from '../view/cipherView';
+import { CipherView } from "../view/cipherView";
 
-import { Cipher as CipherDomain } from '../domain/cipher';
+import { Cipher as CipherDomain } from "../domain/cipher";
 
 export class CipherWithIds extends Cipher {
-    id: string;
-    collectionIds: string[];
+  id: string;
+  collectionIds: string[];
 
-    // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
-    build(o: CipherView | CipherDomain) {
-        this.id = o.id;
-        super.build(o);
-        this.collectionIds = o.collectionIds;
-    }
+  // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
+  build(o: CipherView | CipherDomain) {
+    this.id = o.id;
+    super.build(o);
+    this.collectionIds = o.collectionIds;
+  }
 }

common/src/models/export/collection.ts

@@ -1,47 +1,47 @@
-import { CollectionView } from '../view/collectionView';
+import { CollectionView } from "../view/collectionView";
 
-import { Collection as CollectionDomain } from '../domain/collection';
-import { EncString } from '../domain/encString';
+import { Collection as CollectionDomain } from "../domain/collection";
+import { EncString } from "../domain/encString";
 
 export class Collection {
-    static template(): Collection {
-        const req = new Collection();
-        req.organizationId = '00000000-0000-0000-0000-000000000000';
-        req.name = 'Collection name';
-        req.externalId = null;
-        return req;
-    }
+  static template(): Collection {
+    const req = new Collection();
+    req.organizationId = "00000000-0000-0000-0000-000000000000";
+    req.name = "Collection name";
+    req.externalId = null;
+    return req;
+  }
 
-    static toView(req: Collection, view = new CollectionView()) {
-        view.name = req.name;
-        view.externalId = req.externalId;
-        if (view.organizationId == null) {
-            view.organizationId = req.organizationId;
-        }
-        return view;
+  static toView(req: Collection, view = new CollectionView()) {
+    view.name = req.name;
+    view.externalId = req.externalId;
+    if (view.organizationId == null) {
+      view.organizationId = req.organizationId;
     }
+    return view;
+  }
 
-    static toDomain(req: Collection, domain = new CollectionDomain()) {
-        domain.name = req.name != null ? new EncString(req.name) : null;
-        domain.externalId = req.externalId;
-        if (domain.organizationId == null) {
-            domain.organizationId = req.organizationId;
-        }
-        return domain;
+  static toDomain(req: Collection, domain = new CollectionDomain()) {
+    domain.name = req.name != null ? new EncString(req.name) : null;
+    domain.externalId = req.externalId;
+    if (domain.organizationId == null) {
+      domain.organizationId = req.organizationId;
     }
+    return domain;
+  }
 
-    organizationId: string;
-    name: string;
-    externalId: string;
+  organizationId: string;
+  name: string;
+  externalId: string;
 
-    // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
-    build(o: CollectionView | CollectionDomain) {
-        this.organizationId = o.organizationId;
-        if (o instanceof CollectionView) {
-            this.name = o.name;
-        } else {
-            this.name = o.name?.encryptedString;
-        }
-        this.externalId = o.externalId;
+  // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
+  build(o: CollectionView | CollectionDomain) {
+    this.organizationId = o.organizationId;
+    if (o instanceof CollectionView) {
+      this.name = o.name;
+    } else {
+      this.name = o.name?.encryptedString;
     }
+    this.externalId = o.externalId;
+  }
 }

common/src/models/export/collectionWithId.ts

@@ -1,15 +1,15 @@
-import { Collection } from './collection';
+import { Collection } from "./collection";
 
-import { CollectionView } from '../view/collectionView';
+import { CollectionView } from "../view/collectionView";
 
-import { Collection as CollectionDomain } from '../domain/collection';
+import { Collection as CollectionDomain } from "../domain/collection";
 
 export class CollectionWithId extends Collection {
-    id: string;
+  id: string;
 
-    // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
-    build(o: CollectionView | CollectionDomain) {
-        this.id = o.id;
-        super.build(o);
-    }
+  // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
+  build(o: CollectionView | CollectionDomain) {
+    this.id = o.id;
+    super.build(o);
+  }
 }

common/src/models/export/event.ts

@@ -1,26 +1,26 @@
-import { EventType } from '../../enums/eventType';
-import { EventView } from '../view/eventView';
+import { EventType } from "../../enums/eventType";
+import { EventView } from "../view/eventView";
 
 export class Event {
-    message: string;
-    appIcon: string;
-    appName: string;
-    userId: string;
-    userName: string;
-    userEmail: string;
-    date: string;
-    ip: string;
-    type: string;
+  message: string;
+  appIcon: string;
+  appName: string;
+  userId: string;
+  userName: string;
+  userEmail: string;
+  date: string;
+  ip: string;
+  type: string;
 
-    constructor(event: EventView) {
-        this.message = event.humanReadableMessage;
-        this.appIcon = event.appIcon;
-        this.appName = event.appName;
-        this.userId = event.userId;
-        this.userName = event.userName;
-        this.userEmail = event.userEmail;
-        this.date = event.date;
-        this.ip = event.ip;
-        this.type = EventType[event.type];
-    }
+  constructor(event: EventView) {
+    this.message = event.humanReadableMessage;
+    this.appIcon = event.appIcon;
+    this.appName = event.appName;
+    this.userId = event.userId;
+    this.userName = event.userName;
+    this.userEmail = event.userEmail;
+    this.date = event.date;
+    this.ip = event.ip;
+    this.type = EventType[event.type];
+  }
 }

common/src/models/export/field.ts

@@ -1,54 +1,54 @@
-import { FieldType } from '../../enums/fieldType';
-import { LinkedIdType } from '../../enums/linkedIdType';
+import { FieldType } from "../../enums/fieldType";
+import { LinkedIdType } from "../../enums/linkedIdType";
 
-import { FieldView } from '../view/fieldView';
+import { FieldView } from "../view/fieldView";
 
-import { EncString } from '../domain/encString';
-import { Field as FieldDomain } from '../domain/field';
+import { EncString } from "../domain/encString";
+import { Field as FieldDomain } from "../domain/field";
 
 export class Field {
-    static template(): Field {
-        const req = new Field();
-        req.name = 'Field name';
-        req.value = 'Some value';
-        req.type = FieldType.Text;
-        return req;
+  static template(): Field {
+    const req = new Field();
+    req.name = "Field name";
+    req.value = "Some value";
+    req.type = FieldType.Text;
+    return req;
+  }
+
+  static toView(req: Field, view = new FieldView()) {
+    view.type = req.type;
+    view.value = req.value;
+    view.name = req.name;
+    view.linkedId = req.linkedId;
+    return view;
+  }
+
+  static toDomain(req: Field, domain = new FieldDomain()) {
+    domain.type = req.type;
+    domain.value = req.value != null ? new EncString(req.value) : null;
+    domain.name = req.name != null ? new EncString(req.name) : null;
+    domain.linkedId = req.linkedId;
+    return domain;
+  }
+
+  name: string;
+  value: string;
+  type: FieldType;
+  linkedId: LinkedIdType;
+
+  constructor(o?: FieldView | FieldDomain) {
+    if (o == null) {
+      return;
     }
 
-    static toView(req: Field, view = new FieldView()) {
-        view.type = req.type;
-        view.value = req.value;
-        view.name = req.name;
-        view.linkedId = req.linkedId;
-        return view;
-    }
-
-    static toDomain(req: Field, domain = new FieldDomain()) {
-        domain.type = req.type;
-        domain.value = req.value != null ? new EncString(req.value) : null;
-        domain.name = req.name != null ? new EncString(req.name) : null;
-        domain.linkedId = req.linkedId;
-        return domain;
-    }
-
-    name: string;
-    value: string;
-    type: FieldType;
-    linkedId: LinkedIdType;
-
-    constructor(o?: FieldView | FieldDomain) {
-        if (o == null) {
-            return;
-        }
-
-        if (o instanceof FieldView) {
-            this.name = o.name;
-            this.value = o.value;
-        } else {
-            this.name = o.name?.encryptedString;
-            this.value = o.value?.encryptedString;
-        }
-        this.type = o.type;
-        this.linkedId = o.linkedId;
+    if (o instanceof FieldView) {
+      this.name = o.name;
+      this.value = o.value;
+    } else {
+      this.name = o.name?.encryptedString;
+      this.value = o.value?.encryptedString;
     }
+    this.type = o.type;
+    this.linkedId = o.linkedId;
+  }
 }

common/src/models/export/folder.ts

@@ -1,33 +1,33 @@
-import { FolderView } from '../view/folderView';
+import { FolderView } from "../view/folderView";
 
-import { EncString } from '../domain/encString';
-import { Folder as FolderDomain } from '../domain/folder';
+import { EncString } from "../domain/encString";
+import { Folder as FolderDomain } from "../domain/folder";
 
 export class Folder {
-    static template(): Folder {
-        const req = new Folder();
-        req.name = 'Folder name';
-        return req;
-    }
+  static template(): Folder {
+    const req = new Folder();
+    req.name = "Folder name";
+    return req;
+  }
 
-    static toView(req: Folder, view = new FolderView()) {
-        view.name = req.name;
-        return view;
-    }
+  static toView(req: Folder, view = new FolderView()) {
+    view.name = req.name;
+    return view;
+  }
 
-    static toDomain(req: Folder, domain = new FolderDomain()) {
-        domain.name = req.name != null ? new EncString(req.name) : null;
-        return domain;
-    }
+  static toDomain(req: Folder, domain = new FolderDomain()) {
+    domain.name = req.name != null ? new EncString(req.name) : null;
+    return domain;
+  }
 
-    name: string;
+  name: string;
 
-    // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
-    build(o: FolderView | FolderDomain) {
-        if (o instanceof FolderView) {
-            this.name = o.name;
-        } else {
-            this.name = o.name?.encryptedString;
-        }
+  // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
+  build(o: FolderView | FolderDomain) {
+    if (o instanceof FolderView) {
+      this.name = o.name;
+    } else {
+      this.name = o.name?.encryptedString;
     }
+  }
 }

common/src/models/export/folderWithId.ts

@@ -1,15 +1,15 @@
-import { Folder } from './folder';
+import { Folder } from "./folder";
 
-import { FolderView } from '../view/folderView';
+import { FolderView } from "../view/folderView";
 
-import { Folder as FolderDomain } from '../domain/folder';
+import { Folder as FolderDomain } from "../domain/folder";
 
 export class FolderWithId extends Folder {
-    id: string;
+  id: string;
 
-    // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
-    build(o: FolderView | FolderDomain) {
-        this.id = o.id;
-        super.build(o);
-    }
+  // Use build method instead of ctor so that we can control order of JSON stringify for pretty print
+  build(o: FolderView | FolderDomain) {
+    this.id = o.id;
+    super.build(o);
+  }
 }

common/src/models/export/identity.ts

@@ -1,138 +1,138 @@
-import { IdentityView } from '../view/identityView';
+import { IdentityView } from "../view/identityView";
 
-import { EncString } from '../domain/encString';
-import { Identity as IdentityDomain } from '../domain/identity';
+import { EncString } from "../domain/encString";
+import { Identity as IdentityDomain } from "../domain/identity";
 
 export class Identity {
-    static template(): Identity {
-        const req = new Identity();
-        req.title = 'Mr';
-        req.firstName = 'John';
-        req.middleName = 'William';
-        req.lastName = 'Doe';
-        req.address1 = '123 Any St';
-        req.address2 = 'Apt #123';
-        req.address3 = null;
-        req.city = 'New York';
-        req.state = 'NY';
-        req.postalCode = '10001';
-        req.country = 'US';
-        req.company = 'Acme Inc.';
-        req.email = 'john@company.com';
-        req.phone = '5555551234';
-        req.ssn = '000-123-4567';
-        req.username = 'jdoe';
-        req.passportNumber = 'US-123456789';
-        req.licenseNumber = 'D123-12-123-12333';
-        return req;
+  static template(): Identity {
+    const req = new Identity();
+    req.title = "Mr";
+    req.firstName = "John";
+    req.middleName = "William";
+    req.lastName = "Doe";
+    req.address1 = "123 Any St";
+    req.address2 = "Apt #123";
+    req.address3 = null;
+    req.city = "New York";
+    req.state = "NY";
+    req.postalCode = "10001";
+    req.country = "US";
+    req.company = "Acme Inc.";
+    req.email = "john@company.com";
+    req.phone = "5555551234";
+    req.ssn = "000-123-4567";
+    req.username = "jdoe";
+    req.passportNumber = "US-123456789";
+    req.licenseNumber = "D123-12-123-12333";
+    return req;
+  }
+
+  static toView(req: Identity, view = new IdentityView()) {
+    view.title = req.title;
+    view.firstName = req.firstName;
+    view.middleName = req.middleName;
+    view.lastName = req.lastName;
+    view.address1 = req.address1;
+    view.address2 = req.address2;
+    view.address3 = req.address3;
+    view.city = req.city;
+    view.state = req.state;
+    view.postalCode = req.postalCode;
+    view.country = req.country;
+    view.company = req.company;
+    view.email = req.email;
+    view.phone = req.phone;
+    view.ssn = req.ssn;
+    view.username = req.username;
+    view.passportNumber = req.passportNumber;
+    view.licenseNumber = req.licenseNumber;
+    return view;
+  }
+
+  static toDomain(req: Identity, domain = new IdentityDomain()) {
+    domain.title = req.title != null ? new EncString(req.title) : null;
+    domain.firstName = req.firstName != null ? new EncString(req.firstName) : null;
+    domain.middleName = req.middleName != null ? new EncString(req.middleName) : null;
+    domain.lastName = req.lastName != null ? new EncString(req.lastName) : null;
+    domain.address1 = req.address1 != null ? new EncString(req.address1) : null;
+    domain.address2 = req.address2 != null ? new EncString(req.address2) : null;
+    domain.address3 = req.address3 != null ? new EncString(req.address3) : null;
+    domain.city = req.city != null ? new EncString(req.city) : null;
+    domain.state = req.state != null ? new EncString(req.state) : null;
+    domain.postalCode = req.postalCode != null ? new EncString(req.postalCode) : null;
+    domain.country = req.country != null ? new EncString(req.country) : null;
+    domain.company = req.company != null ? new EncString(req.company) : null;
+    domain.email = req.email != null ? new EncString(req.email) : null;
+    domain.phone = req.phone != null ? new EncString(req.phone) : null;
+    domain.ssn = req.ssn != null ? new EncString(req.ssn) : null;
+    domain.username = req.username != null ? new EncString(req.username) : null;
+    domain.passportNumber = req.passportNumber != null ? new EncString(req.passportNumber) : null;
+    domain.licenseNumber = req.licenseNumber != null ? new EncString(req.licenseNumber) : null;
+    return domain;
+  }
+
+  title: string;
+  firstName: string;
+  middleName: string;
+  lastName: string;
+  address1: string;
+  address2: string;
+  address3: string;
+  city: string;
+  state: string;
+  postalCode: string;
+  country: string;
+  company: string;
+  email: string;
+  phone: string;
+  ssn: string;
+  username: string;
+  passportNumber: string;
+  licenseNumber: string;
+
+  constructor(o?: IdentityView | IdentityDomain) {
+    if (o == null) {
+      return;
     }
 
-    static toView(req: Identity, view = new IdentityView()) {
-        view.title = req.title;
-        view.firstName = req.firstName;
-        view.middleName = req.middleName;
-        view.lastName = req.lastName;
-        view.address1 = req.address1;
-        view.address2 = req.address2;
-        view.address3 = req.address3;
-        view.city = req.city;
-        view.state = req.state;
-        view.postalCode = req.postalCode;
-        view.country = req.country;
-        view.company = req.company;
-        view.email = req.email;
-        view.phone = req.phone;
-        view.ssn = req.ssn;
-        view.username = req.username;
-        view.passportNumber = req.passportNumber;
-        view.licenseNumber = req.licenseNumber;
-        return view;
-    }
-
-    static toDomain(req: Identity, domain = new IdentityDomain()) {
-        domain.title = req.title != null ? new EncString(req.title) : null;
-        domain.firstName = req.firstName != null ? new EncString(req.firstName) : null;
-        domain.middleName = req.middleName != null ? new EncString(req.middleName) : null;
-        domain.lastName = req.lastName != null ? new EncString(req.lastName) : null;
-        domain.address1 = req.address1 != null ? new EncString(req.address1) : null;
-        domain.address2 = req.address2 != null ? new EncString(req.address2) : null;
-        domain.address3 = req.address3 != null ? new EncString(req.address3) : null;
-        domain.city = req.city != null ? new EncString(req.city) : null;
-        domain.state = req.state != null ? new EncString(req.state) : null;
-        domain.postalCode = req.postalCode != null ? new EncString(req.postalCode) : null;
-        domain.country = req.country != null ? new EncString(req.country) : null;
-        domain.company = req.company != null ? new EncString(req.company) : null;
-        domain.email = req.email != null ? new EncString(req.email) : null;
-        domain.phone = req.phone != null ? new EncString(req.phone) : null;
-        domain.ssn = req.ssn != null ? new EncString(req.ssn) : null;
-        domain.username = req.username != null ? new EncString(req.username) : null;
-        domain.passportNumber = req.passportNumber != null ? new EncString(req.passportNumber) : null;
-        domain.licenseNumber = req.licenseNumber != null ? new EncString(req.licenseNumber) : null;
-        return domain;
-    }
-
-    title: string;
-    firstName: string;
-    middleName: string;
-    lastName: string;
-    address1: string;
-    address2: string;
-    address3: string;
-    city: string;
-    state: string;
-    postalCode: string;
-    country: string;
-    company: string;
-    email: string;
-    phone: string;
-    ssn: string;
-    username: string;
-    passportNumber: string;
-    licenseNumber: string;
-
-    constructor(o?: IdentityView | IdentityDomain) {
-        if (o == null) {
-            return;
-        }
-
-        if (o instanceof IdentityView) {
-            this.title = o.title;
-            this.firstName = o.firstName;
-            this.middleName = o.middleName;
-            this.lastName = o.lastName;
-            this.address1 = o.address1;
-            this.address2 = o.address2;
-            this.address3 = o.address3;
-            this.city = o.city;
-            this.state = o.state;
-            this.postalCode = o.postalCode;
-            this.country = o.country;
-            this.company = o.company;
-            this.email = o.email;
-            this.phone = o.phone;
-            this.ssn = o.ssn;
-            this.username = o.username;
-            this.passportNumber = o.passportNumber;
-            this.licenseNumber = o.licenseNumber;
-        } else {
-            this.title = o.title?.encryptedString;
-            this.firstName = o.firstName?.encryptedString;
-            this.middleName = o.middleName?.encryptedString;
-            this.lastName = o.lastName?.encryptedString;
-            this.address1 = o.address1?.encryptedString;
-            this.address2 = o.address2?.encryptedString;
-            this.address3 = o.address3?.encryptedString;
-            this.city = o.city?.encryptedString;
-            this.state = o.state?.encryptedString;
-            this.postalCode = o.postalCode?.encryptedString;
-            this.country = o.country?.encryptedString;
-            this.company = o.company?.encryptedString;
-            this.email = o.email?.encryptedString;
-            this.phone = o.phone?.encryptedString;
-            this.ssn = o.ssn?.encryptedString;
-            this.username = o.username?.encryptedString;
-            this.passportNumber = o.passportNumber?.encryptedString;
-            this.licenseNumber = o.licenseNumber?.encryptedString;
-        }
+    if (o instanceof IdentityView) {
+      this.title = o.title;
+      this.firstName = o.firstName;
+      this.middleName = o.middleName;
+      this.lastName = o.lastName;
+      this.address1 = o.address1;
+      this.address2 = o.address2;
+      this.address3 = o.address3;
+      this.city = o.city;
+      this.state = o.state;
+      this.postalCode = o.postalCode;
+      this.country = o.country;
+      this.company = o.company;
+      this.email = o.email;
+      this.phone = o.phone;
+      this.ssn = o.ssn;
+      this.username = o.username;
+      this.passportNumber = o.passportNumber;
+      this.licenseNumber = o.licenseNumber;
+    } else {
+      this.title = o.title?.encryptedString;
+      this.firstName = o.firstName?.encryptedString;
+      this.middleName = o.middleName?.encryptedString;
+      this.lastName = o.lastName?.encryptedString;
+      this.address1 = o.address1?.encryptedString;
+      this.address2 = o.address2?.encryptedString;
+      this.address3 = o.address3?.encryptedString;
+      this.city = o.city?.encryptedString;
+      this.state = o.state?.encryptedString;
+      this.postalCode = o.postalCode?.encryptedString;
+      this.country = o.country?.encryptedString;
+      this.company = o.company?.encryptedString;
+      this.email = o.email?.encryptedString;
+      this.phone = o.phone?.encryptedString;
+      this.ssn = o.ssn?.encryptedString;
+      this.username = o.username?.encryptedString;
+      this.passportNumber = o.passportNumber?.encryptedString;
+      this.licenseNumber = o.licenseNumber?.encryptedString;
     }
+  }
 }

common/src/models/export/login.ts

@@ -1,66 +1,66 @@
-import { LoginUri } from './loginUri';
+import { LoginUri } from "./loginUri";
 
-import { LoginView } from '../view/loginView';
+import { LoginView } from "../view/loginView";
 
-import { EncString } from '../domain/encString';
-import { Login as LoginDomain } from '../domain/login';
+import { EncString } from "../domain/encString";
+import { Login as LoginDomain } from "../domain/login";
 
 export class Login {
-    static template(): Login {
-        const req = new Login();
-        req.uris = [];
-        req.username = 'jdoe';
-        req.password = 'myp@ssword123';
-        req.totp = 'JBSWY3DPEHPK3PXP';
-        return req;
+  static template(): Login {
+    const req = new Login();
+    req.uris = [];
+    req.username = "jdoe";
+    req.password = "myp@ssword123";
+    req.totp = "JBSWY3DPEHPK3PXP";
+    return req;
+  }
+
+  static toView(req: Login, view = new LoginView()) {
+    if (req.uris != null) {
+      view.uris = req.uris.map((u) => LoginUri.toView(u));
+    }
+    view.username = req.username;
+    view.password = req.password;
+    view.totp = req.totp;
+    return view;
+  }
+
+  static toDomain(req: Login, domain = new LoginDomain()) {
+    if (req.uris != null) {
+      domain.uris = req.uris.map((u) => LoginUri.toDomain(u));
+    }
+    domain.username = req.username != null ? new EncString(req.username) : null;
+    domain.password = req.password != null ? new EncString(req.password) : null;
+    domain.totp = req.totp != null ? new EncString(req.totp) : null;
+    return domain;
+  }
+
+  uris: LoginUri[];
+  username: string;
+  password: string;
+  totp: string;
+
+  constructor(o?: LoginView | LoginDomain) {
+    if (o == null) {
+      return;
     }
 
-    static toView(req: Login, view = new LoginView()) {
-        if (req.uris != null) {
-            view.uris = req.uris.map(u => LoginUri.toView(u));
-        }
-        view.username = req.username;
-        view.password = req.password;
-        view.totp = req.totp;
-        return view;
+    if (o.uris != null) {
+      if (o instanceof LoginView) {
+        this.uris = o.uris.map((u) => new LoginUri(u));
+      } else {
+        this.uris = o.uris.map((u) => new LoginUri(u));
+      }
     }
 
-    static toDomain(req: Login, domain = new LoginDomain()) {
-        if (req.uris != null) {
-            domain.uris = req.uris.map(u => LoginUri.toDomain(u));
-        }
-        domain.username = req.username != null ? new EncString(req.username) : null;
-        domain.password = req.password != null ? new EncString(req.password) : null;
-        domain.totp = req.totp != null ? new EncString(req.totp) : null;
-        return domain;
-    }
-
-    uris: LoginUri[];
-    username: string;
-    password: string;
-    totp: string;
-
-    constructor(o?: LoginView | LoginDomain) {
-        if (o == null) {
-            return;
-        }
-
-        if (o.uris != null) {
-            if (o instanceof LoginView) {
-                this.uris = o.uris.map(u => new LoginUri(u));
-            } else {
-                this.uris = o.uris.map(u => new LoginUri(u));
-            }
-        }
-
-        if (o instanceof LoginView) {
-            this.username = o.username;
-            this.password = o.password;
-            this.totp = o.totp;
-        } else {
-            this.username = o.username?.encryptedString;
-            this.password = o.password?.encryptedString;
-            this.totp = o.totp?.encryptedString;
-        }
+    if (o instanceof LoginView) {
+      this.username = o.username;
+      this.password = o.password;
+      this.totp = o.totp;
+    } else {
+      this.username = o.username?.encryptedString;
+      this.password = o.password?.encryptedString;
+      this.totp = o.totp?.encryptedString;
     }
+  }
 }

common/src/models/export/loginUri.ts

@@ -1,43 +1,43 @@
-import { UriMatchType } from '../../enums/uriMatchType';
+import { UriMatchType } from "../../enums/uriMatchType";
 
-import { LoginUriView } from '../view/loginUriView';
+import { LoginUriView } from "../view/loginUriView";
 
-import { EncString } from '../domain/encString';
-import { LoginUri as LoginUriDomain } from '../domain/loginUri';
+import { EncString } from "../domain/encString";
+import { LoginUri as LoginUriDomain } from "../domain/loginUri";
 
 export class LoginUri {
-    static template(): LoginUri {
-        const req = new LoginUri();
-        req.uri = 'https://google.com';
-        req.match = null;
-        return req;
+  static template(): LoginUri {
+    const req = new LoginUri();
+    req.uri = "https://google.com";
+    req.match = null;
+    return req;
+  }
+
+  static toView(req: LoginUri, view = new LoginUriView()) {
+    view.uri = req.uri;
+    view.match = req.match;
+    return view;
+  }
+
+  static toDomain(req: LoginUri, domain = new LoginUriDomain()) {
+    domain.uri = req.uri != null ? new EncString(req.uri) : null;
+    domain.match = req.match;
+    return domain;
+  }
+
+  uri: string;
+  match: UriMatchType = null;
+
+  constructor(o?: LoginUriView | LoginUriDomain) {
+    if (o == null) {
+      return;
     }
 
-    static toView(req: LoginUri, view = new LoginUriView()) {
-        view.uri = req.uri;
-        view.match = req.match;
-        return view;
-    }
-
-    static toDomain(req: LoginUri, domain = new LoginUriDomain()) {
-        domain.uri = req.uri != null ? new EncString(req.uri) : null;
-        domain.match = req.match;
-        return domain;
-    }
-
-    uri: string;
-    match: UriMatchType = null;
-
-    constructor(o?: LoginUriView | LoginUriDomain) {
-        if (o == null) {
-            return;
-        }
-
-        if (o instanceof LoginUriView) {
-            this.uri = o.uri;
-        } else {
-            this.uri = o.uri?.encryptedString;
-        }
-        this.match = o.match;
+    if (o instanceof LoginUriView) {
+      this.uri = o.uri;
+    } else {
+      this.uri = o.uri?.encryptedString;
     }
+    this.match = o.match;
+  }
 }

common/src/models/export/secureNote.ts

@@ -1,33 +1,33 @@
-import { SecureNoteType } from '../../enums/secureNoteType';
+import { SecureNoteType } from "../../enums/secureNoteType";
 
-import { SecureNoteView } from '../view/secureNoteView';
+import { SecureNoteView } from "../view/secureNoteView";
 
-import { SecureNote as SecureNoteDomain } from '../domain/secureNote';
+import { SecureNote as SecureNoteDomain } from "../domain/secureNote";
 
 export class SecureNote {
-    static template(): SecureNote {
-        const req = new SecureNote();
-        req.type = SecureNoteType.Generic;
-        return req;
+  static template(): SecureNote {
+    const req = new SecureNote();
+    req.type = SecureNoteType.Generic;
+    return req;
+  }
+
+  static toView(req: SecureNote, view = new SecureNoteView()) {
+    view.type = req.type;
+    return view;
+  }
+
+  static toDomain(req: SecureNote, view = new SecureNoteDomain()) {
+    view.type = req.type;
+    return view;
+  }
+
+  type: SecureNoteType;
+
+  constructor(o?: SecureNoteView | SecureNoteDomain) {
+    if (o == null) {
+      return;
     }
 
-    static toView(req: SecureNote, view = new SecureNoteView()) {
-        view.type = req.type;
-        return view;
-    }
-
-    static toDomain(req: SecureNote, view = new SecureNoteDomain()) {
-        view.type = req.type;
-        return view;
-    }
-
-    type: SecureNoteType;
-
-    constructor(o?: SecureNoteView | SecureNoteDomain) {
-        if (o == null) {
-            return;
-        }
-
-        this.type = o.type;
-    }
+    this.type = o.type;
+  }
 }

common/src/models/request/account/setKeyConnectorKeyRequest.ts

@@ -1,19 +1,25 @@
-import { KeysRequest } from '../keysRequest';
+import { KeysRequest } from "../keysRequest";
 
-import { KdfType } from '../../../enums/kdfType';
+import { KdfType } from "../../../enums/kdfType";
 
 export class SetKeyConnectorKeyRequest {
-    key: string;
-    keys: KeysRequest;
-    kdf: KdfType;
-    kdfIterations: number;
-    orgIdentifier: string;
+  key: string;
+  keys: KeysRequest;
+  kdf: KdfType;
+  kdfIterations: number;
+  orgIdentifier: string;
 
-    constructor(key: string, kdf: KdfType, kdfIterations: number, orgIdentifier: string, keys: KeysRequest) {
-        this.key = key;
-        this.kdf = kdf;
-        this.kdfIterations = kdfIterations;
-        this.orgIdentifier = orgIdentifier;
-        this.keys = keys;
-    }
+  constructor(
+    key: string,
+    kdf: KdfType,
+    kdfIterations: number,
+    orgIdentifier: string,
+    keys: KeysRequest
+  ) {
+    this.key = key;
+    this.kdf = kdf;
+    this.kdfIterations = kdfIterations;
+    this.orgIdentifier = orgIdentifier;
+    this.keys = keys;
+  }
 }

common/src/models/request/account/verifyOTPRequest.ts

@@ -1,7 +1,7 @@
 export class VerifyOTPRequest {
-    OTP: string;
+  OTP: string;
 
-    constructor(OTP: string) {
-        this.OTP = OTP;
-    }
+  constructor(OTP: string) {
+    this.OTP = OTP;
+  }
 }

common/src/models/request/attachmentRequest.ts

@@ -1,6 +1,6 @@
 export class AttachmentRequest {
-    fileName: string;
-    key: string;
-    fileSize: number;
-    adminRequest: boolean;
+  fileName: string;
+  key: string;
+  fileSize: number;
+  adminRequest: boolean;
 }

common/src/models/request/bitPayInvoiceRequest.ts

@@ -1,9 +1,9 @@
 export class BitPayInvoiceRequest {
-    userId: string;
-    organizationId: string;
-    credit: boolean;
-    amount: number;
-    returnUrl: string;
-    name: string;
-    email: string;
+  userId: string;
+  organizationId: string;
+  credit: boolean;
+  amount: number;
+  returnUrl: string;
+  name: string;
+  email: string;
 }

common/src/models/request/captchaProtectedRequest.ts

@@ -1,3 +1,3 @@
 export abstract class CaptchaProtectedRequest {
-    captchaResponse: string = null;
+  captchaResponse: string = null;
 }

common/src/models/request/cipherBulkDeleteRequest.ts

@@ -1,9 +1,9 @@
 export class CipherBulkDeleteRequest {
-    ids: string[];
-    organizationId: string;
+  ids: string[];
+  organizationId: string;
 
-    constructor(ids: string[], organizationId?: string) {
-        this.ids = ids == null ? [] : ids;
-        this.organizationId = organizationId;
-    }
+  constructor(ids: string[], organizationId?: string) {
+    this.ids = ids == null ? [] : ids;
+    this.organizationId = organizationId;
+  }
 }

common/src/models/request/cipherBulkMoveRequest.ts

@@ -1,9 +1,9 @@
 export class CipherBulkMoveRequest {
-    ids: string[];
-    folderId: string;
+  ids: string[];
+  folderId: string;
 
-    constructor(ids: string[], folderId: string) {
-        this.ids = ids == null ? [] : ids;
-        this.folderId = folderId;
-    }
+  constructor(ids: string[], folderId: string) {
+    this.ids = ids == null ? [] : ids;
+    this.folderId = folderId;
+  }
 }

common/src/models/request/cipherBulkRestoreRequest.ts

@@ -1,7 +1,7 @@
 export class CipherBulkRestoreRequest {
-    ids: string[];
+  ids: string[];
 
-    constructor(ids: string[]) {
-        this.ids = ids == null ? [] : ids;
-    }
+  constructor(ids: string[]) {
+    this.ids = ids == null ? [] : ids;
+  }
 }

common/src/models/request/cipherBulkShareRequest.ts

@@ -1,18 +1,18 @@
-import { CipherWithIdRequest } from './cipherWithIdRequest';
+import { CipherWithIdRequest } from "./cipherWithIdRequest";
 
-import { Cipher } from '../domain/cipher';
+import { Cipher } from "../domain/cipher";
 
 export class CipherBulkShareRequest {
-    ciphers: CipherWithIdRequest[];
-    collectionIds: string[];
+  ciphers: CipherWithIdRequest[];
+  collectionIds: string[];
 
-    constructor(ciphers: Cipher[], collectionIds: string[]) {
-        if (ciphers != null) {
-            this.ciphers = [];
-            ciphers.forEach(c => {
-                this.ciphers.push(new CipherWithIdRequest(c));
-            });
-        }
-        this.collectionIds = collectionIds;
+  constructor(ciphers: Cipher[], collectionIds: string[]) {
+    if (ciphers != null) {
+      this.ciphers = [];
+      ciphers.forEach((c) => {
+        this.ciphers.push(new CipherWithIdRequest(c));
+      });
     }
+    this.collectionIds = collectionIds;
+  }
 }

common/src/models/request/cipherCollectionsRequest.ts

@@ -1,7 +1,7 @@
 export class CipherCollectionsRequest {
-    collectionIds: string[];
+  collectionIds: string[];
 
-    constructor(collectionIds: string[]) {
-        this.collectionIds = collectionIds == null ? [] : collectionIds;
-    }
+  constructor(collectionIds: string[]) {
+    this.collectionIds = collectionIds == null ? [] : collectionIds;
+  }
 }

common/src/models/request/cipherCreateRequest.ts

@@ -1,13 +1,13 @@
-import { CipherRequest } from './cipherRequest';
+import { CipherRequest } from "./cipherRequest";
 
-import { Cipher } from '../domain/cipher';
+import { Cipher } from "../domain/cipher";
 
 export class CipherCreateRequest {
-    cipher: CipherRequest;
-    collectionIds: string[];
+  cipher: CipherRequest;
+  collectionIds: string[];
 
-    constructor(cipher: Cipher) {
-        this.cipher = new CipherRequest(cipher);
-        this.collectionIds = cipher.collectionIds;
-    }
+  constructor(cipher: Cipher) {
+    this.cipher = new CipherRequest(cipher);
+    this.collectionIds = cipher.collectionIds;
+  }
 }

common/src/models/request/cipherRequest.ts

@@ -1,152 +1,166 @@
-import { CipherRepromptType } from '../../enums/cipherRepromptType';
-import { CipherType } from '../../enums/cipherType';
+import { CipherRepromptType } from "../../enums/cipherRepromptType";
+import { CipherType } from "../../enums/cipherType";
 
-import { Cipher } from '../domain/cipher';
+import { Cipher } from "../domain/cipher";
 
-import { CardApi } from '../api/cardApi';
-import { FieldApi } from '../api/fieldApi';
-import { IdentityApi } from '../api/identityApi';
-import { LoginApi } from '../api/loginApi';
-import { LoginUriApi } from '../api/loginUriApi';
-import { SecureNoteApi } from '../api/secureNoteApi';
+import { CardApi } from "../api/cardApi";
+import { FieldApi } from "../api/fieldApi";
+import { IdentityApi } from "../api/identityApi";
+import { LoginApi } from "../api/loginApi";
+import { LoginUriApi } from "../api/loginUriApi";
+import { SecureNoteApi } from "../api/secureNoteApi";
 
-import { AttachmentRequest } from './attachmentRequest';
-import { PasswordHistoryRequest } from './passwordHistoryRequest';
+import { AttachmentRequest } from "./attachmentRequest";
+import { PasswordHistoryRequest } from "./passwordHistoryRequest";
 
 export class CipherRequest {
-    type: CipherType;
-    folderId: string;
-    organizationId: string;
-    name: string;
-    notes: string;
-    favorite: boolean;
-    login: LoginApi;
-    secureNote: SecureNoteApi;
-    card: CardApi;
-    identity: IdentityApi;
-    fields: FieldApi[];
-    passwordHistory: PasswordHistoryRequest[];
-    // Deprecated, remove at some point and rename attachments2 to attachments
-    attachments: { [id: string]: string; };
-    attachments2: { [id: string]: AttachmentRequest; };
-    lastKnownRevisionDate: Date;
-    reprompt: CipherRepromptType;
+  type: CipherType;
+  folderId: string;
+  organizationId: string;
+  name: string;
+  notes: string;
+  favorite: boolean;
+  login: LoginApi;
+  secureNote: SecureNoteApi;
+  card: CardApi;
+  identity: IdentityApi;
+  fields: FieldApi[];
+  passwordHistory: PasswordHistoryRequest[];
+  // Deprecated, remove at some point and rename attachments2 to attachments
+  attachments: { [id: string]: string };
+  attachments2: { [id: string]: AttachmentRequest };
+  lastKnownRevisionDate: Date;
+  reprompt: CipherRepromptType;
 
-    constructor(cipher: Cipher) {
-        this.type = cipher.type;
-        this.folderId = cipher.folderId;
-        this.organizationId = cipher.organizationId;
-        this.name = cipher.name ? cipher.name.encryptedString : null;
-        this.notes = cipher.notes ? cipher.notes.encryptedString : null;
-        this.favorite = cipher.favorite;
-        this.lastKnownRevisionDate = cipher.revisionDate;
-        this.reprompt = cipher.reprompt;
+  constructor(cipher: Cipher) {
+    this.type = cipher.type;
+    this.folderId = cipher.folderId;
+    this.organizationId = cipher.organizationId;
+    this.name = cipher.name ? cipher.name.encryptedString : null;
+    this.notes = cipher.notes ? cipher.notes.encryptedString : null;
+    this.favorite = cipher.favorite;
+    this.lastKnownRevisionDate = cipher.revisionDate;
+    this.reprompt = cipher.reprompt;
 
-        switch (this.type) {
-            case CipherType.Login:
-                this.login = new LoginApi();
-                this.login.uris = null;
-                this.login.username = cipher.login.username ? cipher.login.username.encryptedString : null;
-                this.login.password = cipher.login.password ? cipher.login.password.encryptedString : null;
-                this.login.passwordRevisionDate = cipher.login.passwordRevisionDate != null ?
-                    cipher.login.passwordRevisionDate.toISOString() : null;
-                this.login.totp = cipher.login.totp ? cipher.login.totp.encryptedString : null;
-                this.login.autofillOnPageLoad = cipher.login.autofillOnPageLoad;
+    switch (this.type) {
+      case CipherType.Login:
+        this.login = new LoginApi();
+        this.login.uris = null;
+        this.login.username = cipher.login.username ? cipher.login.username.encryptedString : null;
+        this.login.password = cipher.login.password ? cipher.login.password.encryptedString : null;
+        this.login.passwordRevisionDate =
+          cipher.login.passwordRevisionDate != null
+            ? cipher.login.passwordRevisionDate.toISOString()
+            : null;
+        this.login.totp = cipher.login.totp ? cipher.login.totp.encryptedString : null;
+        this.login.autofillOnPageLoad = cipher.login.autofillOnPageLoad;
 
-                if (cipher.login.uris != null) {
-                    this.login.uris = cipher.login.uris.map(u => {
-                        const uri = new LoginUriApi();
-                        uri.uri = u.uri != null ? u.uri.encryptedString : null;
-                        uri.match = u.match != null ? u.match : null;
-                        return uri;
-                    });
-                }
-                break;
-            case CipherType.SecureNote:
-                this.secureNote = new SecureNoteApi();
-                this.secureNote.type = cipher.secureNote.type;
-                break;
-            case CipherType.Card:
-                this.card = new CardApi();
-                this.card.cardholderName = cipher.card.cardholderName != null ?
-                    cipher.card.cardholderName.encryptedString : null;
-                this.card.brand = cipher.card.brand != null ? cipher.card.brand.encryptedString : null;
-                this.card.number = cipher.card.number != null ? cipher.card.number.encryptedString : null;
-                this.card.expMonth = cipher.card.expMonth != null ? cipher.card.expMonth.encryptedString : null;
-                this.card.expYear = cipher.card.expYear != null ? cipher.card.expYear.encryptedString : null;
-                this.card.code = cipher.card.code != null ? cipher.card.code.encryptedString : null;
-                break;
-            case CipherType.Identity:
-                this.identity = new IdentityApi();
-                this.identity.title = cipher.identity.title != null ? cipher.identity.title.encryptedString : null;
-                this.identity.firstName = cipher.identity.firstName != null ?
-                    cipher.identity.firstName.encryptedString : null;
-                this.identity.middleName = cipher.identity.middleName != null ?
-                    cipher.identity.middleName.encryptedString : null;
-                this.identity.lastName = cipher.identity.lastName != null ?
-                    cipher.identity.lastName.encryptedString : null;
-                this.identity.address1 = cipher.identity.address1 != null ?
-                    cipher.identity.address1.encryptedString : null;
-                this.identity.address2 = cipher.identity.address2 != null ?
-                    cipher.identity.address2.encryptedString : null;
-                this.identity.address3 = cipher.identity.address3 != null ?
-                    cipher.identity.address3.encryptedString : null;
-                this.identity.city = cipher.identity.city != null ? cipher.identity.city.encryptedString : null;
-                this.identity.state = cipher.identity.state != null ? cipher.identity.state.encryptedString : null;
-                this.identity.postalCode = cipher.identity.postalCode != null ?
-                    cipher.identity.postalCode.encryptedString : null;
-                this.identity.country = cipher.identity.country != null ?
-                    cipher.identity.country.encryptedString : null;
-                this.identity.company = cipher.identity.company != null ?
-                    cipher.identity.company.encryptedString : null;
-                this.identity.email = cipher.identity.email != null ? cipher.identity.email.encryptedString : null;
-                this.identity.phone = cipher.identity.phone != null ? cipher.identity.phone.encryptedString : null;
-                this.identity.ssn = cipher.identity.ssn != null ? cipher.identity.ssn.encryptedString : null;
-                this.identity.username = cipher.identity.username != null ?
-                    cipher.identity.username.encryptedString : null;
-                this.identity.passportNumber = cipher.identity.passportNumber != null ?
-                    cipher.identity.passportNumber.encryptedString : null;
-                this.identity.licenseNumber = cipher.identity.licenseNumber != null ?
-                    cipher.identity.licenseNumber.encryptedString : null;
-                break;
-            default:
-                break;
-        }
-
-        if (cipher.fields != null) {
-            this.fields = cipher.fields.map(f => {
-                const field = new FieldApi();
-                field.type = f.type;
-                field.name = f.name ? f.name.encryptedString : null;
-                field.value = f.value ? f.value.encryptedString : null;
-                field.linkedId = f.linkedId;
-                return field;
-            });
-        }
-
-        if (cipher.passwordHistory != null) {
-            this.passwordHistory = [];
-            cipher.passwordHistory.forEach(ph => {
-                this.passwordHistory.push({
-                    lastUsedDate: ph.lastUsedDate,
-                    password: ph.password ? ph.password.encryptedString : null,
-                });
-            });
-        }
-
-        if (cipher.attachments != null) {
-            this.attachments = {};
-            this.attachments2 = {};
-            cipher.attachments.forEach(attachment => {
-                const fileName = attachment.fileName ? attachment.fileName.encryptedString : null;
-                this.attachments[attachment.id] = fileName;
-                const attachmentRequest = new AttachmentRequest();
-                attachmentRequest.fileName = fileName;
-                if (attachment.key != null) {
-                    attachmentRequest.key = attachment.key.encryptedString;
-                }
-                this.attachments2[attachment.id] = attachmentRequest;
-            });
+        if (cipher.login.uris != null) {
+          this.login.uris = cipher.login.uris.map((u) => {
+            const uri = new LoginUriApi();
+            uri.uri = u.uri != null ? u.uri.encryptedString : null;
+            uri.match = u.match != null ? u.match : null;
+            return uri;
+          });
         }
+        break;
+      case CipherType.SecureNote:
+        this.secureNote = new SecureNoteApi();
+        this.secureNote.type = cipher.secureNote.type;
+        break;
+      case CipherType.Card:
+        this.card = new CardApi();
+        this.card.cardholderName =
+          cipher.card.cardholderName != null ? cipher.card.cardholderName.encryptedString : null;
+        this.card.brand = cipher.card.brand != null ? cipher.card.brand.encryptedString : null;
+        this.card.number = cipher.card.number != null ? cipher.card.number.encryptedString : null;
+        this.card.expMonth =
+          cipher.card.expMonth != null ? cipher.card.expMonth.encryptedString : null;
+        this.card.expYear =
+          cipher.card.expYear != null ? cipher.card.expYear.encryptedString : null;
+        this.card.code = cipher.card.code != null ? cipher.card.code.encryptedString : null;
+        break;
+      case CipherType.Identity:
+        this.identity = new IdentityApi();
+        this.identity.title =
+          cipher.identity.title != null ? cipher.identity.title.encryptedString : null;
+        this.identity.firstName =
+          cipher.identity.firstName != null ? cipher.identity.firstName.encryptedString : null;
+        this.identity.middleName =
+          cipher.identity.middleName != null ? cipher.identity.middleName.encryptedString : null;
+        this.identity.lastName =
+          cipher.identity.lastName != null ? cipher.identity.lastName.encryptedString : null;
+        this.identity.address1 =
+          cipher.identity.address1 != null ? cipher.identity.address1.encryptedString : null;
+        this.identity.address2 =
+          cipher.identity.address2 != null ? cipher.identity.address2.encryptedString : null;
+        this.identity.address3 =
+          cipher.identity.address3 != null ? cipher.identity.address3.encryptedString : null;
+        this.identity.city =
+          cipher.identity.city != null ? cipher.identity.city.encryptedString : null;
+        this.identity.state =
+          cipher.identity.state != null ? cipher.identity.state.encryptedString : null;
+        this.identity.postalCode =
+          cipher.identity.postalCode != null ? cipher.identity.postalCode.encryptedString : null;
+        this.identity.country =
+          cipher.identity.country != null ? cipher.identity.country.encryptedString : null;
+        this.identity.company =
+          cipher.identity.company != null ? cipher.identity.company.encryptedString : null;
+        this.identity.email =
+          cipher.identity.email != null ? cipher.identity.email.encryptedString : null;
+        this.identity.phone =
+          cipher.identity.phone != null ? cipher.identity.phone.encryptedString : null;
+        this.identity.ssn =
+          cipher.identity.ssn != null ? cipher.identity.ssn.encryptedString : null;
+        this.identity.username =
+          cipher.identity.username != null ? cipher.identity.username.encryptedString : null;
+        this.identity.passportNumber =
+          cipher.identity.passportNumber != null
+            ? cipher.identity.passportNumber.encryptedString
+            : null;
+        this.identity.licenseNumber =
+          cipher.identity.licenseNumber != null
+            ? cipher.identity.licenseNumber.encryptedString
+            : null;
+        break;
+      default:
+        break;
     }
+
+    if (cipher.fields != null) {
+      this.fields = cipher.fields.map((f) => {
+        const field = new FieldApi();
+        field.type = f.type;
+        field.name = f.name ? f.name.encryptedString : null;
+        field.value = f.value ? f.value.encryptedString : null;
+        field.linkedId = f.linkedId;
+        return field;
+      });
+    }
+
+    if (cipher.passwordHistory != null) {
+      this.passwordHistory = [];
+      cipher.passwordHistory.forEach((ph) => {
+        this.passwordHistory.push({
+          lastUsedDate: ph.lastUsedDate,
+          password: ph.password ? ph.password.encryptedString : null,
+        });
+      });
+    }
+
+    if (cipher.attachments != null) {
+      this.attachments = {};
+      this.attachments2 = {};
+      cipher.attachments.forEach((attachment) => {
+        const fileName = attachment.fileName ? attachment.fileName.encryptedString : null;
+        this.attachments[attachment.id] = fileName;
+        const attachmentRequest = new AttachmentRequest();
+        attachmentRequest.fileName = fileName;
+        if (attachment.key != null) {
+          attachmentRequest.key = attachment.key.encryptedString;
+        }
+        this.attachments2[attachment.id] = attachmentRequest;
+      });
+    }
+  }
 }

common/src/models/request/cipherShareRequest.ts

@@ -1,13 +1,13 @@
-import { CipherRequest } from './cipherRequest';
+import { CipherRequest } from "./cipherRequest";
 
-import { Cipher } from '../domain/cipher';
+import { Cipher } from "../domain/cipher";
 
 export class CipherShareRequest {
-    cipher: CipherRequest;
-    collectionIds: string[];
+  cipher: CipherRequest;
+  collectionIds: string[];
 
-    constructor(cipher: Cipher) {
-        this.cipher = new CipherRequest(cipher);
-        this.collectionIds = cipher.collectionIds;
-    }
+  constructor(cipher: Cipher) {
+    this.cipher = new CipherRequest(cipher);
+    this.collectionIds = cipher.collectionIds;
+  }
 }

common/src/models/request/cipherWithIdRequest.ts

@@ -1,12 +1,12 @@
-import { CipherRequest } from './cipherRequest';
+import { CipherRequest } from "./cipherRequest";
 
-import { Cipher } from '../domain/cipher';
+import { Cipher } from "../domain/cipher";
 
 export class CipherWithIdRequest extends CipherRequest {
-    id: string;
+  id: string;
 
-    constructor(cipher: Cipher) {
-        super(cipher);
-        this.id = cipher.id;
-    }
+  constructor(cipher: Cipher) {
+    super(cipher);
+    this.id = cipher.id;
+  }
 }

common/src/models/request/collectionRequest.ts

@@ -1,17 +1,17 @@
-import { Collection } from '../domain/collection';
+import { Collection } from "../domain/collection";
 
-import { SelectionReadOnlyRequest } from './selectionReadOnlyRequest';
+import { SelectionReadOnlyRequest } from "./selectionReadOnlyRequest";
 
 export class CollectionRequest {
-    name: string;
-    externalId: string;
-    groups: SelectionReadOnlyRequest[] = [];
+  name: string;
+  externalId: string;
+  groups: SelectionReadOnlyRequest[] = [];
 
-    constructor(collection?: Collection) {
-        if (collection == null) {
-            return;
-        }
-        this.name = collection.name ? collection.name.encryptedString : null;
-        this.externalId = collection.externalId;
+  constructor(collection?: Collection) {
+    if (collection == null) {
+      return;
     }
+    this.name = collection.name ? collection.name.encryptedString : null;
+    this.externalId = collection.externalId;
+  }
 }

common/src/models/request/deleteRecoverRequest.ts

@@ -1,3 +1,3 @@
 export class DeleteRecoverRequest {
-    email: string;
+  email: string;
 }

common/src/models/request/deviceRequest.ts

@@ -1,17 +1,17 @@
-import { DeviceType } from '../../enums/deviceType';
+import { DeviceType } from "../../enums/deviceType";
 
-import { PlatformUtilsService } from '../../abstractions/platformUtils.service';
+import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
 
 export class DeviceRequest {
-    type: DeviceType;
-    name: string;
-    identifier: string;
-    pushToken?: string;
+  type: DeviceType;
+  name: string;
+  identifier: string;
+  pushToken?: string;
 
-    constructor(appId: string, platformUtilsService: PlatformUtilsService) {
-        this.type = platformUtilsService.getDevice();
-        this.name = platformUtilsService.getDeviceString();
-        this.identifier = appId;
-        this.pushToken = null;
-    }
+  constructor(appId: string, platformUtilsService: PlatformUtilsService) {
+    this.type = platformUtilsService.getDevice();
+    this.name = platformUtilsService.getDeviceString();
+    this.identifier = appId;
+    this.pushToken = null;
+  }
 }

common/src/models/request/deviceTokenRequest.ts

@@ -1,7 +1,7 @@
 export class DeviceTokenRequest {
-    pushToken: string;
+  pushToken: string;
 
-    constructor() {
-        this.pushToken = null;
-    }
+  constructor() {
+    this.pushToken = null;
+  }
 }

common/src/models/request/emailRequest.ts

@@ -1,7 +1,7 @@
-import { EmailTokenRequest } from './emailTokenRequest';
+import { EmailTokenRequest } from "./emailTokenRequest";
 
 export class EmailRequest extends EmailTokenRequest {
-    newMasterPasswordHash: string;
-    token: string;
-    key: string;
+  newMasterPasswordHash: string;
+  token: string;
+  key: string;
 }

common/src/models/request/emailTokenRequest.ts

@@ -1,6 +1,6 @@
-import { SecretVerificationRequest } from './secretVerificationRequest';
+import { SecretVerificationRequest } from "./secretVerificationRequest";
 
 export class EmailTokenRequest extends SecretVerificationRequest {
-    newEmail: string;
-    masterPasswordHash: string;
+  newEmail: string;
+  masterPasswordHash: string;
 }

common/src/models/request/emergencyAccessAcceptRequest.ts

@@ -1,3 +1,3 @@
 export class EmergencyAccessAcceptRequest {
-    token: string;
+  token: string;
 }

common/src/models/request/emergencyAccessConfirmRequest.ts

@@ -1,3 +1,3 @@
 export class EmergencyAccessConfirmRequest {
-    key: string;
+  key: string;
 }