diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index 26558ff99da..7854ccea09a 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -38,27 +38,6 @@ ./libs/common/src/misc/linkedFieldOption.decorator.ts ./libs/common/src/misc/serviceUtils.ts ./libs/common/src/misc/serviceUtils.spec.ts -./libs/common/src/enums/kdfType.ts -./libs/common/src/enums/fileUploadType.ts -./libs/common/src/enums/clientType.ts -./libs/common/src/enums/encryptedExportType.ts -./libs/common/src/enums/linkedIdType.ts -./libs/common/src/enums/encryptionType.ts -./libs/common/src/enums/htmlStorageLocation.ts -./libs/common/src/enums/notificationType.ts -./libs/common/src/enums/keySuffixOptions.ts -./libs/common/src/enums/productType.ts -./libs/common/src/enums/eventType.ts -./libs/common/src/enums/hashPurpose.ts -./libs/common/src/enums/uriMatchType.ts -./libs/common/src/enums/deviceType.ts -./libs/common/src/enums/secureNoteType.ts -./libs/common/src/enums/storageLocation.ts -./libs/common/src/enums/themeType.ts -./libs/common/src/enums/logLevelType.ts -./libs/common/src/enums/stateVersion.ts -./libs/common/src/enums/fieldType.ts -./libs/common/src/enums/nativeMessagingVersion.ts ./libs/common/src/factories/accountFactory.ts ./libs/common/src/factories/globalStateFactory.ts ./libs/common/src/factories/stateFactory.ts diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts index 71284dbbe51..05649e300bb 100644 --- a/apps/browser/src/autofill/background/notification.background.ts +++ b/apps/browser/src/autofill/background/notification.background.ts @@ -4,7 +4,7 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { ThemeType } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts index 9583c077c89..b70fed36f79 100644 --- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts +++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts @@ -3,7 +3,7 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { EventType } from "@bitwarden/common/enums/eventType"; +import { EventType } from "@bitwarden/common/enums"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/apps/browser/src/autofill/services/abstractions/autofill.service.ts b/apps/browser/src/autofill/services/abstractions/autofill.service.ts index 2840c6dd5d5..07caa06d795 100644 --- a/apps/browser/src/autofill/services/abstractions/autofill.service.ts +++ b/apps/browser/src/autofill/services/abstractions/autofill.service.ts @@ -1,4 +1,4 @@ -import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; +import { UriMatchType } from "@bitwarden/common/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import AutofillField from "../../models/autofill-field"; diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts index 35dbe4b8ea8..a90b134654b 100644 --- a/apps/browser/src/autofill/services/autofill.service.ts +++ b/apps/browser/src/autofill/services/autofill.service.ts @@ -2,9 +2,7 @@ import { EventCollectionService } from "@bitwarden/common/abstractions/event/eve import { LogService } from "@bitwarden/common/abstractions/log.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { EventType } from "@bitwarden/common/enums/eventType"; -import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; +import { EventType, FieldType, UriMatchType } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; diff --git a/apps/browser/src/background/service_factories/log-service.factory.ts b/apps/browser/src/background/service_factories/log-service.factory.ts index f8c7f9cad22..286bafd9516 100644 --- a/apps/browser/src/background/service_factories/log-service.factory.ts +++ b/apps/browser/src/background/service_factories/log-service.factory.ts @@ -1,5 +1,5 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { LogLevelType } from "@bitwarden/common/enums/logLevelType"; +import { LogLevelType } from "@bitwarden/common/enums"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; import { CachedServices, factory, FactoryOptions } from "./factory-options"; diff --git a/apps/browser/src/background/webRequest.background.ts b/apps/browser/src/background/webRequest.background.ts index ca0e0909a7a..ca8ed05ea3e 100644 --- a/apps/browser/src/background/webRequest.background.ts +++ b/apps/browser/src/background/webRequest.background.ts @@ -1,7 +1,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; +import { UriMatchType } from "@bitwarden/common/enums"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { BrowserApi } from "../browser/browserApi"; diff --git a/apps/browser/src/popup/settings/autofill.component.ts b/apps/browser/src/popup/settings/autofill.component.ts index dfe5925e2e7..9e134c43a86 100644 --- a/apps/browser/src/popup/settings/autofill.component.ts +++ b/apps/browser/src/popup/settings/autofill.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; +import { UriMatchType } from "@bitwarden/common/enums"; import { BrowserApi } from "../../browser/browserApi"; diff --git a/apps/browser/src/popup/settings/options.component.ts b/apps/browser/src/popup/settings/options.component.ts index e29d224f63d..e3983f7a7d3 100644 --- a/apps/browser/src/popup/settings/options.component.ts +++ b/apps/browser/src/popup/settings/options.component.ts @@ -5,8 +5,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { ThemeType } from "@bitwarden/common/enums/themeType"; -import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; +import { ThemeType, UriMatchType } from "@bitwarden/common/enums"; @Component({ selector: "app-options", diff --git a/apps/browser/src/popup/settings/settings.component.ts b/apps/browser/src/popup/settings/settings.component.ts index f8fcbb8fb71..8c1ca77c80e 100644 --- a/apps/browser/src/popup/settings/settings.component.ts +++ b/apps/browser/src/popup/settings/settings.component.ts @@ -13,7 +13,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; -import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { DeviceType } from "@bitwarden/common/enums"; import { BrowserApi } from "../../browser/browserApi"; import { BiometricErrors, BiometricErrorTypes } from "../../models/biometricErrors"; diff --git a/apps/browser/src/services/browserCrypto.service.ts b/apps/browser/src/services/browserCrypto.service.ts index 14cd4de8192..3714e265fa5 100644 --- a/apps/browser/src/services/browserCrypto.service.ts +++ b/apps/browser/src/services/browserCrypto.service.ts @@ -1,4 +1,4 @@ -import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; +import { KeySuffixOptions } from "@bitwarden/common/enums"; import { CryptoService } from "@bitwarden/common/services/crypto.service"; export class BrowserCryptoService extends CryptoService { diff --git a/apps/browser/src/services/browserPlatformUtils.service.spec.ts b/apps/browser/src/services/browserPlatformUtils.service.spec.ts index 683254087e7..42e72052b2c 100644 --- a/apps/browser/src/services/browserPlatformUtils.service.spec.ts +++ b/apps/browser/src/services/browserPlatformUtils.service.spec.ts @@ -1,4 +1,4 @@ -import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { DeviceType } from "@bitwarden/common/enums"; import BrowserPlatformUtilsService from "./browserPlatformUtils.service"; diff --git a/apps/browser/src/services/browserPlatformUtils.service.ts b/apps/browser/src/services/browserPlatformUtils.service.ts index f74a4b6de3c..08da8867077 100644 --- a/apps/browser/src/services/browserPlatformUtils.service.ts +++ b/apps/browser/src/services/browserPlatformUtils.service.ts @@ -1,7 +1,6 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ClientType } from "@bitwarden/common/enums/clientType"; -import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { ClientType, DeviceType } from "@bitwarden/common/enums"; import { BrowserApi } from "../browser/browserApi"; import { SafariApp } from "../browser/safariApp"; diff --git a/apps/browser/src/vault/popup/components/action-buttons.component.ts b/apps/browser/src/vault/popup/components/action-buttons.component.ts index f2a75b7de51..b587210ca9a 100644 --- a/apps/browser/src/vault/popup/components/action-buttons.component.ts +++ b/apps/browser/src/vault/popup/components/action-buttons.component.ts @@ -5,7 +5,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { EventType } from "@bitwarden/common/enums/eventType"; +import { EventType } from "@bitwarden/common/enums"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; diff --git a/apps/cli/src/auth/commands/unlock.command.ts b/apps/cli/src/auth/commands/unlock.command.ts index 3208f8faf73..bfe609f4f3a 100644 --- a/apps/cli/src/auth/commands/unlock.command.ts +++ b/apps/cli/src/auth/commands/unlock.command.ts @@ -6,7 +6,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; -import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; +import { HashPurpose } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index 489210815c6..5f5fa495f0b 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -17,9 +17,7 @@ import { TokenService } from "@bitwarden/common/auth/services/token.service"; import { TwoFactorService } from "@bitwarden/common/auth/services/two-factor.service"; import { UserVerificationApiService } from "@bitwarden/common/auth/services/user-verification/user-verification-api.service"; import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service"; -import { ClientType } from "@bitwarden/common/enums/clientType"; -import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; -import { LogLevelType } from "@bitwarden/common/enums/logLevelType"; +import { ClientType, KeySuffixOptions, LogLevelType } from "@bitwarden/common/enums"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { Account } from "@bitwarden/common/models/domain/account"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; diff --git a/apps/cli/src/commands/serve.command.ts b/apps/cli/src/commands/serve.command.ts index 0fa9333f8c4..81243cd4a49 100644 --- a/apps/cli/src/commands/serve.command.ts +++ b/apps/cli/src/commands/serve.command.ts @@ -5,7 +5,7 @@ import * as koa from "koa"; import * as koaBodyParser from "koa-bodyparser"; import * as koaJson from "koa-json"; -import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; +import { KeySuffixOptions } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { ConfirmCommand } from "../admin-console/commands/confirm.command"; diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts index 7c8d8c44180..27c1cfe6672 100644 --- a/apps/cli/src/program.ts +++ b/apps/cli/src/program.ts @@ -2,7 +2,7 @@ import * as chalk from "chalk"; import * as program from "commander"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; +import { KeySuffixOptions } from "@bitwarden/common/enums"; import { LockCommand } from "./auth/commands/lock.command"; import { LoginCommand } from "./auth/commands/login.command"; diff --git a/apps/cli/src/services/cli-platform-utils.service.ts b/apps/cli/src/services/cli-platform-utils.service.ts index ed2e585774c..35fc00af726 100644 --- a/apps/cli/src/services/cli-platform-utils.service.ts +++ b/apps/cli/src/services/cli-platform-utils.service.ts @@ -1,8 +1,7 @@ import * as child_process from "child_process"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ClientType } from "@bitwarden/common/enums/clientType"; -import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { ClientType, DeviceType } from "@bitwarden/common/enums"; // eslint-disable-next-line const open = require("open"); diff --git a/apps/cli/src/services/console-log.service.ts b/apps/cli/src/services/console-log.service.ts index c3e6fd7a759..4fe4d61e7f9 100644 --- a/apps/cli/src/services/console-log.service.ts +++ b/apps/cli/src/services/console-log.service.ts @@ -1,4 +1,4 @@ -import { LogLevelType } from "@bitwarden/common/enums/logLevelType"; +import { LogLevelType } from "@bitwarden/common/enums"; import { ConsoleLogService as BaseConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; export class ConsoleLogService extends BaseConsoleLogService { diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts index 5598f4e25ed..3b4dcc6f9e7 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts @@ -3,7 +3,7 @@ import "module-alias/register"; import yargs from "yargs"; import { hideBin } from "yargs/helpers"; -import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; +import { NativeMessagingVersion } from "@bitwarden/common/enums"; import { CredentialCreatePayload } from "../../../src/models/native-messaging/encrypted-message-payloads/credential-create-payload"; import { LogUtils } from "../log-utils"; diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts index 553b5f8ca95..783d7c404a0 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts @@ -3,7 +3,7 @@ import "module-alias/register"; import yargs from "yargs"; import { hideBin } from "yargs/helpers"; -import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; +import { NativeMessagingVersion } from "@bitwarden/common/enums"; import { LogUtils } from "../log-utils"; import NativeMessageService from "../native-message.service"; diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts index 9de17ef63d2..7d685c7f026 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts @@ -3,7 +3,7 @@ import "module-alias/register"; import yargs from "yargs"; import { hideBin } from "yargs/helpers"; -import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; +import { NativeMessagingVersion } from "@bitwarden/common/enums"; import { CredentialUpdatePayload } from "../../../src/models/native-messaging/encrypted-message-payloads/credential-update-payload"; import { LogUtils } from "../log-utils"; diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts index eb711de9cb8..c3796b43cf9 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts @@ -3,7 +3,7 @@ import "module-alias/register"; import yargs from "yargs"; import { hideBin } from "yargs/helpers"; -import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; +import { NativeMessagingVersion } from "@bitwarden/common/enums"; import { LogUtils } from "../log-utils"; import NativeMessageService from "../native-message.service"; diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts index e22e9bc6b5e..129e1fca170 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts @@ -1,6 +1,6 @@ import "module-alias/register"; -import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; +import { NativeMessagingVersion } from "@bitwarden/common/enums"; import { LogUtils } from "../log-utils"; import NativeMessageService from "../native-message.service"; diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts index b2d520ff0c8..e7789edd1d2 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts @@ -1,6 +1,6 @@ import "module-alias/register"; -import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; +import { NativeMessagingVersion } from "@bitwarden/common/enums"; import { LogUtils } from "../log-utils"; import NativeMessageService from "../native-message.service"; diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts index a5c5c071d4d..2151efff04e 100644 --- a/apps/desktop/src/app/accounts/settings.component.ts +++ b/apps/desktop/src/app/accounts/settings.component.ts @@ -10,9 +10,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; -import { DeviceType } from "@bitwarden/common/enums/deviceType"; -import { StorageLocation } from "@bitwarden/common/enums/storageLocation"; -import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { DeviceType, ThemeType, StorageLocation } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { flagEnabled } from "../../flags"; diff --git a/apps/desktop/src/app/services/desktop-theming.service.ts b/apps/desktop/src/app/services/desktop-theming.service.ts index 812b8935bb0..21277dfd736 100644 --- a/apps/desktop/src/app/services/desktop-theming.service.ts +++ b/apps/desktop/src/app/services/desktop-theming.service.ts @@ -2,7 +2,7 @@ import { Injectable } from "@angular/core"; import { ipcRenderer } from "electron"; import { ThemingService } from "@bitwarden/angular/services/theming/theming.service"; -import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { ThemeType } from "@bitwarden/common/enums"; @Injectable() export class DesktopThemingService extends ThemingService { diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts index 2bf87a4a305..7f9876a21d1 100644 --- a/apps/desktop/src/app/services/services.module.ts +++ b/apps/desktop/src/app/services/services.module.ts @@ -31,7 +31,7 @@ import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/adm import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/login.service"; import { LoginService } from "@bitwarden/common/auth/services/login.service"; -import { ClientType } from "@bitwarden/common/enums/clientType"; +import { ClientType } from "@bitwarden/common/enums"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; diff --git a/apps/desktop/src/services/electron-crypto.service.ts b/apps/desktop/src/services/electron-crypto.service.ts index bb1ad996d69..3adae7b2e96 100644 --- a/apps/desktop/src/services/electron-crypto.service.ts +++ b/apps/desktop/src/services/electron-crypto.service.ts @@ -3,7 +3,7 @@ import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; +import { KeySuffixOptions } from "@bitwarden/common/enums"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { CryptoService } from "@bitwarden/common/services/crypto.service"; diff --git a/apps/desktop/src/services/electron-log.service.ts b/apps/desktop/src/services/electron-log.service.ts index 9d18096aaca..177b6b7cbac 100644 --- a/apps/desktop/src/services/electron-log.service.ts +++ b/apps/desktop/src/services/electron-log.service.ts @@ -2,7 +2,7 @@ import * as path from "path"; import log from "electron-log"; -import { LogLevelType } from "@bitwarden/common/enums/logLevelType"; +import { LogLevelType } from "@bitwarden/common/enums"; import { ConsoleLogService as BaseLogService } from "@bitwarden/common/services/consoleLog.service"; import { isDev } from "../utils"; diff --git a/apps/desktop/src/services/electron-main-messaging.service.ts b/apps/desktop/src/services/electron-main-messaging.service.ts index a2a7afc7671..07afddec8c3 100644 --- a/apps/desktop/src/services/electron-main-messaging.service.ts +++ b/apps/desktop/src/services/electron-main-messaging.service.ts @@ -3,7 +3,7 @@ import * as path from "path"; import { app, dialog, ipcMain, Menu, MenuItem, nativeTheme, session, Notification } from "electron"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { ThemeType } from "@bitwarden/common/enums"; import { WindowMain } from "../main/window.main"; import { RendererMenuItem } from "../utils"; diff --git a/apps/desktop/src/services/electron-platform-utils.service.ts b/apps/desktop/src/services/electron-platform-utils.service.ts index 7a5b57d895f..01905240456 100644 --- a/apps/desktop/src/services/electron-platform-utils.service.ts +++ b/apps/desktop/src/services/electron-platform-utils.service.ts @@ -4,8 +4,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { ClientType } from "@bitwarden/common/enums/clientType"; -import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { ClientType, DeviceType } from "@bitwarden/common/enums"; import { isDev, isMacAppStore } from "../utils"; diff --git a/apps/desktop/src/services/native-message-handler.service.ts b/apps/desktop/src/services/native-message-handler.service.ts index fd00bf33f8e..4ef4545d2b1 100644 --- a/apps/desktop/src/services/native-message-handler.service.ts +++ b/apps/desktop/src/services/native-message-handler.service.ts @@ -6,7 +6,7 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; +import { NativeMessagingVersion } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; diff --git a/apps/desktop/src/services/native-messaging.service.ts b/apps/desktop/src/services/native-messaging.service.ts index 0a2b443bfbf..39b916261e8 100644 --- a/apps/desktop/src/services/native-messaging.service.ts +++ b/apps/desktop/src/services/native-messaging.service.ts @@ -10,7 +10,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; +import { KeySuffixOptions } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; diff --git a/apps/desktop/src/vault/app/vault/vault.component.ts b/apps/desktop/src/vault/app/vault/vault.component.ts index cd81a496a68..858c37971da 100644 --- a/apps/desktop/src/vault/app/vault/vault.component.ts +++ b/apps/desktop/src/vault/app/vault/vault.component.ts @@ -21,7 +21,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { EventType } from "@bitwarden/common/enums/eventType"; +import { EventType } from "@bitwarden/common/enums"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts index 384d12c0085..3f8fabadc7a 100644 --- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts +++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts @@ -14,7 +14,7 @@ import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.d import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; -import { ProductType } from "@bitwarden/common/enums/productType"; +import { ProductType } from "@bitwarden/common/enums"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; import { RouterService } from "./../../core/router.service"; diff --git a/apps/web/src/app/admin-console/organizations/manage/collections.component.ts b/apps/web/src/app/admin-console/organizations/manage/collections.component.ts index fc8dd4d447a..5c18c1e3166 100644 --- a/apps/web/src/app/admin-console/organizations/manage/collections.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/collections.component.ts @@ -19,7 +19,7 @@ import { CollectionResponse, } from "@bitwarden/common/admin-console/models/response/collection.response"; import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; -import { ProductType } from "@bitwarden/common/enums/productType"; +import { ProductType } from "@bitwarden/common/enums"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { DialogService, diff --git a/apps/web/src/app/admin-console/organizations/manage/events.component.ts b/apps/web/src/app/admin-console/organizations/manage/events.component.ts index 36c7893a43b..4215bcc9c06 100644 --- a/apps/web/src/app/admin-console/organizations/manage/events.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/events.component.ts @@ -13,7 +13,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { EventSystemUser } from "@bitwarden/common/enums/event-system-user"; +import { EventSystemUser } from "@bitwarden/common/enums"; import { EventResponse } from "@bitwarden/common/models/response/event.response"; import { BaseEventsComponent } from "../../../common/base.events.component"; diff --git a/apps/web/src/app/admin-console/organizations/members/people.component.ts b/apps/web/src/app/admin-console/organizations/members/people.component.ts index bec5a388f78..aa5890441a6 100644 --- a/apps/web/src/app/admin-console/organizations/members/people.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/people.component.ts @@ -43,7 +43,7 @@ import { Collection } from "@bitwarden/common/admin-console/models/domain/collec import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request"; import { CollectionDetailsResponse } from "@bitwarden/common/admin-console/models/response/collection.response"; -import { ProductType } from "@bitwarden/common/enums/productType"; +import { ProductType } from "@bitwarden/common/enums"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts index 8c26c36e034..dbe4858096d 100644 --- a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts +++ b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts @@ -13,7 +13,7 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga import { OrganizationSponsorshipRedeemRequest } from "@bitwarden/common/admin-console/models/request/organization/organization-sponsorship-redeem.request"; import { PlanSponsorshipType } from "@bitwarden/common/billing/enums/plan-sponsorship-type"; import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; -import { ProductType } from "@bitwarden/common/enums/productType"; +import { ProductType } from "@bitwarden/common/enums"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { OrganizationPlansComponent } from "../../../billing/settings/organization-plans.component"; diff --git a/apps/web/src/app/admin-console/organizations/tools/import-export/org-export.component.ts b/apps/web/src/app/admin-console/organizations/tools/import-export/org-export.component.ts index b8dcec30b3e..e49341ec3ff 100644 --- a/apps/web/src/app/admin-console/organizations/tools/import-export/org-export.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/import-export/org-export.component.ts @@ -12,7 +12,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { EventType } from "@bitwarden/common/enums/eventType"; +import { EventType } from "@bitwarden/common/enums"; import { ExportComponent } from "../../../../tools/import-export/export.component"; diff --git a/apps/web/src/app/admin-console/settings/create-organization.component.ts b/apps/web/src/app/admin-console/settings/create-organization.component.ts index c9ea819d0e5..38a87a0ba87 100644 --- a/apps/web/src/app/admin-console/settings/create-organization.component.ts +++ b/apps/web/src/app/admin-console/settings/create-organization.component.ts @@ -3,7 +3,7 @@ import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; -import { ProductType } from "@bitwarden/common/enums/productType"; +import { ProductType } from "@bitwarden/common/enums"; import { OrganizationPlansComponent } from "../../billing/settings/organization-plans.component"; diff --git a/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts b/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts index 3be5e4a069d..e79dc46ee18 100644 --- a/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts +++ b/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts @@ -11,7 +11,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { ProductType } from "@bitwarden/common/enums/productType"; +import { ProductType } from "@bitwarden/common/enums"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { OrganizationPlansComponent } from "../../settings/organization-plans.component"; diff --git a/apps/web/src/app/billing/organizations/change-plan.component.ts b/apps/web/src/app/billing/organizations/change-plan.component.ts index b27de8b6228..2d72ee1b80b 100644 --- a/apps/web/src/app/billing/organizations/change-plan.component.ts +++ b/apps/web/src/app/billing/organizations/change-plan.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; -import { ProductType } from "@bitwarden/common/enums/productType"; +import { ProductType } from "@bitwarden/common/enums"; @Component({ selector: "app-change-plan", diff --git a/apps/web/src/app/billing/settings/organization-plans.component.ts b/apps/web/src/app/billing/settings/organization-plans.component.ts index 2744446f069..bafe7c1fde6 100644 --- a/apps/web/src/app/billing/settings/organization-plans.component.ts +++ b/apps/web/src/app/billing/settings/organization-plans.component.ts @@ -28,7 +28,7 @@ import { ProviderOrganizationCreateRequest } from "@bitwarden/common/admin-conso import { PaymentMethodType } from "@bitwarden/common/billing/enums/payment-method-type"; import { PlanType } from "@bitwarden/common/billing/enums/plan-type"; import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response"; -import { ProductType } from "@bitwarden/common/enums/productType"; +import { ProductType } from "@bitwarden/common/enums"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/web/src/app/core/event.service.ts b/apps/web/src/app/core/event.service.ts index 904326f8305..fa6046454fc 100644 --- a/apps/web/src/app/core/event.service.ts +++ b/apps/web/src/app/core/event.service.ts @@ -4,8 +4,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; -import { DeviceType } from "@bitwarden/common/enums/deviceType"; -import { EventType } from "@bitwarden/common/enums/eventType"; +import { DeviceType, EventType } from "@bitwarden/common/enums"; import { EventResponse } from "@bitwarden/common/models/response/event.response"; @Injectable() diff --git a/apps/web/src/app/core/html-storage.service.ts b/apps/web/src/app/core/html-storage.service.ts index 5988f3f289e..e5653853775 100644 --- a/apps/web/src/app/core/html-storage.service.ts +++ b/apps/web/src/app/core/html-storage.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; -import { HtmlStorageLocation } from "@bitwarden/common/enums/htmlStorageLocation"; +import { HtmlStorageLocation } from "@bitwarden/common/enums"; import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; @Injectable() diff --git a/apps/web/src/app/core/state/global-state.ts b/apps/web/src/app/core/state/global-state.ts index 1bd80e20f1f..170d3ba34d5 100644 --- a/apps/web/src/app/core/state/global-state.ts +++ b/apps/web/src/app/core/state/global-state.ts @@ -1,4 +1,4 @@ -import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { ThemeType } from "@bitwarden/common/enums"; import { GlobalState as BaseGlobalState } from "@bitwarden/common/models/domain/global-state"; export class GlobalState extends BaseGlobalState { diff --git a/apps/web/src/app/core/web-platform-utils.service.ts b/apps/web/src/app/core/web-platform-utils.service.ts index 03a3f145b5d..302d0302171 100644 --- a/apps/web/src/app/core/web-platform-utils.service.ts +++ b/apps/web/src/app/core/web-platform-utils.service.ts @@ -5,8 +5,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { ClientType } from "@bitwarden/common/enums/clientType"; -import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { ClientType, DeviceType } from "@bitwarden/common/enums"; @Injectable() export class WebPlatformUtilsService implements PlatformUtilsService { diff --git a/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts b/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts index 9e56fe6b3dd..36a8028308a 100644 --- a/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts +++ b/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts @@ -10,7 +10,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; -import { KdfType } from "@bitwarden/common/enums/kdfType"; +import { KdfType } from "@bitwarden/common/enums"; import { KdfRequest } from "@bitwarden/common/models/request/kdf.request"; @Component({ diff --git a/apps/web/src/app/settings/change-kdf/change-kdf.component.ts b/apps/web/src/app/settings/change-kdf/change-kdf.component.ts index 15fd6fda125..9c9abec15e6 100644 --- a/apps/web/src/app/settings/change-kdf/change-kdf.component.ts +++ b/apps/web/src/app/settings/change-kdf/change-kdf.component.ts @@ -9,7 +9,7 @@ import { DEFAULT_ARGON2_MEMORY, DEFAULT_ARGON2_PARALLELISM, KdfType, -} from "@bitwarden/common/enums/kdfType"; +} from "@bitwarden/common/enums"; import { DialogService } from "@bitwarden/components"; import { ChangeKdfConfirmationComponent } from "./change-kdf-confirmation.component"; diff --git a/apps/web/src/app/settings/preferences.component.ts b/apps/web/src/app/settings/preferences.component.ts index f8282d74531..9bb61a3a631 100644 --- a/apps/web/src/app/settings/preferences.component.ts +++ b/apps/web/src/app/settings/preferences.component.ts @@ -7,7 +7,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; -import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { ThemeType } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; @Component({ diff --git a/apps/web/src/app/tools/import-export/export.component.ts b/apps/web/src/app/tools/import-export/export.component.ts index 83324aab823..b4fbbf576ba 100644 --- a/apps/web/src/app/tools/import-export/export.component.ts +++ b/apps/web/src/app/tools/import-export/export.component.ts @@ -12,7 +12,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { EncryptedExportType } from "@bitwarden/common/enums/encryptedExportType"; +import { EncryptedExportType } from "@bitwarden/common/enums"; import { UserVerificationPromptComponent } from "../../components/user-verification-prompt.component"; diff --git a/apps/web/src/app/tools/send/access.component.ts b/apps/web/src/app/tools/send/access.component.ts index ddd821cd2c1..7893ce9f742 100644 --- a/apps/web/src/app/tools/send/access.component.ts +++ b/apps/web/src/app/tools/send/access.component.ts @@ -7,7 +7,7 @@ import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunc import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { SEND_KDF_ITERATIONS } from "@bitwarden/common/enums/kdfType"; +import { SEND_KDF_ITERATIONS } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts index 2054963e3e6..a9cb2e20ba9 100644 --- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts +++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts @@ -12,8 +12,7 @@ import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { EventType } from "@bitwarden/common/enums/eventType"; -import { ProductType } from "@bitwarden/common/enums/productType"; +import { EventType, ProductType } from "@bitwarden/common/enums"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/apps/web/src/app/vault/individual-vault/vault-items.component.ts b/apps/web/src/app/vault/individual-vault/vault-items.component.ts index b884cddde3a..de193529471 100644 --- a/apps/web/src/app/vault/individual-vault/vault-items.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-items.component.ts @@ -14,7 +14,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; -import { EventType } from "@bitwarden/common/enums/eventType"; +import { EventType } from "@bitwarden/common/enums"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts index 2a806b50a82..2ce4988e383 100644 --- a/apps/web/src/app/vault/individual-vault/vault.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault.component.ts @@ -20,7 +20,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { StateService } from "@bitwarden/common/abstractions/state.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; -import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/enums/kdfType"; +import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/enums"; import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts index 8d59a4c484d..835301ba4a4 100644 --- a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts +++ b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts @@ -9,7 +9,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; -import { ProductType } from "@bitwarden/common/enums/productType"; +import { ProductType } from "@bitwarden/common/enums"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { DialogService, diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts index 64034b86cf5..46486eb05f2 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts @@ -15,7 +15,7 @@ import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response"; import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; import { EmergencyAccessPasswordRequest } from "@bitwarden/common/auth/models/request/emergency-access-password.request"; -import { KdfType } from "@bitwarden/common/enums/kdfType"; +import { KdfType } from "@bitwarden/common/enums"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; diff --git a/apps/web/src/auth/sso.component.ts b/apps/web/src/auth/sso.component.ts index df3b3e2fc83..ddc0d754e47 100644 --- a/apps/web/src/auth/sso.component.ts +++ b/apps/web/src/auth/sso.component.ts @@ -15,7 +15,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; -import { HttpStatusCode } from "@bitwarden/common/enums/http-status-code.enum"; +import { HttpStatusCode } from "@bitwarden/common/enums"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts index 1bf22a1df4b..f76fa2bc8b1 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts @@ -10,7 +10,7 @@ import { OrgDomainServiceAbstraction } from "@bitwarden/common/abstractions/orga import { OrganizationDomainResponse } from "@bitwarden/common/abstractions/organization-domain/responses/organization-domain.response"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; -import { HttpStatusCode } from "@bitwarden/common/enums/http-status-code.enum"; +import { HttpStatusCode } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { OrganizationDomainRequest } from "@bitwarden/common/services/organization-domain/requests/organization-domain.request"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts index 300e90dc21e..e6495af942c 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts @@ -8,7 +8,7 @@ import { OrgDomainServiceAbstraction } from "@bitwarden/common/abstractions/orga import { OrganizationDomainResponse } from "@bitwarden/common/abstractions/organization-domain/responses/organization-domain.response"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; -import { HttpStatusCode } from "@bitwarden/common/enums/http-status-code.enum"; +import { HttpStatusCode } from "@bitwarden/common/enums"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { DialogService } from "@bitwarden/components"; diff --git a/libs/angular/src/auth/components/change-password.component.ts b/libs/angular/src/auth/components/change-password.component.ts index 88b652686b5..ce40ba70540 100644 --- a/libs/angular/src/auth/components/change-password.component.ts +++ b/libs/angular/src/auth/components/change-password.component.ts @@ -9,7 +9,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; -import { KdfType } from "@bitwarden/common/enums/kdfType"; +import { KdfType } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; diff --git a/libs/angular/src/auth/components/lock.component.ts b/libs/angular/src/auth/components/lock.component.ts index 1528a3ef7b8..ae579c05d04 100644 --- a/libs/angular/src/auth/components/lock.component.ts +++ b/libs/angular/src/auth/components/lock.component.ts @@ -15,8 +15,7 @@ import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; -import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; -import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; +import { HashPurpose, KeySuffixOptions } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; diff --git a/libs/angular/src/components/export.component.ts b/libs/angular/src/components/export.component.ts index 51dbb79e5b7..b77ea2f64e4 100644 --- a/libs/angular/src/components/export.component.ts +++ b/libs/angular/src/components/export.component.ts @@ -12,8 +12,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; -import { EncryptedExportType } from "@bitwarden/common/enums/encryptedExportType"; -import { EventType } from "@bitwarden/common/enums/eventType"; +import { EncryptedExportType, EventType } from "@bitwarden/common/enums"; @Directive() export class ExportComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/components/register.component.ts b/libs/angular/src/components/register.component.ts index b694ac66be0..2eb6d500cea 100644 --- a/libs/angular/src/components/register.component.ts +++ b/libs/angular/src/components/register.component.ts @@ -17,7 +17,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { PasswordLogInCredentials } from "@bitwarden/common/auth/models/domain/log-in-credentials"; import { RegisterResponse } from "@bitwarden/common/auth/models/response/register.response"; -import { DEFAULT_KDF_CONFIG, DEFAULT_KDF_TYPE } from "@bitwarden/common/enums/kdfType"; +import { DEFAULT_KDF_CONFIG, DEFAULT_KDF_TYPE } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { KeysRequest } from "@bitwarden/common/models/request/keys.request"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; diff --git a/libs/angular/src/components/set-password.component.ts b/libs/angular/src/components/set-password.component.ts index 90781b9be7f..fad1fba1be4 100644 --- a/libs/angular/src/components/set-password.component.ts +++ b/libs/angular/src/components/set-password.component.ts @@ -14,8 +14,7 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { SetPasswordRequest } from "@bitwarden/common/auth/models/request/set-password.request"; -import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; -import { DEFAULT_KDF_TYPE, DEFAULT_KDF_CONFIG } from "@bitwarden/common/enums/kdfType"; +import { HashPurpose, DEFAULT_KDF_TYPE, DEFAULT_KDF_CONFIG } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; diff --git a/libs/angular/src/services/theming/theme.ts b/libs/angular/src/services/theming/theme.ts index 91311ac3b30..b5a1c83d7c6 100644 --- a/libs/angular/src/services/theming/theme.ts +++ b/libs/angular/src/services/theming/theme.ts @@ -1,4 +1,4 @@ -import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { ThemeType } from "@bitwarden/common/enums"; export interface Theme { configuredTheme: ThemeType; diff --git a/libs/angular/src/services/theming/themeBuilder.ts b/libs/angular/src/services/theming/themeBuilder.ts index 87b294032db..1dd9ad6b38e 100644 --- a/libs/angular/src/services/theming/themeBuilder.ts +++ b/libs/angular/src/services/theming/themeBuilder.ts @@ -1,4 +1,4 @@ -import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { ThemeType } from "@bitwarden/common/enums"; import { Theme } from "./theme"; diff --git a/libs/angular/src/services/theming/theming.service.abstraction.ts b/libs/angular/src/services/theming/theming.service.abstraction.ts index cacb3a10f22..0118e2f0c5f 100644 --- a/libs/angular/src/services/theming/theming.service.abstraction.ts +++ b/libs/angular/src/services/theming/theming.service.abstraction.ts @@ -1,6 +1,6 @@ import { Observable } from "rxjs"; -import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { ThemeType } from "@bitwarden/common/enums"; import { Theme } from "./theme"; diff --git a/libs/angular/src/services/theming/theming.service.ts b/libs/angular/src/services/theming/theming.service.ts index 7da6565e6d9..270cd92c4fe 100644 --- a/libs/angular/src/services/theming/theming.service.ts +++ b/libs/angular/src/services/theming/theming.service.ts @@ -3,7 +3,7 @@ import { Inject, Injectable } from "@angular/core"; import { BehaviorSubject, filter, fromEvent, Observable } from "rxjs"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { ThemeType } from "@bitwarden/common/enums"; import { WINDOW } from "../injection-tokens"; diff --git a/libs/angular/src/vault/components/add-edit-custom-fields.component.ts b/libs/angular/src/vault/components/add-edit-custom-fields.component.ts index 6b043981d64..063fd73838b 100644 --- a/libs/angular/src/vault/components/add-edit-custom-fields.component.ts +++ b/libs/angular/src/vault/components/add-edit-custom-fields.component.ts @@ -3,8 +3,7 @@ import { Directive, Input, OnChanges, SimpleChanges } from "@angular/core"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { EventType } from "@bitwarden/common/enums/eventType"; -import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { EventType, FieldType } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/angular/src/vault/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts index dc5105e211c..713db87c5f4 100644 --- a/libs/angular/src/vault/components/add-edit.component.ts +++ b/libs/angular/src/vault/components/add-edit.component.ts @@ -18,9 +18,7 @@ import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enum import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; -import { EventType } from "@bitwarden/common/enums/eventType"; -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; -import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; +import { EventType, SecureNoteType, UriMatchType } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/libs/angular/src/vault/components/view-custom-fields.component.ts b/libs/angular/src/vault/components/view-custom-fields.component.ts index 55e12fcd13c..5ec247a09e5 100644 --- a/libs/angular/src/vault/components/view-custom-fields.component.ts +++ b/libs/angular/src/vault/components/view-custom-fields.component.ts @@ -1,8 +1,7 @@ import { Directive, Input } from "@angular/core"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { EventType } from "@bitwarden/common/enums/eventType"; -import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { EventType, FieldType } from "@bitwarden/common/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts index e286943216c..df5241e5495 100644 --- a/libs/angular/src/vault/components/view.component.ts +++ b/libs/angular/src/vault/components/view.component.ts @@ -22,8 +22,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; -import { EventType } from "@bitwarden/common/enums/eventType"; -import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { EventType, FieldType } from "@bitwarden/common/enums"; import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/libs/common/spec/models/domain/encArrayBuffer.spec.ts b/libs/common/spec/models/domain/encArrayBuffer.spec.ts index 51340dc9d8a..03b02b0ee45 100644 --- a/libs/common/spec/models/domain/encArrayBuffer.spec.ts +++ b/libs/common/spec/models/domain/encArrayBuffer.spec.ts @@ -1,4 +1,4 @@ -import { EncryptionType } from "@bitwarden/common/enums/encryptionType"; +import { EncryptionType } from "@bitwarden/common/enums"; import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; import { makeStaticByteArray } from "../../utils"; diff --git a/libs/common/spec/models/domain/encString.spec.ts b/libs/common/spec/models/domain/encString.spec.ts index a7e05584aab..2b1a94ce175 100644 --- a/libs/common/spec/models/domain/encString.spec.ts +++ b/libs/common/spec/models/domain/encString.spec.ts @@ -4,7 +4,7 @@ import { mock, MockProxy } from "jest-mock-extended"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { EncryptionType } from "@bitwarden/common/enums/encryptionType"; +import { EncryptionType } from "@bitwarden/common/enums"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { ContainerService } from "@bitwarden/common/services/container.service"; diff --git a/libs/common/spec/models/domain/symmetricCryptoKey.spec.ts b/libs/common/spec/models/domain/symmetricCryptoKey.spec.ts index 746c8471e92..ddd1cb5b706 100644 --- a/libs/common/spec/models/domain/symmetricCryptoKey.spec.ts +++ b/libs/common/spec/models/domain/symmetricCryptoKey.spec.ts @@ -1,4 +1,4 @@ -import { EncryptionType } from "@bitwarden/common/enums/encryptionType"; +import { EncryptionType } from "@bitwarden/common/enums"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { makeStaticByteArray } from "../../utils"; diff --git a/libs/common/spec/services/encrypt.service.spec.ts b/libs/common/spec/services/encrypt.service.spec.ts index 289ea65e447..60cf3688a75 100644 --- a/libs/common/spec/services/encrypt.service.spec.ts +++ b/libs/common/spec/services/encrypt.service.spec.ts @@ -2,7 +2,7 @@ import { mockReset, mock } from "jest-mock-extended"; import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { EncryptionType } from "@bitwarden/common/enums/encryptionType"; +import { EncryptionType } from "@bitwarden/common/enums"; import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; diff --git a/libs/common/spec/services/export.service.spec.ts b/libs/common/spec/services/export.service.spec.ts index 3e1e1ae0808..92d72542821 100644 --- a/libs/common/spec/services/export.service.spec.ts +++ b/libs/common/spec/services/export.service.spec.ts @@ -5,7 +5,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; -import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/enums/kdfType"; +import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { CipherWithIdExport as CipherExport } from "@bitwarden/common/models/export/cipher-with-ids.export"; diff --git a/libs/common/spec/services/stateMigration.service.spec.ts b/libs/common/spec/services/stateMigration.service.spec.ts index 5144835555c..c5918e9ca6b 100644 --- a/libs/common/spec/services/stateMigration.service.spec.ts +++ b/libs/common/spec/services/stateMigration.service.spec.ts @@ -2,7 +2,7 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; -import { StateVersion } from "@bitwarden/common/enums/stateVersion"; +import { StateVersion } from "@bitwarden/common/enums"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { Account } from "@bitwarden/common/models/domain/account"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; diff --git a/libs/common/src/abstractions/crypto.service.ts b/libs/common/src/abstractions/crypto.service.ts index cf05bb141d3..19a0017737d 100644 --- a/libs/common/src/abstractions/crypto.service.ts +++ b/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"; diff --git a/libs/common/src/abstractions/event/event-collection.service.ts b/libs/common/src/abstractions/event/event-collection.service.ts index ca6c545026f..c545ead9236 100644 --- a/libs/common/src/abstractions/event/event-collection.service.ts +++ b/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: ( diff --git a/libs/common/src/abstractions/file-upload/file-upload.service.ts b/libs/common/src/abstractions/file-upload/file-upload.service.ts index 35dc8a1d1c9..eff5a018a29 100644 --- a/libs/common/src/abstractions/file-upload/file-upload.service.ts +++ b/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"; diff --git a/libs/common/src/abstractions/log.service.ts b/libs/common/src/abstractions/log.service.ts index f5ba7fab3c0..ea8520a5206 100644 --- a/libs/common/src/abstractions/log.service.ts +++ b/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; diff --git a/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts b/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts index c4fe7628606..edc7f72d39f 100644 --- a/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts +++ b/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 { diff --git a/libs/common/src/abstractions/platformUtils.service.ts b/libs/common/src/abstractions/platformUtils.service.ts index f98d82e741d..0ce932d5268 100644 --- a/libs/common/src/abstractions/platformUtils.service.ts +++ b/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; diff --git a/libs/common/src/abstractions/state.service.ts b/libs/common/src/abstractions/state.service.ts index c3bcc880394..234d6b5d4f6 100644 --- a/libs/common/src/abstractions/state.service.ts +++ b/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"; diff --git a/libs/common/src/admin-console/models/data/organization.data.ts b/libs/common/src/admin-console/models/data/organization.data.ts index d58152d05fd..986591c00ed 100644 --- a/libs/common/src/admin-console/models/data/organization.data.ts +++ b/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"; diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts index 8f2e703515d..ca08930ca46 100644 --- a/libs/common/src/admin-console/models/domain/organization.ts +++ b/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"; diff --git a/libs/common/src/admin-console/models/response/profile-organization.response.ts b/libs/common/src/admin-console/models/response/profile-organization.response.ts index cd58bd55fe4..96cefaa2fde 100644 --- a/libs/common/src/admin-console/models/response/profile-organization.response.ts +++ b/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"; diff --git a/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts b/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts index a718e4c9bd7..c697ef25425 100644 --- a/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts +++ b/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"; diff --git a/libs/common/src/auth/login-strategies/password-login.strategy.ts b/libs/common/src/auth/login-strategies/password-login.strategy.ts index f0bd3a4aa93..224c28557f8 100644 --- a/libs/common/src/auth/login-strategies/password-login.strategy.ts +++ b/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"; diff --git a/libs/common/src/auth/models/request/identity-token/device.request.ts b/libs/common/src/auth/models/request/identity-token/device.request.ts index cabbb50585c..50d6c9c7e28 100644 --- a/libs/common/src/auth/models/request/identity-token/device.request.ts +++ b/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; diff --git a/libs/common/src/auth/models/request/identity-token/password-token.request.ts b/libs/common/src/auth/models/request/identity-token/password-token.request.ts index 7fe6f0e0c36..5fc8abe71aa 100644 --- a/libs/common/src/auth/models/request/identity-token/password-token.request.ts +++ b/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"; diff --git a/libs/common/src/auth/models/request/set-key-connector-key.request.ts b/libs/common/src/auth/models/request/set-key-connector-key.request.ts index 9d79e3c4249..5215288dc31 100644 --- a/libs/common/src/auth/models/request/set-key-connector-key.request.ts +++ b/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"; diff --git a/libs/common/src/auth/models/request/set-password.request.ts b/libs/common/src/auth/models/request/set-password.request.ts index 02f0f237efc..1fa6b4c7d29 100644 --- a/libs/common/src/auth/models/request/set-password.request.ts +++ b/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 { diff --git a/libs/common/src/auth/models/response/auth-request.response.ts b/libs/common/src/auth/models/response/auth-request.response.ts index 9d38edbeeb3..a8a3a7276d8 100644 --- a/libs/common/src/auth/models/response/auth-request.response.ts +++ b/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 diff --git a/libs/common/src/auth/models/response/device.response.ts b/libs/common/src/auth/models/response/device.response.ts index f1be55f0ce7..2770499e81e 100644 --- a/libs/common/src/auth/models/response/device.response.ts +++ b/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 { diff --git a/libs/common/src/auth/models/response/emergency-access.response.ts b/libs/common/src/auth/models/response/emergency-access.response.ts index 7c41bceb1e9..a8ec9a0c0fc 100644 --- a/libs/common/src/auth/models/response/emergency-access.response.ts +++ b/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"; diff --git a/libs/common/src/auth/models/response/identity-token.response.ts b/libs/common/src/auth/models/response/identity-token.response.ts index bac5a447da6..d71850dd8f7 100644 --- a/libs/common/src/auth/models/response/identity-token.response.ts +++ b/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 { diff --git a/libs/common/src/auth/models/response/prelogin.response.ts b/libs/common/src/auth/models/response/prelogin.response.ts index 3a21ad64ec3..83262f904b8 100644 --- a/libs/common/src/auth/models/response/prelogin.response.ts +++ b/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 { diff --git a/libs/common/src/auth/services/auth.service.ts b/libs/common/src/auth/services/auth.service.ts index 59c300f0a4e..7f1e77b6e76 100644 --- a/libs/common/src/auth/services/auth.service.ts +++ b/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"; diff --git a/libs/common/src/billing/models/response/plan.response.ts b/libs/common/src/billing/models/response/plan.response.ts index d2d18db6f55..6a634f7b1d7 100644 --- a/libs/common/src/billing/models/response/plan.response.ts +++ b/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"; diff --git a/libs/common/src/enums/clientType.ts b/libs/common/src/enums/client-type.enum.ts similarity index 100% rename from libs/common/src/enums/clientType.ts rename to libs/common/src/enums/client-type.enum.ts diff --git a/libs/common/src/enums/deviceType.ts b/libs/common/src/enums/device-type.enum.ts similarity index 100% rename from libs/common/src/enums/deviceType.ts rename to libs/common/src/enums/device-type.enum.ts diff --git a/libs/common/src/enums/encryptedExportType.ts b/libs/common/src/enums/encrypted-export-type.enum.ts similarity index 100% rename from libs/common/src/enums/encryptedExportType.ts rename to libs/common/src/enums/encrypted-export-type.enum.ts diff --git a/libs/common/src/enums/encryptionType.ts b/libs/common/src/enums/encryption-type.enum.ts similarity index 100% rename from libs/common/src/enums/encryptionType.ts rename to libs/common/src/enums/encryption-type.enum.ts diff --git a/libs/common/src/enums/event-system-user.ts b/libs/common/src/enums/event-system-user.enum.ts similarity index 100% rename from libs/common/src/enums/event-system-user.ts rename to libs/common/src/enums/event-system-user.enum.ts diff --git a/libs/common/src/enums/eventType.ts b/libs/common/src/enums/event-type.enum.ts similarity index 100% rename from libs/common/src/enums/eventType.ts rename to libs/common/src/enums/event-type.enum.ts diff --git a/libs/common/src/enums/fieldType.ts b/libs/common/src/enums/field-type.enum.ts similarity index 100% rename from libs/common/src/enums/fieldType.ts rename to libs/common/src/enums/field-type.enum.ts diff --git a/libs/common/src/enums/fileUploadType.ts b/libs/common/src/enums/file-upload-type.enum.ts similarity index 100% rename from libs/common/src/enums/fileUploadType.ts rename to libs/common/src/enums/file-upload-type.enum.ts diff --git a/libs/common/src/enums/hashPurpose.ts b/libs/common/src/enums/hash-purpose.enum.ts similarity index 100% rename from libs/common/src/enums/hashPurpose.ts rename to libs/common/src/enums/hash-purpose.enum.ts diff --git a/libs/common/src/enums/htmlStorageLocation.ts b/libs/common/src/enums/html-storage-location.enum.ts similarity index 100% rename from libs/common/src/enums/htmlStorageLocation.ts rename to libs/common/src/enums/html-storage-location.enum.ts diff --git a/libs/common/src/enums/index.ts b/libs/common/src/enums/index.ts new file mode 100644 index 00000000000..d51e50ca0f9 --- /dev/null +++ b/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"; diff --git a/libs/common/src/enums/kdfType.ts b/libs/common/src/enums/kdf-type.enum.ts similarity index 100% rename from libs/common/src/enums/kdfType.ts rename to libs/common/src/enums/kdf-type.enum.ts diff --git a/libs/common/src/enums/keySuffixOptions.ts b/libs/common/src/enums/key-suffix-options.enum.ts similarity index 100% rename from libs/common/src/enums/keySuffixOptions.ts rename to libs/common/src/enums/key-suffix-options.enum.ts diff --git a/libs/common/src/enums/linkedIdType.ts b/libs/common/src/enums/linked-id-type.enum.ts similarity index 100% rename from libs/common/src/enums/linkedIdType.ts rename to libs/common/src/enums/linked-id-type.enum.ts diff --git a/libs/common/src/enums/logLevelType.ts b/libs/common/src/enums/log-level-type.enum.ts similarity index 100% rename from libs/common/src/enums/logLevelType.ts rename to libs/common/src/enums/log-level-type.enum.ts diff --git a/libs/common/src/enums/nativeMessagingVersion.ts b/libs/common/src/enums/native-messaging-version.enum.ts similarity index 100% rename from libs/common/src/enums/nativeMessagingVersion.ts rename to libs/common/src/enums/native-messaging-version.enum.ts diff --git a/libs/common/src/enums/notificationType.ts b/libs/common/src/enums/notification-type.enum.ts similarity index 100% rename from libs/common/src/enums/notificationType.ts rename to libs/common/src/enums/notification-type.enum.ts diff --git a/libs/common/src/enums/productType.ts b/libs/common/src/enums/product-type.enum.ts similarity index 100% rename from libs/common/src/enums/productType.ts rename to libs/common/src/enums/product-type.enum.ts diff --git a/libs/common/src/enums/secureNoteType.ts b/libs/common/src/enums/secure-note-type.enum.ts similarity index 100% rename from libs/common/src/enums/secureNoteType.ts rename to libs/common/src/enums/secure-note-type.enum.ts diff --git a/libs/common/src/enums/stateVersion.ts b/libs/common/src/enums/state-version.enum.ts similarity index 100% rename from libs/common/src/enums/stateVersion.ts rename to libs/common/src/enums/state-version.enum.ts diff --git a/libs/common/src/enums/storageLocation.ts b/libs/common/src/enums/storage-location.enum.ts similarity index 100% rename from libs/common/src/enums/storageLocation.ts rename to libs/common/src/enums/storage-location.enum.ts diff --git a/libs/common/src/enums/themeType.ts b/libs/common/src/enums/theme-type.enum.ts similarity index 100% rename from libs/common/src/enums/themeType.ts rename to libs/common/src/enums/theme-type.enum.ts diff --git a/libs/common/src/enums/uriMatchType.ts b/libs/common/src/enums/uri-match-type.enum.ts similarity index 100% rename from libs/common/src/enums/uriMatchType.ts rename to libs/common/src/enums/uri-match-type.enum.ts diff --git a/libs/common/src/interfaces/IEncrypted.ts b/libs/common/src/interfaces/IEncrypted.ts index 0775a1aced1..9ad23b2f4b3 100644 --- a/libs/common/src/interfaces/IEncrypted.ts +++ b/libs/common/src/interfaces/IEncrypted.ts @@ -1,4 +1,4 @@ -import { EncryptionType } from "../enums/encryptionType"; +import { EncryptionType } from "../enums"; export interface IEncrypted { encryptionType?: EncryptionType; diff --git a/libs/common/src/misc/linkedFieldOption.decorator.ts b/libs/common/src/misc/linkedFieldOption.decorator.ts index 62755753a27..061aebedfd3 100644 --- a/libs/common/src/misc/linkedFieldOption.decorator.ts +++ b/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 { diff --git a/libs/common/src/models/api/field.api.ts b/libs/common/src/models/api/field.api.ts index 952ce514166..5df51cdb8b7 100644 --- a/libs/common/src/models/api/field.api.ts +++ b/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 { diff --git a/libs/common/src/models/api/login-uri.api.ts b/libs/common/src/models/api/login-uri.api.ts index ea84f165be3..9b6a1306e67 100644 --- a/libs/common/src/models/api/login-uri.api.ts +++ b/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 { diff --git a/libs/common/src/models/api/secure-note.api.ts b/libs/common/src/models/api/secure-note.api.ts index 3f48f709b30..619ce277cb2 100644 --- a/libs/common/src/models/api/secure-note.api.ts +++ b/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 { diff --git a/libs/common/src/models/data/event.data.ts b/libs/common/src/models/data/event.data.ts index 69031a8cd0f..2281f0258f7 100644 --- a/libs/common/src/models/data/event.data.ts +++ b/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; diff --git a/libs/common/src/models/domain/account.ts b/libs/common/src/models/domain/account.ts index 6f654f241c9..f894e02e414 100644 --- a/libs/common/src/models/domain/account.ts +++ b/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"; diff --git a/libs/common/src/models/domain/enc-array-buffer.ts b/libs/common/src/models/domain/enc-array-buffer.ts index 396c8663929..a3548c037e0 100644 --- a/libs/common/src/models/domain/enc-array-buffer.ts +++ b/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"; diff --git a/libs/common/src/models/domain/enc-string.ts b/libs/common/src/models/domain/enc-string.ts index f0ea7378f90..ac7e4c2390e 100644 --- a/libs/common/src/models/domain/enc-string.ts +++ b/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"; diff --git a/libs/common/src/models/domain/global-state.ts b/libs/common/src/models/domain/global-state.ts index b1c431abb77..8bafd976a9f 100644 --- a/libs/common/src/models/domain/global-state.ts +++ b/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"; diff --git a/libs/common/src/models/domain/storage-options.ts b/libs/common/src/models/domain/storage-options.ts index 7e21b194332..6ed430ac50f 100644 --- a/libs/common/src/models/domain/storage-options.ts +++ b/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; diff --git a/libs/common/src/models/domain/symmetric-crypto-key.ts b/libs/common/src/models/domain/symmetric-crypto-key.ts index 23d3c690a55..ac9781b3cf9 100644 --- a/libs/common/src/models/domain/symmetric-crypto-key.ts +++ b/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 { diff --git a/libs/common/src/models/export/event.export.ts b/libs/common/src/models/export/event.export.ts index 03800384c44..b1214b109db 100644 --- a/libs/common/src/models/export/event.export.ts +++ b/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 { diff --git a/libs/common/src/models/export/field.export.ts b/libs/common/src/models/export/field.export.ts index 3e63a91e2b1..645bec10867 100644 --- a/libs/common/src/models/export/field.export.ts +++ b/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"; diff --git a/libs/common/src/models/export/login-uri.export.ts b/libs/common/src/models/export/login-uri.export.ts index 03438cad14a..fd031f64754 100644 --- a/libs/common/src/models/export/login-uri.export.ts +++ b/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"; diff --git a/libs/common/src/models/export/secure-note.export.ts b/libs/common/src/models/export/secure-note.export.ts index 254f020bf19..4cef8f88a0a 100644 --- a/libs/common/src/models/export/secure-note.export.ts +++ b/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"; diff --git a/libs/common/src/models/request/event.request.ts b/libs/common/src/models/request/event.request.ts index 6b9bef44190..62d6a0b43d5 100644 --- a/libs/common/src/models/request/event.request.ts +++ b/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; diff --git a/libs/common/src/models/request/kdf.request.ts b/libs/common/src/models/request/kdf.request.ts index 18e117d88a9..0ae4ac8f006 100644 --- a/libs/common/src/models/request/kdf.request.ts +++ b/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; diff --git a/libs/common/src/models/request/register.request.ts b/libs/common/src/models/request/register.request.ts index f1419d2d597..30f05180930 100644 --- a/libs/common/src/models/request/register.request.ts +++ b/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"; diff --git a/libs/common/src/models/response/event.response.ts b/libs/common/src/models/response/event.response.ts index bf2c3ac6177..58551b34c2c 100644 --- a/libs/common/src/models/response/event.response.ts +++ b/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"; diff --git a/libs/common/src/models/response/notification.response.ts b/libs/common/src/models/response/notification.response.ts index 300eb1e8b52..9186fd24a30 100644 --- a/libs/common/src/models/response/notification.response.ts +++ b/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"; diff --git a/libs/common/src/models/view/event.view.ts b/libs/common/src/models/view/event.view.ts index 288f21c81fe..5eb5ddd9edb 100644 --- a/libs/common/src/models/view/event.view.ts +++ b/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; diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts index 9a6b29d48c7..952f2d53ec9 100644 --- a/libs/common/src/services/api.service.ts +++ b/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"; diff --git a/libs/common/src/services/appId.service.ts b/libs/common/src/services/appId.service.ts index 1c108da0806..a1baf4fc701 100644 --- a/libs/common/src/services/appId.service.ts +++ b/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 { diff --git a/libs/common/src/services/consoleLog.service.ts b/libs/common/src/services/consoleLog.service.ts index 8d48013bfac..23047f2a92b 100644 --- a/libs/common/src/services/consoleLog.service.ts +++ b/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 = new Map(); diff --git a/libs/common/src/services/crypto.service.ts b/libs/common/src/services/crypto.service.ts index 5c2c5d37bb3..4882d4a7ad7 100644 --- a/libs/common/src/services/crypto.service.ts +++ b/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"; diff --git a/libs/common/src/services/cryptography/encrypt.service.implementation.ts b/libs/common/src/services/cryptography/encrypt.service.implementation.ts index 86b2c795f84..a5a4e03658d 100644 --- a/libs/common/src/services/cryptography/encrypt.service.implementation.ts +++ b/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"; diff --git a/libs/common/src/services/event/event-collection.service.ts b/libs/common/src/services/event/event-collection.service.ts index 8d7e46e0a01..4f16b887788 100644 --- a/libs/common/src/services/event/event-collection.service.ts +++ b/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"; diff --git a/libs/common/src/services/export.service.ts b/libs/common/src/services/export.service.ts index 0367dc945cf..a562e8b3fa9 100644 --- a/libs/common/src/services/export.service.ts +++ b/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"; diff --git a/libs/common/src/services/file-upload/file-upload.service.ts b/libs/common/src/services/file-upload/file-upload.service.ts index 51be3f5a0fc..c7188181258 100644 --- a/libs/common/src/services/file-upload/file-upload.service.ts +++ b/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"; diff --git a/libs/common/src/services/notifications.service.ts b/libs/common/src/services/notifications.service.ts index a1ef5cd07c8..1f83b87fea9 100644 --- a/libs/common/src/services/notifications.service.ts +++ b/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, diff --git a/libs/common/src/services/search.service.ts b/libs/common/src/services/search.service.ts index 52c4becb006..880322c5e79 100644 --- a/libs/common/src/services/search.service.ts +++ b/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"; diff --git a/libs/common/src/services/state.service.ts b/libs/common/src/services/state.service.ts index 74a42d6d8ef..20663d2d819 100644 --- a/libs/common/src/services/state.service.ts +++ b/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"; diff --git a/libs/common/src/services/stateMigration.service.ts b/libs/common/src/services/stateMigration.service.ts index 4dc9b107b9a..a7be015e3fe 100644 --- a/libs/common/src/services/stateMigration.service.ts +++ b/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 { diff --git a/libs/common/src/tools/send/models/response/send-file-upload-data.response.ts b/libs/common/src/tools/send/models/response/send-file-upload-data.response.ts index 34eca030143..1098fb2f69f 100644 --- a/libs/common/src/tools/send/models/response/send-file-upload-data.response.ts +++ b/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"; diff --git a/libs/common/src/tools/send/services/send.service.ts b/libs/common/src/tools/send/services/send.service.ts index d30a3ae56bc..1f1e3da9182 100644 --- a/libs/common/src/tools/send/services/send.service.ts +++ b/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"; diff --git a/libs/common/src/vault/abstractions/cipher.service.ts b/libs/common/src/vault/abstractions/cipher.service.ts index c4955f95d4c..b92ce7c29a8 100644 --- a/libs/common/src/vault/abstractions/cipher.service.ts +++ b/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"; diff --git a/libs/common/src/vault/models/data/field.data.ts b/libs/common/src/vault/models/data/field.data.ts index 37d46babef9..5b2ec28fca2 100644 --- a/libs/common/src/vault/models/data/field.data.ts +++ b/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 { diff --git a/libs/common/src/vault/models/data/login-uri.data.ts b/libs/common/src/vault/models/data/login-uri.data.ts index 4fd5a15140d..ebe1d948ba0 100644 --- a/libs/common/src/vault/models/data/login-uri.data.ts +++ b/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 { diff --git a/libs/common/src/vault/models/data/secure-note.data.ts b/libs/common/src/vault/models/data/secure-note.data.ts index cc849db6c8b..09139974787 100644 --- a/libs/common/src/vault/models/data/secure-note.data.ts +++ b/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 { diff --git a/libs/common/src/vault/models/domain/cipher.spec.ts b/libs/common/src/vault/models/domain/cipher.spec.ts index 440097c87c2..c484af26d3c 100644 --- a/libs/common/src/vault/models/domain/cipher.spec.ts +++ b/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"; diff --git a/libs/common/src/vault/models/domain/field.spec.ts b/libs/common/src/vault/models/domain/field.spec.ts index 7fe219ec5f2..3f07f6905c3 100644 --- a/libs/common/src/vault/models/domain/field.spec.ts +++ b/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"; diff --git a/libs/common/src/vault/models/domain/field.ts b/libs/common/src/vault/models/domain/field.ts index 29d8b627909..b66b78a6460 100644 --- a/libs/common/src/vault/models/domain/field.ts +++ b/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"; diff --git a/libs/common/src/vault/models/domain/login-uri.spec.ts b/libs/common/src/vault/models/domain/login-uri.spec.ts index 1c990eca668..70fb24360f4 100644 --- a/libs/common/src/vault/models/domain/login-uri.spec.ts +++ b/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"; diff --git a/libs/common/src/vault/models/domain/login-uri.ts b/libs/common/src/vault/models/domain/login-uri.ts index 4a411d39dcb..4d8d6c98562 100644 --- a/libs/common/src/vault/models/domain/login-uri.ts +++ b/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"; diff --git a/libs/common/src/vault/models/domain/login.spec.ts b/libs/common/src/vault/models/domain/login.spec.ts index 1cc0981853a..654c66f8cf1 100644 --- a/libs/common/src/vault/models/domain/login.spec.ts +++ b/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"; diff --git a/libs/common/src/vault/models/domain/secure-note.spec.ts b/libs/common/src/vault/models/domain/secure-note.spec.ts index b78ad4120a7..aec3169a0c5 100644 --- a/libs/common/src/vault/models/domain/secure-note.spec.ts +++ b/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"; diff --git a/libs/common/src/vault/models/domain/secure-note.ts b/libs/common/src/vault/models/domain/secure-note.ts index 097635b9aa8..5f3ee673376 100644 --- a/libs/common/src/vault/models/domain/secure-note.ts +++ b/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"; diff --git a/libs/common/src/vault/models/response/attachment-upload-data.response.ts b/libs/common/src/vault/models/response/attachment-upload-data.response.ts index f2fbd02fc69..732f8e4f7fc 100644 --- a/libs/common/src/vault/models/response/attachment-upload-data.response.ts +++ b/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"; diff --git a/libs/common/src/vault/models/view/card.view.ts b/libs/common/src/vault/models/view/card.view.ts index e0bf8bc3789..abeb381a7a6 100644 --- a/libs/common/src/vault/models/view/card.view.ts +++ b/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"; diff --git a/libs/common/src/vault/models/view/cipher.view.ts b/libs/common/src/vault/models/view/cipher.view.ts index a6f038f6ca1..8284c94edf1 100644 --- a/libs/common/src/vault/models/view/cipher.view.ts +++ b/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"; diff --git a/libs/common/src/vault/models/view/field.view.ts b/libs/common/src/vault/models/view/field.view.ts index b41c3fdd367..29c6c3ad4ed 100644 --- a/libs/common/src/vault/models/view/field.view.ts +++ b/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"; diff --git a/libs/common/src/vault/models/view/identity.view.ts b/libs/common/src/vault/models/view/identity.view.ts index 978c2ec2fb5..9ee3fe29340 100644 --- a/libs/common/src/vault/models/view/identity.view.ts +++ b/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"; diff --git a/libs/common/src/vault/models/view/login-uri-view.spec.ts b/libs/common/src/vault/models/view/login-uri-view.spec.ts index 3d5656428ca..1467b228c72 100644 --- a/libs/common/src/vault/models/view/login-uri-view.spec.ts +++ b/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"; diff --git a/libs/common/src/vault/models/view/login-uri.view.ts b/libs/common/src/vault/models/view/login-uri.view.ts index 078c8c1457b..6dcc8100365 100644 --- a/libs/common/src/vault/models/view/login-uri.view.ts +++ b/libs/common/src/vault/models/view/login-uri.view.ts @@ -1,6 +1,6 @@ import { Jsonify } from "type-fest"; -import { UriMatchType } from "../../../enums/uriMatchType"; +import { UriMatchType } from "../../../enums"; import { Utils } from "../../../misc/utils"; import { View } from "../../../models/view/view"; import { LoginUri } from "../domain/login-uri"; diff --git a/libs/common/src/vault/models/view/login.view.ts b/libs/common/src/vault/models/view/login.view.ts index 3aea2205833..c8ba4b2c6ae 100644 --- a/libs/common/src/vault/models/view/login.view.ts +++ b/libs/common/src/vault/models/view/login.view.ts @@ -1,6 +1,6 @@ import { Jsonify } from "type-fest"; -import { LoginLinkedId as LinkedId } from "../../../enums/linkedIdType"; +import { LoginLinkedId as LinkedId } from "../../../enums"; import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator"; import { Utils } from "../../../misc/utils"; import { Login } from "../domain/login"; diff --git a/libs/common/src/vault/models/view/secure-note.view.ts b/libs/common/src/vault/models/view/secure-note.view.ts index 3fce6ed7e0e..a182d1c0503 100644 --- a/libs/common/src/vault/models/view/secure-note.view.ts +++ b/libs/common/src/vault/models/view/secure-note.view.ts @@ -1,6 +1,6 @@ import { Jsonify } from "type-fest"; -import { SecureNoteType } from "../../../enums/secureNoteType"; +import { SecureNoteType } from "../../../enums"; import { SecureNote } from "../domain/secure-note"; import { ItemView } from "./item.view"; diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts index 8a9b186043b..533683e858b 100644 --- a/libs/common/src/vault/services/cipher.service.ts +++ b/libs/common/src/vault/services/cipher.service.ts @@ -8,8 +8,7 @@ import { LogService } from "../../abstractions/log.service"; import { SearchService } from "../../abstractions/search.service"; import { SettingsService } from "../../abstractions/settings.service"; import { StateService } from "../../abstractions/state.service"; -import { FieldType } from "../../enums/fieldType"; -import { UriMatchType } from "../../enums/uriMatchType"; +import { FieldType, UriMatchType } from "../../enums"; import { sequentialize } from "../../misc/sequentialize"; import { Utils } from "../../misc/utils"; import { AccountSettingsSettings } from "../../models/domain/account"; diff --git a/libs/importer/spec/bitwarden-password-protected-importer.spec.ts b/libs/importer/spec/bitwarden-password-protected-importer.spec.ts index 2dc12bdb84e..2ca41e1ee37 100644 --- a/libs/importer/spec/bitwarden-password-protected-importer.spec.ts +++ b/libs/importer/spec/bitwarden-password-protected-importer.spec.ts @@ -3,7 +3,7 @@ import { Substitute, Arg, SubstituteOf } from "@fluffy-spoon/substitute"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { KdfType } from "@bitwarden/common/enums/kdfType"; +import { KdfType } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { BitwardenPasswordProtectedImporter } from "../src/importers"; diff --git a/libs/importer/spec/lastpass-csv-importer.spec.ts b/libs/importer/spec/lastpass-csv-importer.spec.ts index 4e11ba4d78c..e2f9b141401 100644 --- a/libs/importer/spec/lastpass-csv-importer.spec.ts +++ b/libs/importer/spec/lastpass-csv-importer.spec.ts @@ -1,4 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { FieldType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/libs/importer/spec/nordpass-csv-importer.spec.ts b/libs/importer/spec/nordpass-csv-importer.spec.ts index d9b0e9dbf28..8e681262a5c 100644 --- a/libs/importer/spec/nordpass-csv-importer.spec.ts +++ b/libs/importer/spec/nordpass-csv-importer.spec.ts @@ -1,4 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; diff --git a/libs/importer/spec/onepassword-1pif-importer.spec.ts b/libs/importer/spec/onepassword-1pif-importer.spec.ts index 9d74cb900fb..f71e6e3df96 100644 --- a/libs/importer/spec/onepassword-1pif-importer.spec.ts +++ b/libs/importer/spec/onepassword-1pif-importer.spec.ts @@ -1,4 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { FieldType } from "@bitwarden/common/enums"; import { OnePassword1PifImporter } from "../src/importers"; diff --git a/libs/importer/spec/onepassword-1pux-importer.spec.ts b/libs/importer/spec/onepassword-1pux-importer.spec.ts index 75c58189f6f..dd4b08ff126 100644 --- a/libs/importer/spec/onepassword-1pux-importer.spec.ts +++ b/libs/importer/spec/onepassword-1pux-importer.spec.ts @@ -1,5 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/libs/importer/spec/onepassword-win-csv-importer.spec.ts b/libs/importer/spec/onepassword-win-csv-importer.spec.ts index ddab4df562e..8d4b2b7d8b8 100644 --- a/libs/importer/spec/onepassword-win-csv-importer.spec.ts +++ b/libs/importer/spec/onepassword-win-csv-importer.spec.ts @@ -1,4 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { FieldType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/libs/importer/spec/psono-json-importer.spec.ts b/libs/importer/spec/psono-json-importer.spec.ts index fc33a66c14b..cc7e95cf183 100644 --- a/libs/importer/spec/psono-json-importer.spec.ts +++ b/libs/importer/spec/psono-json-importer.spec.ts @@ -1,4 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { FieldType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/libs/importer/src/importers/avast/avast-json-importer.ts b/libs/importer/src/importers/avast/avast-json-importer.ts index fa11934ff48..08596032307 100644 --- a/libs/importer/src/importers/avast/avast-json-importer.ts +++ b/libs/importer/src/importers/avast/avast-json-importer.ts @@ -1,4 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { ImportResult } from "../../models/import-result"; diff --git a/libs/importer/src/importers/base-importer.ts b/libs/importer/src/importers/base-importer.ts index 2ca2f1e9824..ee93c0144ce 100644 --- a/libs/importer/src/importers/base-importer.ts +++ b/libs/importer/src/importers/base-importer.ts @@ -2,8 +2,7 @@ import * as papa from "papaparse"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; -import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; import { Utils } from "@bitwarden/common/misc/utils"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; diff --git a/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts index d761401d712..45bfc0f1275 100644 --- a/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts +++ b/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts @@ -1,6 +1,5 @@ import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; -import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts index 61211ed6935..4473fbfcb37 100644 --- a/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts +++ b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts @@ -1,7 +1,7 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; -import { KdfType } from "@bitwarden/common/enums/kdfType"; +import { KdfType } from "@bitwarden/common/enums"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; diff --git a/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts b/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts index fa2b5bb6d85..fee70e4a1c9 100644 --- a/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts +++ b/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts @@ -1,4 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/importer/src/importers/dashlane/dashlane-json-importer.ts b/libs/importer/src/importers/dashlane/dashlane-json-importer.ts index 451fb35465c..1037df096b9 100644 --- a/libs/importer/src/importers/dashlane/dashlane-json-importer.ts +++ b/libs/importer/src/importers/dashlane/dashlane-json-importer.ts @@ -1,4 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/importer/src/importers/enpass/enpass-csv-importer.ts b/libs/importer/src/importers/enpass/enpass-csv-importer.ts index 9d3907b2a25..26611b182e4 100644 --- a/libs/importer/src/importers/enpass/enpass-csv-importer.ts +++ b/libs/importer/src/importers/enpass/enpass-csv-importer.ts @@ -1,4 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; diff --git a/libs/importer/src/importers/enpass/enpass-json-importer.ts b/libs/importer/src/importers/enpass/enpass-json-importer.ts index efd4075ff34..0af291e0ca8 100644 --- a/libs/importer/src/importers/enpass/enpass-json-importer.ts +++ b/libs/importer/src/importers/enpass/enpass-json-importer.ts @@ -1,4 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { FieldType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/importer/src/importers/keepass2-xml-importer.ts b/libs/importer/src/importers/keepass2-xml-importer.ts index 73c10ee79cc..15f379acbb9 100644 --- a/libs/importer/src/importers/keepass2-xml-importer.ts +++ b/libs/importer/src/importers/keepass2-xml-importer.ts @@ -1,4 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { FieldType } from "@bitwarden/common/enums"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { ImportResult } from "../models/import-result"; diff --git a/libs/importer/src/importers/lastpass-csv-importer.ts b/libs/importer/src/importers/lastpass-csv-importer.ts index 3346b82cf7d..53d46b831f3 100644 --- a/libs/importer/src/importers/lastpass-csv-importer.ts +++ b/libs/importer/src/importers/lastpass-csv-importer.ts @@ -1,4 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/importer/src/importers/msecure-csv-importer.ts b/libs/importer/src/importers/msecure-csv-importer.ts index 9063ba5edae..1ed5ff76e4a 100644 --- a/libs/importer/src/importers/msecure-csv-importer.ts +++ b/libs/importer/src/importers/msecure-csv-importer.ts @@ -1,4 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; diff --git a/libs/importer/src/importers/myki-csv-importer.ts b/libs/importer/src/importers/myki-csv-importer.ts index cea29a6e162..1b6fd9afdbc 100644 --- a/libs/importer/src/importers/myki-csv-importer.ts +++ b/libs/importer/src/importers/myki-csv-importer.ts @@ -1,4 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/importer/src/importers/nordpass-csv-importer.ts b/libs/importer/src/importers/nordpass-csv-importer.ts index 895f095de73..7eb445335aa 100644 --- a/libs/importer/src/importers/nordpass-csv-importer.ts +++ b/libs/importer/src/importers/nordpass-csv-importer.ts @@ -1,4 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; diff --git a/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts b/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts index c675a20d301..688adf3bd7a 100644 --- a/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts @@ -1,5 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts index dcafa1e33d2..ebf596a72e9 100644 --- a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts @@ -1,5 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; diff --git a/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts b/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts index 8104407e469..f756d619417 100644 --- a/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts @@ -1,4 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { FieldType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/libs/importer/src/importers/psono/psono-json-importer.ts b/libs/importer/src/importers/psono/psono-json-importer.ts index 6bafef75c40..a050f3891af 100644 --- a/libs/importer/src/importers/psono/psono-json-importer.ts +++ b/libs/importer/src/importers/psono/psono-json-importer.ts @@ -1,5 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view"; diff --git a/libs/importer/src/importers/safeincloud-xml-importer.ts b/libs/importer/src/importers/safeincloud-xml-importer.ts index df73267122e..e83ef3c7f5f 100644 --- a/libs/importer/src/importers/safeincloud-xml-importer.ts +++ b/libs/importer/src/importers/safeincloud-xml-importer.ts @@ -1,5 +1,4 @@ -import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { FieldType, SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; diff --git a/libs/importer/src/importers/truekey-csv-importer.ts b/libs/importer/src/importers/truekey-csv-importer.ts index 2028882d3dd..f2352ac3a8b 100644 --- a/libs/importer/src/importers/truekey-csv-importer.ts +++ b/libs/importer/src/importers/truekey-csv-importer.ts @@ -1,4 +1,4 @@ -import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { SecureNoteType } from "@bitwarden/common/enums"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view";