[SM-288] Rename models to follow naming convention (#3795)

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

@@ -2,7 +2,7 @@ import { makeStaticByteArray } from "../../../spec/utils";
 import { Utils } from "../../misc/utils";
 
 import { AccountKeys, EncryptionPair } from "./account";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 describe("AccountKeys", () => {
   describe("toJSON", () => {

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

@@ -1,5 +1,5 @@
 import { AccountSettings, EncryptionPair } from "./account";
-import { EncString } from "./encString";
+import { EncString } from "./enc-string";
 
 describe("AccountSettings", () => {
   describe("fromJSON", () => {

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

@@ -5,25 +5,25 @@ import { KdfType } from "../../enums/kdfType";
 import { UriMatchType } from "../../enums/uriMatchType";
 import { Utils } from "../../misc/utils";
 import { DeepJsonify } from "../../types/deep-jsonify";
-import { CipherData } from "../data/cipherData";
-import { CollectionData } from "../data/collectionData";
-import { EncryptedOrganizationKeyData } from "../data/encryptedOrganizationKeyData";
-import { EventData } from "../data/eventData";
-import { FolderData } from "../data/folderData";
-import { OrganizationData } from "../data/organizationData";
-import { PolicyData } from "../data/policyData";
-import { ProviderData } from "../data/providerData";
-import { SendData } from "../data/sendData";
+import { CipherData } from "../data/cipher.data";
+import { CollectionData } from "../data/collection.data";
+import { EncryptedOrganizationKeyData } from "../data/encrypted-organization-key.data";
+import { EventData } from "../data/event.data";
+import { FolderData } from "../data/folder.data";
+import { OrganizationData } from "../data/organization.data";
+import { PolicyData } from "../data/policy.data";
+import { ProviderData } from "../data/provider.data";
+import { SendData } from "../data/send.data";
 import { ServerConfigData } from "../data/server-config.data";
-import { CipherView } from "../view/cipherView";
-import { CollectionView } from "../view/collectionView";
-import { SendView } from "../view/sendView";
+import { CipherView } from "../view/cipher.view";
+import { CollectionView } from "../view/collection.view";
+import { SendView } from "../view/send.view";
 
-import { EncString } from "./encString";
-import { EnvironmentUrls } from "./environmentUrls";
-import { GeneratedPasswordHistory } from "./generatedPasswordHistory";
+import { EncString } from "./enc-string";
+import { EnvironmentUrls } from "./environment-urls";
+import { GeneratedPasswordHistory } from "./generated-password-history";
 import { Policy } from "./policy";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class EncryptionPair<TEncrypted, TDecrypted> {
   encrypted?: TEncrypted;

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

@@ -1,12 +1,12 @@
 import { Jsonify } from "type-fest";
 
 import { Utils } from "../../misc/utils";
-import { AttachmentData } from "../data/attachmentData";
-import { AttachmentView } from "../view/attachmentView";
+import { AttachmentData } from "../data/attachment.data";
+import { AttachmentView } from "../view/attachment.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class Attachment extends Domain {
   id: string;

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

@@ -1,11 +1,11 @@
 import { Jsonify } from "type-fest";
 
-import { CardData } from "../data/cardData";
-import { CardView } from "../view/cardView";
+import { CardData } from "../data/card.data";
+import { CardView } from "../view/card.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class Card extends Domain {
   cardholderName: EncString;

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

@@ -2,20 +2,20 @@ import { Jsonify } from "type-fest";
 
 import { CipherRepromptType } from "../../enums/cipherRepromptType";
 import { CipherType } from "../../enums/cipherType";
-import { CipherData } from "../data/cipherData";
-import { LocalData } from "../data/localData";
-import { CipherView } from "../view/cipherView";
+import { CipherData } from "../data/cipher.data";
+import { LocalData } from "../data/local.data";
+import { CipherView } from "../view/cipher.view";
 
 import { Attachment } from "./attachment";
 import { Card } from "./card";
-import Domain from "./domainBase";
-import { EncString } from "./encString";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
 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 { SecureNote } from "./secure-note";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class Cipher extends Domain {
   id: string;

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

@@ -1,8 +1,8 @@
-import { CollectionData } from "../data/collectionData";
-import { CollectionView } from "../view/collectionView";
+import { CollectionData } from "../data/collection.data";
+import { CollectionView } from "../view/collection.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
 
 export class Collection extends Domain {
   id: string;

libs/common/src/models/domain/domain-base.ts

@@ -1,7 +1,7 @@
 import { View } from "../view/view";
 
-import { EncString } from "./encString";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import { EncString } from "./enc-string";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export default class Domain {
   protected buildDomainModel<D extends Domain>(

libs/common/src/models/domain/enc-string.ts

@@ -4,7 +4,7 @@ import { EncryptionType } from "../../enums/encryptionType";
 import { IEncrypted } from "../../interfaces/IEncrypted";
 import { Utils } from "../../misc/utils";
 
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class EncString implements IEncrypted {
   encryptedString?: string;

libs/common/src/models/domain/encrypted-object.ts

@@ -1,4 +1,4 @@
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class EncryptedObject {
   iv: ArrayBuffer;

libs/common/src/models/domain/encrypted-organization-key.ts

@@ -1,8 +1,8 @@
 import { CryptoService } from "../../abstractions/crypto.service";
-import { EncryptedOrganizationKeyData } from "../../models/data/encryptedOrganizationKeyData";
+import { EncryptedOrganizationKeyData } from "../data/encrypted-organization-key.data";
 
-import { EncString } from "./encString";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import { EncString } from "./enc-string";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export abstract class BaseEncryptedOrganizationKey {
   decrypt: (cryptoService: CryptoService) => Promise<SymmetricCryptoKey>;

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

@@ -2,12 +2,12 @@ import { Jsonify } from "type-fest";
 
 import { FieldType } from "../../enums/fieldType";
 import { LinkedIdType } from "../../enums/linkedIdType";
-import { FieldData } from "../data/fieldData";
-import { FieldView } from "../view/fieldView";
+import { FieldData } from "../data/field.data";
+import { FieldView } from "../view/field.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class Field extends Domain {
   name: EncString;

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

@@ -1,10 +1,10 @@
 import { Jsonify } from "type-fest";
 
-import { FolderData } from "../data/folderData";
-import { FolderView } from "../view/folderView";
+import { FolderData } from "../data/folder.data";
+import { FolderView } from "../view/folder.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
 
 export class Folder extends Domain {
   id: string;

libs/common/src/models/domain/global-state.ts

@@ -1,8 +1,8 @@
 import { StateVersion } from "../../enums/stateVersion";
 import { ThemeType } from "../../enums/themeType";
 
-import { EnvironmentUrls } from "./environmentUrls";
-import { WindowState } from "./windowState";
+import { EnvironmentUrls } from "./environment-urls";
+import { WindowState } from "./window-state";
 
 export class GlobalState {
   enableAlwaysOnTop?: boolean;

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

@@ -1,11 +1,11 @@
 import { Jsonify } from "type-fest";
 
-import { IdentityData } from "../data/identityData";
-import { IdentityView } from "../view/identityView";
+import { IdentityData } from "../data/identity.data";
+import { IdentityView } from "../view/identity.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class Identity extends Domain {
   title: EncString;

libs/common/src/models/domain/import-result.ts

@@ -1,6 +1,6 @@
-import { CipherView } from "../view/cipherView";
-import { CollectionView } from "../view/collectionView";
-import { FolderView } from "../view/folderView";
+import { CipherView } from "../view/cipher.view";
+import { CollectionView } from "../view/collection.view";
+import { FolderView } from "../view/folder.view";
 
 export class ImportResult {
   success = false;

libs/common/src/models/domain/log-in-credentials.ts

@@ -1,7 +1,8 @@
 import { AuthenticationType } from "../../enums/authenticationType";
-import { SymmetricCryptoKey } from "../../models/domain/symmetricCryptoKey";
 import { TokenRequestTwoFactor } from "../request/identityToken/tokenRequestTwoFactor";
 
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
+
 export class PasswordLogInCredentials {
   readonly type = AuthenticationType.Password;
 

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

@@ -1,12 +1,12 @@
 import { Jsonify } from "type-fest";
 
 import { UriMatchType } from "../../enums/uriMatchType";
-import { LoginUriData } from "../data/loginUriData";
-import { LoginUriView } from "../view/loginUriView";
+import { LoginUriData } from "../data/login-uri.data";
+import { LoginUriView } from "../view/login-uri.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class LoginUri extends Domain {
   uri: EncString;

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

@@ -1,12 +1,12 @@
 import { Jsonify } from "type-fest";
 
-import { LoginData } from "../data/loginData";
-import { LoginView } from "../view/loginView";
+import { LoginData } from "../data/login.data";
+import { LoginView } from "../view/login.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
-import { LoginUri } from "./loginUri";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
+import { LoginUri } from "./login-uri";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class Login extends Domain {
   uris: LoginUri[];

libs/common/src/models/domain/master-password-policy-options.ts

@@ -1,4 +1,4 @@
-import Domain from "./domainBase";
+import Domain from "./domain-base";
 
 export class MasterPasswordPolicyOptions extends Domain {
   minComplexity = 0;

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

@@ -1,8 +1,8 @@
 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 { PermissionsApi } from "../api/permissions.api";
+import { OrganizationData } from "../data/organization.data";
 
 export class Organization {
   id: string;

libs/common/src/models/domain/password-generator-policy-options.ts

@@ -1,4 +1,4 @@
-import Domain from "./domainBase";
+import Domain from "./domain-base";
 
 export class PasswordGeneratorPolicyOptions extends Domain {
   defaultType = "";

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

@@ -1,11 +1,11 @@
 import { Jsonify } from "type-fest";
 
-import { PasswordHistoryData } from "../data/passwordHistoryData";
-import { PasswordHistoryView } from "../view/passwordHistoryView";
+import { PasswordHistoryData } from "../data/password-history.data";
+import { PasswordHistoryView } from "../view/password-history.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class Password extends Domain {
   password: EncString;

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

@@ -1,7 +1,7 @@
 import { PolicyType } from "../../enums/policyType";
-import { PolicyData } from "../data/policyData";
+import { PolicyData } from "../data/policy.data";
 
-import Domain from "./domainBase";
+import Domain from "./domain-base";
 
 export class Policy extends Domain {
   id: string;

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

@@ -1,6 +1,6 @@
 import { ProviderUserStatusType } from "../../enums/providerUserStatusType";
 import { ProviderUserType } from "../../enums/providerUserType";
-import { ProviderData } from "../data/providerData";
+import { ProviderData } from "../data/provider.data";
 
 export class Provider {
   id: string;

libs/common/src/models/domain/reset-password-policy-options.ts

@@ -1,4 +1,4 @@
-import Domain from "./domainBase";
+import Domain from "./domain-base";
 
 export class ResetPasswordPolicyOptions extends Domain {
   autoEnrollEnabled = false;

libs/common/src/models/domain/secure-note.ts

@@ -1,11 +1,11 @@
 import { Jsonify } from "type-fest";
 
 import { SecureNoteType } from "../../enums/secureNoteType";
-import { SecureNoteData } from "../data/secureNoteData";
-import { SecureNoteView } from "../view/secureNoteView";
+import { SecureNoteData } from "../data/secure-note.data";
+import { SecureNoteView } from "../view/secure-note.view";
 
-import Domain from "./domainBase";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import Domain from "./domain-base";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class SecureNote extends Domain {
   type: SecureNoteType;

libs/common/src/models/domain/send-access.ts

@@ -1,12 +1,12 @@
 import { SendType } from "../../enums/sendType";
 import { SendAccessResponse } from "../response/sendAccessResponse";
-import { SendAccessView } from "../view/sendAccessView";
+import { SendAccessView } from "../view/send-access.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
-import { SendFile } from "./sendFile";
-import { SendText } from "./sendText";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
+import { SendFile } from "./send-file";
+import { SendText } from "./send-text";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class SendAccess extends Domain {
   id: string;

libs/common/src/models/domain/send-file.ts

@@ -1,9 +1,9 @@
-import { SendFileData } from "../data/sendFileData";
-import { SendFileView } from "../view/sendFileView";
+import { SendFileData } from "../data/send-file.data";
+import { SendFileView } from "../view/send-file.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class SendFile extends Domain {
   id: string;

libs/common/src/models/domain/send-text.ts

@@ -1,9 +1,9 @@
-import { SendTextData } from "../data/sendTextData";
-import { SendTextView } from "../view/sendTextView";
+import { SendTextData } from "../data/send-text.data";
+import { SendTextView } from "../view/send-text.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
-import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
+import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
 export class SendText extends Domain {
   text: EncString;

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

@@ -1,12 +1,12 @@
 import { SendType } from "../../enums/sendType";
 import { Utils } from "../../misc/utils";
-import { SendData } from "../data/sendData";
-import { SendView } from "../view/sendView";
+import { SendData } from "../data/send.data";
+import { SendView } from "../view/send.view";
 
-import Domain from "./domainBase";
-import { EncString } from "./encString";
-import { SendFile } from "./sendFile";
-import { SendText } from "./sendText";
+import Domain from "./domain-base";
+import { EncString } from "./enc-string";
+import { SendFile } from "./send-file";
+import { SendText } from "./send-text";
 
 export class Send extends Domain {
   id: string;

libs/common/src/models/domain/sorted-ciphers-cache.ts

@@ -1,4 +1,4 @@
-import { CipherView } from "../view/cipherView";
+import { CipherView } from "../view/cipher.view";
 
 const CacheTTL = 3000;
 

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

@@ -1,7 +1,7 @@
 import { Jsonify } from "type-fest";
 
 import { Account } from "./account";
-import { GlobalState } from "./globalState";
+import { GlobalState } from "./global-state";
 
 export class State<
   TGlobalState extends GlobalState = GlobalState,