[AC-1266] Enums filename conventions (#5140)

* refactor: update clientType enum

* refactor: update deviceType filename

* refactor: update encryptedExportType filename

* refactor: update encryptionType filename

* refactor: update eventType filename

* refactor: update fieldType filename

* refactor: update fileUploadType filename

* refactor: update hashPurpose filename

* refactor: update htmlStorageLocation filename

* refactor: update kdfType filename

* refactor: update keySuffixOptions filename

* refactor: update linkedIdType filename

* refactor: update logLevelType filename

* refactor: update nativeMessagingVersion filename

* refactor: update notificationType filename

* refactor: update productType filename

* refactor: update secureNoteType filename

* refactor: update stateVersion filename

* refactor: update storageLocation filename

* refactor: update themeType filename

* refactor: update uriMatchType filename

* fix: update kdfType classes missed in initial pass, refs AC-1266

* fix: missing import update for device-type

* refactor: add barrel file for enums and update pathed import statements, refs AC-1266

* fix: incorrect import statements for web, refs AC-1266

* fix: missed import statement updates (browser), refs AC-1266

* fix: missed import statement changes (cli), refs AC-1266

* fix: missed import statement changes (desktop), refs AC-1266

* fix: prettier, refs AC-1266

* refactor: (libs) update relative paths to use barrel file, refs AC-1266

* fix: missed find/replace import statements for SecureNoteType, refs AC-1266

* refactor: apply .enum suffix to enums folder and modify leftover relative paths, refs AC-1266

* fix: find/replace errors for native-messaging-version, refs AC-1266

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

@@ -2,9 +2,7 @@ import { ProfileOrganizationResponse } from "../admin-console/models/response/pr
 import { ProfileProviderOrganizationResponse } from "../admin-console/models/response/profile-provider-organization.response";
 import { ProfileProviderResponse } from "../admin-console/models/response/profile-provider.response";
 import { KdfConfig } from "../auth/models/domain/kdf-config";
-import { HashPurpose } from "../enums/hashPurpose";
-import { KdfType } from "../enums/kdfType";
-import { KeySuffixOptions } from "../enums/keySuffixOptions";
+import { HashPurpose, KdfType, KeySuffixOptions } from "../enums";
 import { EncArrayBuffer } from "../models/domain/enc-array-buffer";
 import { EncString } from "../models/domain/enc-string";
 import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";

libs/common/src/abstractions/event/event-collection.service.ts

@@ -1,4 +1,4 @@
-import { EventType } from "../../enums/eventType";
+import { EventType } from "../../enums";
 
 export abstract class EventCollectionService {
   collect: (

libs/common/src/abstractions/file-upload/file-upload.service.ts

@@ -1,4 +1,4 @@
-import { FileUploadType } from "../../enums/fileUploadType";
+import { FileUploadType } from "../../enums";
 import { EncArrayBuffer } from "../../models/domain/enc-array-buffer";
 import { EncString } from "../../models/domain/enc-string";
 

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

@@ -1,4 +1,4 @@
-import { LogLevelType } from "../enums/logLevelType";
+import { LogLevelType } from "../enums";
 
 export abstract class LogService {
   debug: (message: string) => void;

libs/common/src/abstractions/organization-user/responses/organization-user.response.ts

@@ -2,7 +2,7 @@ import { OrganizationUserStatusType } from "../../../admin-console/enums/organiz
 import { OrganizationUserType } from "../../../admin-console/enums/organization-user-type";
 import { PermissionsApi } from "../../../admin-console/models/api/permissions.api";
 import { SelectionReadOnlyResponse } from "../../../admin-console/models/response/selection-read-only.response";
-import { KdfType } from "../../../enums/kdfType";
+import { KdfType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
 
 export class OrganizationUserResponse extends BaseResponse {

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

@@ -1,5 +1,4 @@
-import { ClientType } from "../enums/clientType";
-import { DeviceType } from "../enums/deviceType";
+import { ClientType, DeviceType } from "../enums";
 
 interface ToastOptions {
   timeout?: number;

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

@@ -9,9 +9,7 @@ import { Policy } from "../admin-console/models/domain/policy";
 import { CollectionView } from "../admin-console/models/view/collection.view";
 import { EnvironmentUrls } from "../auth/models/domain/environment-urls";
 import { KdfConfig } from "../auth/models/domain/kdf-config";
-import { KdfType } from "../enums/kdfType";
-import { ThemeType } from "../enums/themeType";
-import { UriMatchType } from "../enums/uriMatchType";
+import { KdfType, ThemeType, UriMatchType } from "../enums";
 import { EventData } from "../models/data/event.data";
 import { ServerConfigData } from "../models/data/server-config.data";
 import { Account, AccountSettingsSettings } from "../models/domain/account";

libs/common/src/admin-console/models/data/organization.data.ts

@@ -1,4 +1,4 @@
-import { ProductType } from "../../../enums/productType";
+import { ProductType } from "../../../enums";
 import { OrganizationUserStatusType } from "../../enums/organization-user-status-type";
 import { OrganizationUserType } from "../../enums/organization-user-type";
 import { PermissionsApi } from "../api/permissions.api";

libs/common/src/admin-console/models/domain/organization.ts

@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { ProductType } from "../../../enums/productType";
+import { ProductType } from "../../../enums";
 import { OrganizationUserStatusType } from "../../enums/organization-user-status-type";
 import { OrganizationUserType } from "../../enums/organization-user-type";
 import { PermissionsApi } from "../api/permissions.api";

libs/common/src/admin-console/models/response/profile-organization.response.ts

@@ -1,4 +1,4 @@
-import { ProductType } from "../../../enums/productType";
+import { ProductType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
 import { OrganizationUserStatusType } from "../../enums/organization-user-status-type";
 import { OrganizationUserType } from "../../enums/organization-user-type";

libs/common/src/auth/login-strategies/password-login.strategy.spec.ts

@@ -7,7 +7,7 @@ import { LogService } from "../../abstractions/log.service";
 import { MessagingService } from "../../abstractions/messaging.service";
 import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
 import { StateService } from "../../abstractions/state.service";
-import { HashPurpose } from "../../enums/hashPurpose";
+import { HashPurpose } from "../../enums";
 import { Utils } from "../../misc/utils";
 import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
 import { AuthService } from "../abstractions/auth.service";

libs/common/src/auth/login-strategies/password-login.strategy.ts

@@ -5,7 +5,7 @@ import { LogService } from "../../abstractions/log.service";
 import { MessagingService } from "../../abstractions/messaging.service";
 import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
 import { StateService } from "../../abstractions/state.service";
-import { HashPurpose } from "../../enums/hashPurpose";
+import { HashPurpose } from "../../enums";
 import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
 import { AuthService } from "../abstractions/auth.service";
 import { TokenService } from "../abstractions/token.service";

libs/common/src/auth/models/request/identity-token/device.request.ts

@@ -1,5 +1,5 @@
 import { PlatformUtilsService } from "../../../../abstractions/platformUtils.service";
-import { DeviceType } from "../../../../enums/deviceType";
+import { DeviceType } from "../../../../enums";
 
 export class DeviceRequest {
   type: DeviceType;

libs/common/src/auth/models/request/identity-token/password-token.request.ts

@@ -1,4 +1,4 @@
-import { ClientType } from "../../../../enums/clientType";
+import { ClientType } from "../../../../enums";
 import { Utils } from "../../../../misc/utils";
 import { CaptchaProtectedRequest } from "../captcha-protected.request";
 

libs/common/src/auth/models/request/set-key-connector-key.request.ts

@@ -1,4 +1,4 @@
-import { KdfType } from "../../../enums/kdfType";
+import { KdfType } from "../../../enums";
 import { KeysRequest } from "../../../models/request/keys.request";
 import { KdfConfig } from "../domain/kdf-config";
 

libs/common/src/auth/models/request/set-password.request.ts

@@ -1,4 +1,4 @@
-import { KdfType } from "../../../enums/kdfType";
+import { KdfType } from "../../../enums";
 import { KeysRequest } from "../../../models/request/keys.request";
 
 export class SetPasswordRequest {

libs/common/src/auth/models/response/auth-request.response.ts

@@ -1,4 +1,4 @@
-import { DeviceType } from "../../../enums/deviceType";
+import { DeviceType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
 
 const RequestTimeOut = 60000 * 15; //15 Minutes

libs/common/src/auth/models/response/device.response.ts

@@ -1,4 +1,4 @@
-import { DeviceType } from "../../../enums/deviceType";
+import { DeviceType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
 
 export class DeviceResponse extends BaseResponse {

libs/common/src/auth/models/response/emergency-access.response.ts

@@ -1,4 +1,4 @@
-import { KdfType } from "../../../enums/kdfType";
+import { KdfType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
 import { CipherResponse } from "../../../vault/models/response/cipher.response";
 import { EmergencyAccessStatusType } from "../../enums/emergency-access-status-type";

libs/common/src/auth/models/response/identity-token.response.ts

@@ -1,4 +1,4 @@
-import { KdfType } from "../../../enums/kdfType";
+import { KdfType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
 
 export class IdentityTokenResponse extends BaseResponse {

libs/common/src/auth/models/response/prelogin.response.ts

@@ -1,4 +1,4 @@
-import { KdfType } from "../../../enums/kdfType";
+import { KdfType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
 
 export class PreloginResponse extends BaseResponse {

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

@@ -10,8 +10,7 @@ import { LogService } from "../../abstractions/log.service";
 import { MessagingService } from "../../abstractions/messaging.service";
 import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
 import { StateService } from "../../abstractions/state.service";
-import { KdfType } from "../../enums/kdfType";
-import { KeySuffixOptions } from "../../enums/keySuffixOptions";
+import { KdfType, KeySuffixOptions } from "../../enums";
 import { Utils } from "../../misc/utils";
 import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
 import { PreloginRequest } from "../../models/request/prelogin.request";

libs/common/src/billing/models/response/plan.response.ts

@@ -1,4 +1,4 @@
-import { ProductType } from "../../../enums/productType";
+import { ProductType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
 import { PlanType } from "../../enums/plan-type";
 

libs/common/src/enums/index.ts

@@ -0,0 +1,23 @@
+export * from "./client-type.enum";
+export * from "./device-type.enum";
+export * from "./encrypted-export-type.enum";
+export * from "./encryption-type.enum";
+export * from "./event-system-user.enum";
+export * from "./event-type.enum";
+export * from "./field-type.enum";
+export * from "./file-upload-type.enum";
+export * from "./hash-purpose.enum";
+export * from "./html-storage-location.enum";
+export * from "./http-status-code.enum";
+export * from "./kdf-type.enum";
+export * from "./key-suffix-options.enum";
+export * from "./linked-id-type.enum";
+export * from "./log-level-type.enum";
+export * from "./native-messaging-version.enum";
+export * from "./notification-type.enum";
+export * from "./product-type.enum";
+export * from "./secure-note-type.enum";
+export * from "./state-version.enum";
+export * from "./storage-location.enum";
+export * from "./theme-type.enum";
+export * from "./uri-match-type.enum";

libs/common/src/interfaces/IEncrypted.ts

@@ -1,4 +1,4 @@
-import { EncryptionType } from "../enums/encryptionType";
+import { EncryptionType } from "../enums";
 
 export interface IEncrypted {
   encryptionType?: EncryptionType;

libs/common/src/misc/linkedFieldOption.decorator.ts

@@ -1,4 +1,4 @@
-import { LinkedIdType } from "../enums/linkedIdType";
+import { LinkedIdType } from "../enums";
 import { ItemView } from "../vault/models/view/item.view";
 
 export class LinkedMetadata {

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

@@ -1,5 +1,4 @@
-import { FieldType } from "../../enums/fieldType";
-import { LinkedIdType } from "../../enums/linkedIdType";
+import { FieldType, LinkedIdType } from "../../enums";
 import { BaseResponse } from "../response/base.response";
 
 export class FieldApi extends BaseResponse {

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

@@ -1,4 +1,4 @@
-import { UriMatchType } from "../../enums/uriMatchType";
+import { UriMatchType } from "../../enums";
 import { BaseResponse } from "../response/base.response";
 
 export class LoginUriApi extends BaseResponse {

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

@@ -1,4 +1,4 @@
-import { SecureNoteType } from "../../enums/secureNoteType";
+import { SecureNoteType } from "../../enums";
 import { BaseResponse } from "../response/base.response";
 
 export class SecureNoteApi extends BaseResponse {

libs/common/src/models/data/event.data.ts

@@ -1,4 +1,4 @@
-import { EventType } from "../../enums/eventType";
+import { EventType } from "../../enums";
 
 export class EventData {
   type: EventType;

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

@@ -9,8 +9,7 @@ import { Policy } from "../../admin-console/models/domain/policy";
 import { CollectionView } from "../../admin-console/models/view/collection.view";
 import { AuthenticationStatus } from "../../auth/enums/authentication-status";
 import { EnvironmentUrls } from "../../auth/models/domain/environment-urls";
-import { KdfType } from "../../enums/kdfType";
-import { UriMatchType } from "../../enums/uriMatchType";
+import { KdfType, UriMatchType } from "../../enums";
 import { Utils } from "../../misc/utils";
 import { GeneratedPasswordHistory } from "../../tools/generator/password";
 import { SendData } from "../../tools/send/models/data/send.data";

libs/common/src/models/domain/enc-array-buffer.ts

@@ -1,4 +1,4 @@
-import { EncryptionType } from "../../enums/encryptionType";
+import { EncryptionType } from "../../enums";
 import { IEncrypted } from "../../interfaces/IEncrypted";
 import { Utils } from "../../misc/utils";
 

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

@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { EncryptionType } from "../../enums/encryptionType";
+import { EncryptionType } from "../../enums";
 import { IEncrypted } from "../../interfaces/IEncrypted";
 import { Utils } from "../../misc/utils";
 

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

@@ -1,6 +1,5 @@
 import { EnvironmentUrls } from "../../auth/models/domain/environment-urls";
-import { StateVersion } from "../../enums/stateVersion";
-import { ThemeType } from "../../enums/themeType";
+import { StateVersion, ThemeType } from "../../enums";
 
 import { WindowState } from "./window-state";
 

libs/common/src/models/domain/storage-options.ts

@@ -1,7 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { HtmlStorageLocation } from "../../enums/htmlStorageLocation";
-import { StorageLocation } from "../../enums/storageLocation";
+import { HtmlStorageLocation, StorageLocation } from "../../enums";
 
 export type StorageOptions = {
   storageLocation?: StorageLocation;

libs/common/src/models/domain/symmetric-crypto-key.ts

@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { EncryptionType } from "../../enums/encryptionType";
+import { EncryptionType } from "../../enums";
 import { Utils } from "../../misc/utils";
 
 export class SymmetricCryptoKey {

libs/common/src/models/export/event.export.ts

@@ -1,4 +1,4 @@
-import { EventType } from "../../enums/eventType";
+import { EventType } from "../../enums";
 import { EventView } from "../view/event.view";
 
 export class EventExport {

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

@@ -1,5 +1,4 @@
-import { FieldType } from "../../enums/fieldType";
-import { LinkedIdType } from "../../enums/linkedIdType";
+import { FieldType, LinkedIdType } from "../../enums";
 import { Field as FieldDomain } from "../../vault/models/domain/field";
 import { FieldView } from "../../vault/models/view/field.view";
 import { EncString } from "../domain/enc-string";

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

@@ -1,4 +1,4 @@
-import { UriMatchType } from "../../enums/uriMatchType";
+import { UriMatchType } from "../../enums";
 import { LoginUri as LoginUriDomain } from "../../vault/models/domain/login-uri";
 import { LoginUriView } from "../../vault/models/view/login-uri.view";
 import { EncString } from "../domain/enc-string";

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

@@ -1,4 +1,4 @@
-import { SecureNoteType } from "../../enums/secureNoteType";
+import { SecureNoteType } from "../../enums";
 import { SecureNote as SecureNoteDomain } from "../../vault/models/domain/secure-note";
 import { SecureNoteView } from "../../vault/models/view/secure-note.view";
 

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

@@ -1,4 +1,4 @@
-import { EventType } from "../../enums/eventType";
+import { EventType } from "../../enums";
 
 export class EventRequest {
   type: EventType;

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

@@ -1,5 +1,5 @@
 import { PasswordRequest } from "../../auth/models/request/password.request";
-import { KdfType } from "../../enums/kdfType";
+import { KdfType } from "../../enums";
 
 export class KdfRequest extends PasswordRequest {
   kdf: KdfType;

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

@@ -1,5 +1,5 @@
 import { CaptchaProtectedRequest } from "../../auth/models/request/captcha-protected.request";
-import { KdfType } from "../../enums/kdfType";
+import { KdfType } from "../../enums";
 
 import { KeysRequest } from "./keys.request";
 import { ReferenceEventRequest } from "./reference-event.request";

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

@@ -1,6 +1,4 @@
-import { DeviceType } from "../../enums/deviceType";
-import { EventSystemUser } from "../../enums/event-system-user";
-import { EventType } from "../../enums/eventType";
+import { DeviceType, EventSystemUser, EventType } from "../../enums";
 
 import { BaseResponse } from "./base.response";
 

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

@@ -1,4 +1,4 @@
-import { NotificationType } from "../../enums/notificationType";
+import { NotificationType } from "../../enums";
 
 import { BaseResponse } from "./base.response";
 

libs/common/src/models/view/event.view.ts

@@ -1,5 +1,4 @@
-import { EventSystemUser } from "../../enums/event-system-user";
-import { EventType } from "../../enums/eventType";
+import { EventSystemUser, EventType } from "../../enums";
 
 export class EventView {
   message: string;

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

@@ -110,7 +110,7 @@ import { PlanResponse } from "../billing/models/response/plan.response";
 import { SubscriptionResponse } from "../billing/models/response/subscription.response";
 import { TaxInfoResponse } from "../billing/models/response/tax-info.response";
 import { TaxRateResponse } from "../billing/models/response/tax-rate.response";
-import { DeviceType } from "../enums/deviceType";
+import { DeviceType } from "../enums";
 import { Utils } from "../misc/utils";
 import { CollectionBulkDeleteRequest } from "../models/request/collection-bulk-delete.request";
 import { DeleteRecoverRequest } from "../models/request/delete-recover.request";

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

@@ -1,6 +1,6 @@
 import { AppIdService as AppIdServiceAbstraction } from "../abstractions/appId.service";
 import { AbstractStorageService } from "../abstractions/storage.service";
-import { HtmlStorageLocation } from "../enums/htmlStorageLocation";
+import { HtmlStorageLocation } from "../enums";
 import { Utils } from "../misc/utils";
 
 export class AppIdService implements AppIdServiceAbstraction {

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

@@ -1,5 +1,5 @@
 import { LogService as LogServiceAbstraction } from "../abstractions/log.service";
-import { LogLevelType } from "../enums/logLevelType";
+import { LogLevelType } from "../enums";
 
 export class ConsoleLogService implements LogServiceAbstraction {
   protected timersMap: Map<string, [number, number]> = new Map();

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

@@ -12,15 +12,15 @@ import { ProfileOrganizationResponse } from "../admin-console/models/response/pr
 import { ProfileProviderOrganizationResponse } from "../admin-console/models/response/profile-provider-organization.response";
 import { ProfileProviderResponse } from "../admin-console/models/response/profile-provider.response";
 import { KdfConfig } from "../auth/models/domain/kdf-config";
-import { EncryptionType } from "../enums/encryptionType";
-import { HashPurpose } from "../enums/hashPurpose";
 import {
   DEFAULT_ARGON2_ITERATIONS,
   DEFAULT_ARGON2_MEMORY,
   DEFAULT_ARGON2_PARALLELISM,
+  EncryptionType,
+  HashPurpose,
   KdfType,
-} from "../enums/kdfType";
-import { KeySuffixOptions } from "../enums/keySuffixOptions";
+  KeySuffixOptions,
+} from "../enums";
 import { sequentialize } from "../misc/sequentialize";
 import { Utils } from "../misc/utils";
 import { EFFLongWordList } from "../misc/wordlist";

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

@@ -1,7 +1,7 @@
 import { CryptoFunctionService } from "../../abstractions/cryptoFunction.service";
 import { EncryptService } from "../../abstractions/encrypt.service";
 import { LogService } from "../../abstractions/log.service";
-import { EncryptionType } from "../../enums/encryptionType";
+import { EncryptionType } from "../../enums";
 import { IEncrypted } from "../../interfaces/IEncrypted";
 import { Decryptable } from "../../interfaces/decryptable.interface";
 import { InitializerMetadata } from "../../interfaces/initializer-metadata.interface";

libs/common/src/services/event/event-collection.service.ts

@@ -2,7 +2,7 @@ import { EventCollectionService as EventCollectionServiceAbstraction } from "../
 import { EventUploadService } from "../../abstractions/event/event-upload.service";
 import { StateService } from "../../abstractions/state.service";
 import { OrganizationService } from "../../admin-console/abstractions/organization/organization.service.abstraction";
-import { EventType } from "../../enums/eventType";
+import { EventType } from "../../enums";
 import { EventData } from "../../models/data/event.data";
 import { CipherService } from "../../vault/abstractions/cipher.service";
 

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

@@ -15,7 +15,7 @@ import { Collection } from "../admin-console/models/domain/collection";
 import { CollectionDetailsResponse } from "../admin-console/models/response/collection.response";
 import { CollectionView } from "../admin-console/models/view/collection.view";
 import { KdfConfig } from "../auth/models/domain/kdf-config";
-import { KdfType } from "../enums/kdfType";
+import { KdfType } from "../enums";
 import { Utils } from "../misc/utils";
 import { CipherWithIdExport as CipherExport } from "../models/export/cipher-with-ids.export";
 import { CollectionWithIdExport as CollectionExport } from "../models/export/collection-with-id.export";

libs/common/src/services/file-upload/file-upload.service.ts

@@ -3,7 +3,7 @@ import {
   FileUploadService as FileUploadServiceAbstraction,
 } from "../../abstractions/file-upload/file-upload.service";
 import { LogService } from "../../abstractions/log.service";
-import { FileUploadType } from "../../enums/fileUploadType";
+import { FileUploadType } from "../../enums";
 import { EncArrayBuffer } from "../../models/domain/enc-array-buffer";
 import { EncString } from "../../models/domain/enc-string";
 import { AzureFileUploadService } from "../azureFileUpload.service";

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

@@ -10,7 +10,7 @@ import { NotificationsService as NotificationsServiceAbstraction } from "../abst
 import { StateService } from "../abstractions/state.service";
 import { AuthService } from "../auth/abstractions/auth.service";
 import { AuthenticationStatus } from "../auth/enums/authentication-status";
-import { NotificationType } from "../enums/notificationType";
+import { NotificationType } from "../enums";
 import {
   NotificationResponse,
   SyncCipherNotification,

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

@@ -3,8 +3,7 @@ import * as lunr from "lunr";
 import { I18nService } from "../abstractions/i18n.service";
 import { LogService } from "../abstractions/log.service";
 import { SearchService as SearchServiceAbstraction } from "../abstractions/search.service";
-import { FieldType } from "../enums/fieldType";
-import { UriMatchType } from "../enums/uriMatchType";
+import { FieldType, UriMatchType } from "../enums";
 import { SendView } from "../tools/send/models/view/send.view";
 import { CipherService } from "../vault/abstractions/cipher.service";
 import { CipherType } from "../vault/enums/cipher-type";

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

@@ -17,11 +17,7 @@ import { Policy } from "../admin-console/models/domain/policy";
 import { CollectionView } from "../admin-console/models/view/collection.view";
 import { EnvironmentUrls } from "../auth/models/domain/environment-urls";
 import { KdfConfig } from "../auth/models/domain/kdf-config";
-import { HtmlStorageLocation } from "../enums/htmlStorageLocation";
-import { KdfType } from "../enums/kdfType";
-import { StorageLocation } from "../enums/storageLocation";
-import { ThemeType } from "../enums/themeType";
-import { UriMatchType } from "../enums/uriMatchType";
+import { HtmlStorageLocation, KdfType, StorageLocation, ThemeType, UriMatchType } from "../enums";
 import { StateFactory } from "../factories/stateFactory";
 import { Utils } from "../misc/utils";
 import { EventData } from "../models/data/event.data";

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

@@ -5,10 +5,7 @@ import { PolicyData } from "../admin-console/models/data/policy.data";
 import { ProviderData } from "../admin-console/models/data/provider.data";
 import { EnvironmentUrls } from "../auth/models/domain/environment-urls";
 import { TokenService } from "../auth/services/token.service";
-import { HtmlStorageLocation } from "../enums/htmlStorageLocation";
-import { KdfType } from "../enums/kdfType";
-import { StateVersion } from "../enums/stateVersion";
-import { ThemeType } from "../enums/themeType";
+import { HtmlStorageLocation, KdfType, StateVersion, ThemeType } from "../enums";
 import { StateFactory } from "../factories/stateFactory";
 import { EventData } from "../models/data/event.data";
 import {

libs/common/src/tools/send/models/response/send-file-upload-data.response.ts

@@ -1,4 +1,4 @@
-import { FileUploadType } from "../../../../enums/fileUploadType";
+import { FileUploadType } from "../../../../enums";
 import { BaseResponse } from "../../../../models/response/base.response";
 
 import { SendResponse } from "./send.response";

libs/common/src/tools/send/services/send.service.ts

@@ -4,7 +4,7 @@ import { CryptoService } from "../../../abstractions/crypto.service";
 import { CryptoFunctionService } from "../../../abstractions/cryptoFunction.service";
 import { I18nService } from "../../../abstractions/i18n.service";
 import { StateService } from "../../../abstractions/state.service";
-import { SEND_KDF_ITERATIONS } from "../../../enums/kdfType";
+import { SEND_KDF_ITERATIONS } from "../../../enums";
 import { Utils } from "../../../misc/utils";
 import { EncArrayBuffer } from "../../../models/domain/enc-array-buffer";
 import { EncString } from "../../../models/domain/enc-string";

libs/common/src/vault/abstractions/cipher.service.ts

@@ -1,4 +1,4 @@
-import { UriMatchType } from "../../enums/uriMatchType";
+import { UriMatchType } from "../../enums";
 import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
 import { CipherType } from "../enums/cipher-type";
 import { CipherData } from "../models/data/cipher.data";

libs/common/src/vault/models/data/field.data.ts

@@ -1,5 +1,4 @@
-import { FieldType } from "../../../enums/fieldType";
-import { LinkedIdType } from "../../../enums/linkedIdType";
+import { FieldType, LinkedIdType } from "../../../enums";
 import { FieldApi } from "../../../models/api/field.api";
 
 export class FieldData {

libs/common/src/vault/models/data/login-uri.data.ts

@@ -1,4 +1,4 @@
-import { UriMatchType } from "../../../enums/uriMatchType";
+import { UriMatchType } from "../../../enums";
 import { LoginUriApi } from "../../../models/api/login-uri.api";
 
 export class LoginUriData {

libs/common/src/vault/models/data/secure-note.data.ts

@@ -1,4 +1,4 @@
-import { SecureNoteType } from "../../../enums/secureNoteType";
+import { SecureNoteType } from "../../../enums";
 import { SecureNoteApi } from "../../../models/api/secure-note.api";
 
 export class SecureNoteData {

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

@@ -3,9 +3,7 @@ import { Substitute, Arg } from "@fluffy-spoon/substitute";
 import { Jsonify } from "type-fest";
 
 import { mockEnc, mockFromJson } from "../../../../spec/utils";
-import { FieldType } from "../../../enums/fieldType";
-import { SecureNoteType } from "../../../enums/secureNoteType";
-import { UriMatchType } from "../../../enums/uriMatchType";
+import { FieldType, SecureNoteType, UriMatchType } from "../../../enums";
 import { EncString } from "../../../models/domain/enc-string";
 import { InitializerKey } from "../../../services/cryptography/initializer-key";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";

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

@@ -1,5 +1,5 @@
 import { mockEnc, mockFromJson } from "../../../../spec/utils";
-import { FieldType } from "../../../enums/fieldType";
+import { FieldType } from "../../../enums";
 import { EncString } from "../../../models/domain/enc-string";
 import { FieldData } from "../../models/data/field.data";
 import { Field } from "../../models/domain/field";

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

@@ -1,7 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { FieldType } from "../../../enums/fieldType";
-import { LinkedIdType } from "../../../enums/linkedIdType";
+import { FieldType, LinkedIdType } from "../../../enums";
 import Domain from "../../../models/domain/domain-base";
 import { EncString } from "../../../models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key";

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

@@ -1,7 +1,7 @@
 import { Jsonify } from "type-fest";
 
 import { mockEnc, mockFromJson } from "../../../../spec/utils";
-import { UriMatchType } from "../../../enums/uriMatchType";
+import { UriMatchType } from "../../../enums";
 import { EncString } from "../../../models/domain/enc-string";
 import { LoginUriData } from "../data/login-uri.data";
 

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

@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { UriMatchType } from "../../../enums/uriMatchType";
+import { UriMatchType } from "../../../enums";
 import Domain from "../../../models/domain/domain-base";
 import { EncString } from "../../../models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key";

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

@@ -2,7 +2,7 @@
 import { Substitute, Arg } from "@fluffy-spoon/substitute";
 
 import { mockEnc, mockFromJson } from "../../../../spec/utils";
-import { UriMatchType } from "../../../enums/uriMatchType";
+import { UriMatchType } from "../../../enums";
 import { EncString } from "../../../models/domain/enc-string";
 import { LoginData } from "../../models/data/login.data";
 import { Login } from "../../models/domain/login";

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

@@ -1,4 +1,4 @@
-import { SecureNoteType } from "../../../enums/secureNoteType";
+import { SecureNoteType } from "../../../enums";
 import { SecureNoteData } from "../data/secure-note.data";
 
 import { SecureNote } from "./secure-note";

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

@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { SecureNoteType } from "../../../enums/secureNoteType";
+import { SecureNoteType } from "../../../enums";
 import Domain from "../../../models/domain/domain-base";
 import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key";
 import { SecureNoteData } from "../data/secure-note.data";

libs/common/src/vault/models/response/attachment-upload-data.response.ts

@@ -1,4 +1,4 @@
-import { FileUploadType } from "../../../enums/fileUploadType";
+import { FileUploadType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
 
 import { CipherResponse } from "./cipher.response";

libs/common/src/vault/models/view/card.view.ts

@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { CardLinkedId as LinkedId } from "../../../enums/linkedIdType";
+import { CardLinkedId as LinkedId } from "../../../enums";
 import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator";
 
 import { ItemView } from "./item.view";

libs/common/src/vault/models/view/cipher.view.ts

@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { LinkedIdType } from "../../../enums/linkedIdType";
+import { LinkedIdType } from "../../../enums";
 import { InitializerMetadata } from "../../../interfaces/initializer-metadata.interface";
 import { View } from "../../../models/view/view";
 import { InitializerKey } from "../../../services/cryptography/initializer-key";

libs/common/src/vault/models/view/field.view.ts

@@ -1,7 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { FieldType } from "../../../enums/fieldType";
-import { LinkedIdType } from "../../../enums/linkedIdType";
+import { FieldType, LinkedIdType } from "../../../enums";
 import { View } from "../../../models/view/view";
 import { Field } from "../domain/field";
 

libs/common/src/vault/models/view/identity.view.ts

@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { IdentityLinkedId as LinkedId } from "../../../enums/linkedIdType";
+import { IdentityLinkedId as LinkedId } from "../../../enums";
 import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator";
 import { Utils } from "../../../misc/utils";
 

libs/common/src/vault/models/view/login-uri-view.spec.ts

@@ -1,4 +1,4 @@
-import { UriMatchType } from "../../../enums/uriMatchType";
+import { UriMatchType } from "../../../enums";
 
 import { LoginUriView } from "./login-uri.view";