diff --git a/.eslintrc.json b/.eslintrc.json index fae64d869e..8485a9f30a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -96,6 +96,39 @@ } ] } - ] - } + ], + "no-restricted-imports": ["error", { "patterns": ["src/**/*"] }] + }, + "overrides": [ + { + "files": ["libs/common/src/**/*.ts"], + "rules": { + "no-restricted-imports": ["error", { "patterns": ["@bitwarden/common/*", "src/**/*"] }] + } + }, + { + "files": ["libs/components/src/**/*.ts"], + "rules": { + "no-restricted-imports": ["error", { "patterns": ["@bitwarden/components/*", "src/**/*"] }] + } + }, + { + "files": ["libs/angular/src/**/*.ts"], + "rules": { + "no-restricted-imports": ["error", { "patterns": ["@bitwarden/angular/*", "src/**/*"] }] + } + }, + { + "files": ["libs/node/src/**/*.ts"], + "rules": { + "no-restricted-imports": ["error", { "patterns": ["@bitwarden/node/*", "src/**/*"] }] + } + }, + { + "files": ["libs/electron/src/**/*.ts"], + "rules": { + "no-restricted-imports": ["error", { "patterns": ["@bitwarden/electron/*", "src/**/*"] }] + } + } + ] } diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts index bb84fb4f0e..652996e252 100644 --- a/apps/browser/src/background/runtime.background.ts +++ b/apps/browser/src/background/runtime.background.ts @@ -5,10 +5,9 @@ import { NotificationsService } from "@bitwarden/common/abstractions/notificatio import { SystemService } from "@bitwarden/common/abstractions/system.service"; import { Utils } from "@bitwarden/common/misc/utils"; -import { BrowserEnvironmentService } from "src/services/browser-environment.service"; - import { BrowserApi } from "../browser/browserApi"; import { AutofillService } from "../services/abstractions/autofill.service"; +import { BrowserEnvironmentService } from "../services/browser-environment.service"; import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service"; import MainBackground from "./main.background"; diff --git a/apps/browser/src/content/notificationBar.ts b/apps/browser/src/content/notificationBar.ts index dcb9ce0453..92730e1629 100644 --- a/apps/browser/src/content/notificationBar.ts +++ b/apps/browser/src/content/notificationBar.ts @@ -1,5 +1,5 @@ -import AddLoginRuntimeMessage from "src/background/models/addLoginRuntimeMessage"; -import ChangePasswordRuntimeMessage from "src/background/models/changePasswordRuntimeMessage"; +import AddLoginRuntimeMessage from "../background/models/addLoginRuntimeMessage"; +import ChangePasswordRuntimeMessage from "../background/models/changePasswordRuntimeMessage"; document.addEventListener("DOMContentLoaded", (event) => { if (window.location.hostname.endsWith("vault.bitwarden.com")) { diff --git a/apps/browser/src/popup/vault/ciphers.component.ts b/apps/browser/src/popup/vault/ciphers.component.ts index 60a92e238c..34d567bbe4 100644 --- a/apps/browser/src/popup/vault/ciphers.component.ts +++ b/apps/browser/src/popup/vault/ciphers.component.ts @@ -19,9 +19,8 @@ import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { CollectionView } from "@bitwarden/common/models/view/collectionView"; import { FolderView } from "@bitwarden/common/models/view/folderView"; -import { BrowserComponentState } from "src/models/browserComponentState"; - import { BrowserApi } from "../../browser/browserApi"; +import { BrowserComponentState } from "../../models/browserComponentState"; import { StateService } from "../../services/abstractions/state.service"; import { VaultFilterService } from "../../services/vaultFilter.service"; import { PopupUtilsService } from "../services/popup-utils.service"; diff --git a/apps/browser/src/popup/vault/vault-filter.component.ts b/apps/browser/src/popup/vault/vault-filter.component.ts index 13b3018b66..0abc16e1ec 100644 --- a/apps/browser/src/popup/vault/vault-filter.component.ts +++ b/apps/browser/src/popup/vault/vault-filter.component.ts @@ -16,9 +16,8 @@ import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { CollectionView } from "@bitwarden/common/models/view/collectionView"; import { FolderView } from "@bitwarden/common/models/view/folderView"; -import { BrowserGroupingsComponentState } from "src/models/browserGroupingsComponentState"; - import { BrowserApi } from "../../browser/browserApi"; +import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState"; import { StateService } from "../../services/abstractions/state.service"; import { VaultFilterService } from "../../services/vaultFilter.service"; import { PopupUtilsService } from "../services/popup-utils.service"; diff --git a/apps/browser/src/services/abstractions/state.service.ts b/apps/browser/src/services/abstractions/state.service.ts index 2f0112ff64..0f552154d6 100644 --- a/apps/browser/src/services/abstractions/state.service.ts +++ b/apps/browser/src/services/abstractions/state.service.ts @@ -3,10 +3,10 @@ import { Jsonify } from "type-fest"; import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; -import { Account } from "src/models/account"; -import { BrowserComponentState } from "src/models/browserComponentState"; -import { BrowserGroupingsComponentState } from "src/models/browserGroupingsComponentState"; -import { BrowserSendComponentState } from "src/models/browserSendComponentState"; +import { Account } from "../../models/account"; +import { BrowserComponentState } from "../../models/browserComponentState"; +import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState"; +import { BrowserSendComponentState } from "../../models/browserSendComponentState"; export abstract class StateService extends BaseStateServiceAbstraction { abstract getFromSessionMemory(key: string, deserializer?: (obj: Jsonify) => T): Promise; diff --git a/apps/cli/src/commands/delete.command.ts b/apps/cli/src/commands/delete.command.ts index 4ad4ac592a..9a4480df68 100644 --- a/apps/cli/src/commands/delete.command.ts +++ b/apps/cli/src/commands/delete.command.ts @@ -6,7 +6,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Utils } from "@bitwarden/common/misc/utils"; import { Response } from "@bitwarden/node/cli/models/response"; -import { CliUtils } from "src/utils"; +import { CliUtils } from "../utils"; export class DeleteCommand { constructor( diff --git a/apps/cli/src/commands/sync.command.ts b/apps/cli/src/commands/sync.command.ts index 40fc42fb41..6ba4166826 100644 --- a/apps/cli/src/commands/sync.command.ts +++ b/apps/cli/src/commands/sync.command.ts @@ -3,7 +3,7 @@ import { Response } from "@bitwarden/node/cli/models/response"; import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; import { StringResponse } from "@bitwarden/node/cli/models/response/stringResponse"; -import { CliUtils } from "src/utils"; +import { CliUtils } from "../utils"; export class SyncCommand { constructor(private syncService: SyncService) {} diff --git a/apps/desktop/src/main/biometric/biometric.windows.main.ts b/apps/desktop/src/main/biometric/biometric.windows.main.ts index 3cdd26e308..01e3b563f2 100644 --- a/apps/desktop/src/main/biometric/biometric.windows.main.ts +++ b/apps/desktop/src/main/biometric/biometric.windows.main.ts @@ -6,7 +6,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { biometrics } from "@bitwarden/desktop-native"; import { WindowMain } from "@bitwarden/electron/window.main"; -import { BiometricMain } from "src/main/biometric/biometric.main"; +import { BiometricMain } from "./biometric.main"; export default class BiometricWindowsMain implements BiometricMain { constructor( diff --git a/apps/desktop/src/services/encryptedMessageHandlerService.ts b/apps/desktop/src/services/encryptedMessageHandlerService.ts index 86c47d93df..1dd6618595 100644 --- a/apps/desktop/src/services/encryptedMessageHandlerService.ts +++ b/apps/desktop/src/services/encryptedMessageHandlerService.ts @@ -10,18 +10,18 @@ import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; import { LoginView } from "@bitwarden/common/models/view/loginView"; -import { DecryptedCommandData } from "src/models/nativeMessaging/decryptedCommandData"; -import { CredentialCreatePayload } from "src/models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload"; -import { CredentialRetrievePayload } from "src/models/nativeMessaging/encryptedMessagePayloads/credentialRetrievePayload"; -import { CredentialUpdatePayload } from "src/models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload"; -import { PasswordGeneratePayload } from "src/models/nativeMessaging/encryptedMessagePayloads/passwordGeneratePayload"; -import { AccountStatusResponse } from "src/models/nativeMessaging/encryptedMessageResponses/accountStatusResponse"; -import { CipherResponse } from "src/models/nativeMessaging/encryptedMessageResponses/cipherResponse"; -import { EncyptedMessageResponse } from "src/models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse"; -import { FailureStatusResponse } from "src/models/nativeMessaging/encryptedMessageResponses/failureStatusResponse"; -import { GenerateResponse } from "src/models/nativeMessaging/encryptedMessageResponses/generateResponse"; -import { SuccessStatusResponse } from "src/models/nativeMessaging/encryptedMessageResponses/successStatusResponse"; -import { UserStatusErrorResponse } from "src/models/nativeMessaging/encryptedMessageResponses/userStatusErrorResponse"; +import { DecryptedCommandData } from "../models/nativeMessaging/decryptedCommandData"; +import { CredentialCreatePayload } from "../models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload"; +import { CredentialRetrievePayload } from "../models/nativeMessaging/encryptedMessagePayloads/credentialRetrievePayload"; +import { CredentialUpdatePayload } from "../models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload"; +import { PasswordGeneratePayload } from "../models/nativeMessaging/encryptedMessagePayloads/passwordGeneratePayload"; +import { AccountStatusResponse } from "../models/nativeMessaging/encryptedMessageResponses/accountStatusResponse"; +import { CipherResponse } from "../models/nativeMessaging/encryptedMessageResponses/cipherResponse"; +import { EncyptedMessageResponse } from "../models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse"; +import { FailureStatusResponse } from "../models/nativeMessaging/encryptedMessageResponses/failureStatusResponse"; +import { GenerateResponse } from "../models/nativeMessaging/encryptedMessageResponses/generateResponse"; +import { SuccessStatusResponse } from "../models/nativeMessaging/encryptedMessageResponses/successStatusResponse"; +import { UserStatusErrorResponse } from "../models/nativeMessaging/encryptedMessageResponses/userStatusErrorResponse"; import { StateService } from "./state.service"; diff --git a/apps/desktop/src/services/nativeMessageHandler.service.ts b/apps/desktop/src/services/nativeMessageHandler.service.ts index 138a2d5e7f..916bd86bc8 100644 --- a/apps/desktop/src/services/nativeMessageHandler.service.ts +++ b/apps/desktop/src/services/nativeMessageHandler.service.ts @@ -12,12 +12,12 @@ import { EncString } from "@bitwarden/common/models/domain/encString"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; import { StateService } from "@bitwarden/common/services/state.service"; -import { DecryptedCommandData } from "src/models/nativeMessaging/decryptedCommandData"; -import { EncryptedMessage } from "src/models/nativeMessaging/encryptedMessage"; -import { EncryptedMessageResponse } from "src/models/nativeMessaging/encryptedMessageResponse"; -import { Message } from "src/models/nativeMessaging/message"; -import { UnencryptedMessage } from "src/models/nativeMessaging/unencryptedMessage"; -import { UnencryptedMessageResponse } from "src/models/nativeMessaging/unencryptedMessageResponse"; +import { DecryptedCommandData } from "../models/nativeMessaging/decryptedCommandData"; +import { EncryptedMessage } from "../models/nativeMessaging/encryptedMessage"; +import { EncryptedMessageResponse } from "../models/nativeMessaging/encryptedMessageResponse"; +import { Message } from "../models/nativeMessaging/message"; +import { UnencryptedMessage } from "../models/nativeMessaging/unencryptedMessage"; +import { UnencryptedMessageResponse } from "../models/nativeMessaging/unencryptedMessageResponse"; import { EncryptedMessageHandlerService } from "./encryptedMessageHandlerService"; diff --git a/apps/desktop/src/services/nativeMessaging.service.ts b/apps/desktop/src/services/nativeMessaging.service.ts index 11d59472bf..2ff014fb24 100644 --- a/apps/desktop/src/services/nativeMessaging.service.ts +++ b/apps/desktop/src/services/nativeMessaging.service.ts @@ -14,9 +14,9 @@ import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/encString"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; -import { LegacyMessage } from "src/models/nativeMessaging/legacyMessage"; -import { LegacyMessageWrapper } from "src/models/nativeMessaging/legacyMessageWrapper"; -import { Message } from "src/models/nativeMessaging/message"; +import { LegacyMessage } from "../models/nativeMessaging/legacyMessage"; +import { LegacyMessageWrapper } from "../models/nativeMessaging/legacyMessageWrapper"; +import { Message } from "../models/nativeMessaging/message"; import { NativeMessageHandlerService } from "./nativeMessageHandler.service"; diff --git a/apps/web/.eslintrc.json b/apps/web/.eslintrc.json index b752b4be21..6f171a4bed 100644 --- a/apps/web/.eslintrc.json +++ b/apps/web/.eslintrc.json @@ -6,7 +6,13 @@ "no-restricted-imports": [ "error", { - "patterns": ["**/app/core/*", "**/reports/*", "**/app/shared/*", "@bitwarden/web-vault/*"] + "patterns": [ + "**/app/core/*", + "**/reports/*", + "**/app/shared/*", + "@bitwarden/web-vault/*", + "src/**/*" + ] } ] } diff --git a/libs/angular/src/components/register.component.ts b/libs/angular/src/components/register.component.ts index 5d0e708d81..2fba778129 100644 --- a/libs/angular/src/components/register.component.ts +++ b/libs/angular/src/components/register.component.ts @@ -2,7 +2,6 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { AbstractControl, UntypedFormBuilder, ValidatorFn, Validators } from "@angular/forms"; import { Router } from "@angular/router"; -import { InputsFieldMatch } from "@bitwarden/angular/validators/inputsFieldMatch.validator"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuthService } from "@bitwarden/common/abstractions/auth.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; @@ -24,6 +23,7 @@ import { RegisterRequest } from "@bitwarden/common/models/request/registerReques import { RegisterResponse } from "@bitwarden/common/models/response/authentication/registerResponse"; import { PasswordColorText } from "../shared/components/password-strength/password-strength.component"; +import { InputsFieldMatch } from "../validators/inputsFieldMatch.validator"; import { CaptchaProtectedComponent } from "./captchaProtected.component"; diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index 213f561749..83ed944bc8 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -1,7 +1,5 @@ import { Injector, LOCALE_ID, NgModule } from "@angular/core"; -import { ThemingService } from "@bitwarden/angular/services/theming/theming.service"; -import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service"; import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/abstractions/account/account-api.service.abstraction"; import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/abstractions/account/account.service.abstraction"; @@ -127,6 +125,8 @@ import { } from "./injection-tokens"; import { ModalService } from "./modal.service"; import { PasswordRepromptService } from "./passwordReprompt.service"; +import { ThemingService } from "./theming/theming.service"; +import { AbstractThemingService } from "./theming/theming.service.abstraction"; import { ValidationService } from "./validation.service"; @NgModule({ diff --git a/libs/common/src/abstractions/abstractEncrypt.service.ts b/libs/common/src/abstractions/abstractEncrypt.service.ts index c683f22d33..35760f9b75 100644 --- a/libs/common/src/abstractions/abstractEncrypt.service.ts +++ b/libs/common/src/abstractions/abstractEncrypt.service.ts @@ -1,8 +1,7 @@ -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; - import { IEncrypted } from "../interfaces/IEncrypted"; import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; +import { EncString } from "../models/domain/encString"; +import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; export abstract class AbstractEncryptService { abstract encrypt(plainValue: string | ArrayBuffer, key: SymmetricCryptoKey): Promise; diff --git a/libs/common/src/abstractions/account/account-api.service.abstraction.ts b/libs/common/src/abstractions/account/account-api.service.abstraction.ts index c8f382e4ca..6c838e5b18 100644 --- a/libs/common/src/abstractions/account/account-api.service.abstraction.ts +++ b/libs/common/src/abstractions/account/account-api.service.abstraction.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; +import { SecretVerificationRequest } from "../../models/request/secretVerificationRequest"; export abstract class AccountApiService { abstract deleteAccount(request: SecretVerificationRequest): Promise; diff --git a/libs/common/src/abstractions/config/config-api.service.abstraction.ts b/libs/common/src/abstractions/config/config-api.service.abstraction.ts index 3ebd79e4fc..9f7b82d78e 100644 --- a/libs/common/src/abstractions/config/config-api.service.abstraction.ts +++ b/libs/common/src/abstractions/config/config-api.service.abstraction.ts @@ -1,4 +1,4 @@ -import { ServerConfigResponse } from "@bitwarden/common/models/response/server-config-response"; +import { ServerConfigResponse } from "../../models/response/server-config-response"; export abstract class ConfigApiServiceAbstraction { get: () => Promise; diff --git a/libs/common/src/abstractions/config/server-config.ts b/libs/common/src/abstractions/config/server-config.ts index c6c008a8cc..c0334176d0 100644 --- a/libs/common/src/abstractions/config/server-config.ts +++ b/libs/common/src/abstractions/config/server-config.ts @@ -2,7 +2,7 @@ import { ServerConfigData, ThirdPartyServerConfigData, EnvironmentServerConfigData, -} from "@bitwarden/common/models/data/server-config.data"; +} from "../../models/data/server-config.data"; const dayInMilliseconds = 24 * 3600 * 1000; const eighteenHoursInMilliseconds = 18 * 3600 * 1000; diff --git a/libs/common/src/abstractions/folder/folder-api.service.abstraction.ts b/libs/common/src/abstractions/folder/folder-api.service.abstraction.ts index 97f3b724af..ac925c25b6 100644 --- a/libs/common/src/abstractions/folder/folder-api.service.abstraction.ts +++ b/libs/common/src/abstractions/folder/folder-api.service.abstraction.ts @@ -1,5 +1,5 @@ -import { Folder } from "@bitwarden/common/models/domain/folder"; -import { FolderResponse } from "@bitwarden/common/models/response/folderResponse"; +import { Folder } from "../../models/domain/folder"; +import { FolderResponse } from "../../models/response/folderResponse"; export class FolderApiServiceAbstraction { save: (folder: Folder) => Promise; diff --git a/libs/common/src/abstractions/policy/policy-api.service.abstraction.ts b/libs/common/src/abstractions/policy/policy-api.service.abstraction.ts index fb9c4dcd10..fe81cc7a0b 100644 --- a/libs/common/src/abstractions/policy/policy-api.service.abstraction.ts +++ b/libs/common/src/abstractions/policy/policy-api.service.abstraction.ts @@ -1,9 +1,9 @@ -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; -import { Policy } from "@bitwarden/common/models/domain/policy"; -import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest"; -import { ListResponse } from "@bitwarden/common/models/response/listResponse"; -import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; +import { PolicyType } from "../../enums/policyType"; +import { MasterPasswordPolicyOptions } from "../../models/domain/masterPasswordPolicyOptions"; +import { Policy } from "../../models/domain/policy"; +import { PolicyRequest } from "../../models/request/policyRequest"; +import { ListResponse } from "../../models/response/listResponse"; +import { PolicyResponse } from "../../models/response/policyResponse"; export class PolicyApiServiceAbstraction { getPolicy: (organizationId: string, type: PolicyType) => Promise; diff --git a/libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts b/libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts index c54077ef18..8e82ed8faa 100644 --- a/libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts +++ b/libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts @@ -1,4 +1,4 @@ -import { VerifyOTPRequest } from "@bitwarden/common/models/request/account/verifyOTPRequest"; +import { VerifyOTPRequest } from "../../models/request/account/verifyOTPRequest"; export abstract class UserVerificationApiServiceAbstraction { postAccountVerifyOTP: (request: VerifyOTPRequest) => Promise; diff --git a/libs/common/src/misc/utils.ts b/libs/common/src/misc/utils.ts index 2c989be9cb..21ddb651e0 100644 --- a/libs/common/src/misc/utils.ts +++ b/libs/common/src/misc/utils.ts @@ -1,9 +1,8 @@ /* eslint-disable no-useless-escape */ import * as tldjs from "tldjs"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; - import { AbstractEncryptService } from "../abstractions/abstractEncrypt.service"; +import { CryptoService } from "../abstractions/crypto.service"; import { I18nService } from "../abstractions/i18n.service"; const nodeURL = typeof window === "undefined" ? require("url") : null; diff --git a/libs/common/src/models/api/scimConfigApi.ts b/libs/common/src/models/api/scimConfigApi.ts index 2269ac5969..d93798f12b 100644 --- a/libs/common/src/models/api/scimConfigApi.ts +++ b/libs/common/src/models/api/scimConfigApi.ts @@ -1,5 +1,4 @@ -import { ScimProviderType } from "@bitwarden/common/enums/scimProviderType"; - +import { ScimProviderType } from "../../enums/scimProviderType"; import { BaseResponse } from "../response/baseResponse"; export class ScimConfigApi extends BaseResponse { diff --git a/libs/common/src/models/domain/account-keys.spec.ts b/libs/common/src/models/domain/account-keys.spec.ts index bf8348e15a..c3c69e1908 100644 --- a/libs/common/src/models/domain/account-keys.spec.ts +++ b/libs/common/src/models/domain/account-keys.spec.ts @@ -1,6 +1,5 @@ -import { Utils } from "@bitwarden/common/misc/utils"; - import { makeStaticByteArray } from "../../../spec/utils"; +import { Utils } from "../../misc/utils"; import { AccountKeys, EncryptionPair } from "./account"; import { SymmetricCryptoKey } from "./symmetricCryptoKey"; diff --git a/libs/common/src/models/domain/account.ts b/libs/common/src/models/domain/account.ts index 5822af35c0..754eda7391 100644 --- a/libs/common/src/models/domain/account.ts +++ b/libs/common/src/models/domain/account.ts @@ -1,11 +1,10 @@ import { Except, Jsonify } from "type-fest"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify"; - import { AuthenticationStatus } from "../../enums/authenticationStatus"; import { KdfType } from "../../enums/kdfType"; import { UriMatchType } from "../../enums/uriMatchType"; +import { Utils } from "../../misc/utils"; +import { DeepJsonify } from "../../types/deep-jsonify"; import { CipherData } from "../data/cipherData"; import { CollectionData } from "../data/collectionData"; import { EncryptedOrganizationKeyData } from "../data/encryptedOrganizationKeyData"; diff --git a/libs/common/src/models/domain/encArrayBuffer.ts b/libs/common/src/models/domain/encArrayBuffer.ts index b20796cdf6..396c866392 100644 --- a/libs/common/src/models/domain/encArrayBuffer.ts +++ b/libs/common/src/models/domain/encArrayBuffer.ts @@ -1,6 +1,6 @@ -import { EncryptionType } from "@bitwarden/common/enums/encryptionType"; -import { IEncrypted } from "@bitwarden/common/interfaces/IEncrypted"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { EncryptionType } from "../../enums/encryptionType"; +import { IEncrypted } from "../../interfaces/IEncrypted"; +import { Utils } from "../../misc/utils"; const ENC_TYPE_LENGTH = 1; const IV_LENGTH = 16; diff --git a/libs/common/src/models/domain/encString.ts b/libs/common/src/models/domain/encString.ts index 01376c9093..c828f4aa52 100644 --- a/libs/common/src/models/domain/encString.ts +++ b/libs/common/src/models/domain/encString.ts @@ -1,8 +1,7 @@ import { Jsonify } from "type-fest"; -import { IEncrypted } from "@bitwarden/common/interfaces/IEncrypted"; - import { EncryptionType } from "../../enums/encryptionType"; +import { IEncrypted } from "../../interfaces/IEncrypted"; import { Utils } from "../../misc/utils"; import { SymmetricCryptoKey } from "./symmetricCryptoKey"; diff --git a/libs/common/src/models/domain/encryption-pair.spec.ts b/libs/common/src/models/domain/encryption-pair.spec.ts index 55fad76db0..c91cb3d2b9 100644 --- a/libs/common/src/models/domain/encryption-pair.spec.ts +++ b/libs/common/src/models/domain/encryption-pair.spec.ts @@ -1,4 +1,4 @@ -import { Utils } from "@bitwarden/common/misc/utils"; +import { Utils } from "../../misc/utils"; import { EncryptionPair } from "./account"; diff --git a/libs/common/src/models/domain/logInCredentials.ts b/libs/common/src/models/domain/logInCredentials.ts index 5f2035fd15..3da499ecbf 100644 --- a/libs/common/src/models/domain/logInCredentials.ts +++ b/libs/common/src/models/domain/logInCredentials.ts @@ -1,6 +1,5 @@ -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; - import { AuthenticationType } from "../../enums/authenticationType"; +import { SymmetricCryptoKey } from "../../models/domain/symmetricCryptoKey"; import { TokenRequestTwoFactor } from "../request/identityToken/tokenRequestTwoFactor"; export class PasswordLogInCredentials { diff --git a/libs/common/src/models/domain/symmetricCryptoKey.ts b/libs/common/src/models/domain/symmetricCryptoKey.ts index 1218c5dc70..23d3c690a5 100644 --- a/libs/common/src/models/domain/symmetricCryptoKey.ts +++ b/libs/common/src/models/domain/symmetricCryptoKey.ts @@ -1,8 +1,7 @@ import { Jsonify } from "type-fest"; -import { Utils } from "@bitwarden/common/misc/utils"; - import { EncryptionType } from "../../enums/encryptionType"; +import { Utils } from "../../misc/utils"; export class SymmetricCryptoKey { key: ArrayBuffer; diff --git a/libs/common/src/models/request/scimConfigRequest.ts b/libs/common/src/models/request/scimConfigRequest.ts index 7549661cdd..87420d85ea 100644 --- a/libs/common/src/models/request/scimConfigRequest.ts +++ b/libs/common/src/models/request/scimConfigRequest.ts @@ -1,4 +1,4 @@ -import { ScimProviderType } from "@bitwarden/common/enums/scimProviderType"; +import { ScimProviderType } from "../../enums/scimProviderType"; export class ScimConfigRequest { constructor(private enabled: boolean, private scimProvider: ScimProviderType = null) {} diff --git a/libs/common/src/models/response/authRequestResponse.ts b/libs/common/src/models/response/authRequestResponse.ts index 1a29a3da85..a72d25ace9 100644 --- a/libs/common/src/models/response/authRequestResponse.ts +++ b/libs/common/src/models/response/authRequestResponse.ts @@ -1,4 +1,4 @@ -import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { DeviceType } from "../../enums/deviceType"; import { BaseResponse } from "./baseResponse"; diff --git a/libs/common/src/services/account/account-api.service.ts b/libs/common/src/services/account/account-api.service.ts index fe4789d4b1..98cb84aecf 100644 --- a/libs/common/src/services/account/account-api.service.ts +++ b/libs/common/src/services/account/account-api.service.ts @@ -1,6 +1,6 @@ -import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/abstractions/account/account-api.service.abstraction"; -import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; +import { AccountApiService as AccountApiServiceAbstraction } from "../../abstractions/account/account-api.service.abstraction"; +import { ApiService } from "../../abstractions/api.service"; +import { SecretVerificationRequest } from "../../models/request/secretVerificationRequest"; export class AccountApiService implements AccountApiServiceAbstraction { constructor(private apiService: ApiService) {} diff --git a/libs/common/src/services/account/account.service.ts b/libs/common/src/services/account/account.service.ts index 2f3bacfbe1..417f20425d 100644 --- a/libs/common/src/services/account/account.service.ts +++ b/libs/common/src/services/account/account.service.ts @@ -1,9 +1,8 @@ -import { AccountApiService } from "@bitwarden/common/abstractions/account/account-api.service.abstraction"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; - +import { AccountApiService } from "../../abstractions/account/account-api.service.abstraction"; import { AccountService as AccountServiceAbstraction } from "../../abstractions/account/account.service.abstraction"; +import { LogService } from "../../abstractions/log.service"; +import { MessagingService } from "../../abstractions/messaging.service"; +import { UserVerificationService } from "../../abstractions/userVerification/userVerification.service.abstraction"; import { Verification } from "../../types/verification"; export class AccountService implements AccountServiceAbstraction { diff --git a/libs/common/src/services/config/config-api.service.ts b/libs/common/src/services/config/config-api.service.ts index 6b92ae0dc6..5e3b75bcd7 100644 --- a/libs/common/src/services/config/config-api.service.ts +++ b/libs/common/src/services/config/config-api.service.ts @@ -1,6 +1,6 @@ -import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { ConfigApiServiceAbstraction as ConfigApiServiceAbstraction } from "@bitwarden/common/abstractions/config/config-api.service.abstraction"; -import { ServerConfigResponse } from "@bitwarden/common/models/response/server-config-response"; +import { ApiService } from "../../abstractions/api.service"; +import { ConfigApiServiceAbstraction as ConfigApiServiceAbstraction } from "../../abstractions/config/config-api.service.abstraction"; +import { ServerConfigResponse } from "../../models/response/server-config-response"; export class ConfigApiService implements ConfigApiServiceAbstraction { constructor(private apiService: ApiService) {} diff --git a/libs/common/src/services/config/config.service.ts b/libs/common/src/services/config/config.service.ts index a5ac544571..123d08ace5 100644 --- a/libs/common/src/services/config/config.service.ts +++ b/libs/common/src/services/config/config.service.ts @@ -1,11 +1,10 @@ import { BehaviorSubject, concatMap, map, switchMap, timer, EMPTY } from "rxjs"; -import { ServerConfigData } from "@bitwarden/common/models/data/server-config.data"; - import { ConfigApiServiceAbstraction } from "../../abstractions/config/config-api.service.abstraction"; import { ConfigServiceAbstraction } from "../../abstractions/config/config.service.abstraction"; import { ServerConfig } from "../../abstractions/config/server-config"; import { StateService } from "../../abstractions/state.service"; +import { ServerConfigData } from "../../models/data/server-config.data"; export class ConfigService implements ConfigServiceAbstraction { private _serverConfig = new BehaviorSubject(null); diff --git a/libs/common/src/services/encrypt.service.ts b/libs/common/src/services/encrypt.service.ts index fef33a3f9c..d02e541b3b 100644 --- a/libs/common/src/services/encrypt.service.ts +++ b/libs/common/src/services/encrypt.service.ts @@ -1,14 +1,13 @@ -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { EncryptedObject } from "@bitwarden/common/models/domain/encryptedObject"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; - import { AbstractEncryptService } from "../abstractions/abstractEncrypt.service"; +import { CryptoFunctionService } from "../abstractions/cryptoFunction.service"; +import { LogService } from "../abstractions/log.service"; import { EncryptionType } from "../enums/encryptionType"; import { IEncrypted } from "../interfaces/IEncrypted"; +import { Utils } from "../misc/utils"; import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; +import { EncString } from "../models/domain/encString"; +import { EncryptedObject } from "../models/domain/encryptedObject"; +import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; export class EncryptService implements AbstractEncryptService { constructor( diff --git a/libs/common/src/services/folder/folder-api.service.ts b/libs/common/src/services/folder/folder-api.service.ts index d855c06353..44e03c3050 100644 --- a/libs/common/src/services/folder/folder-api.service.ts +++ b/libs/common/src/services/folder/folder-api.service.ts @@ -1,10 +1,10 @@ -import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction"; -import { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; -import { FolderData } from "@bitwarden/common/models/data/folderData"; -import { Folder } from "@bitwarden/common/models/domain/folder"; -import { FolderRequest } from "@bitwarden/common/models/request/folderRequest"; -import { FolderResponse } from "@bitwarden/common/models/response/folderResponse"; +import { ApiService } from "../../abstractions/api.service"; +import { FolderApiServiceAbstraction } from "../../abstractions/folder/folder-api.service.abstraction"; +import { InternalFolderService } from "../../abstractions/folder/folder.service.abstraction"; +import { FolderData } from "../../models/data/folderData"; +import { Folder } from "../../models/domain/folder"; +import { FolderRequest } from "../../models/request/folderRequest"; +import { FolderResponse } from "../../models/response/folderResponse"; export class FolderApiService implements FolderApiServiceAbstraction { constructor(private folderService: InternalFolderService, private apiService: ApiService) {} diff --git a/libs/common/src/services/memoryStorage.service.ts b/libs/common/src/services/memoryStorage.service.ts index 1634b67b05..0911992c3c 100644 --- a/libs/common/src/services/memoryStorage.service.ts +++ b/libs/common/src/services/memoryStorage.service.ts @@ -1,7 +1,7 @@ import { AbstractStorageService, MemoryStorageServiceInterface, -} from "@bitwarden/common/abstractions/storage.service"; +} from "../abstractions/storage.service"; export class MemoryStorageService extends AbstractStorageService diff --git a/libs/common/src/services/noopEvent.service.ts b/libs/common/src/services/noopEvent.service.ts index 4504ceb29f..9a49d5a806 100644 --- a/libs/common/src/services/noopEvent.service.ts +++ b/libs/common/src/services/noopEvent.service.ts @@ -1,5 +1,5 @@ -import { EventService } from "@bitwarden/common/abstractions/event.service"; -import { EventType } from "@bitwarden/common/enums/eventType"; +import { EventService } from "../abstractions/event.service"; +import { EventType } from "../enums/eventType"; /** * If you want to use this, don't. diff --git a/libs/common/src/services/policy/policy-api.service.ts b/libs/common/src/services/policy/policy-api.service.ts index 7cf3a2b065..cf5de383c6 100644 --- a/libs/common/src/services/policy/policy-api.service.ts +++ b/libs/common/src/services/policy/policy-api.service.ts @@ -1,15 +1,15 @@ -import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; -import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { PolicyData } from "@bitwarden/common/models/data/policyData"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; -import { Policy } from "@bitwarden/common/models/domain/policy"; -import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest"; -import { ListResponse } from "@bitwarden/common/models/response/listResponse"; -import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; +import { ApiService } from "../../abstractions/api.service"; +import { OrganizationService } from "../../abstractions/organization/organization.service.abstraction"; +import { PolicyApiServiceAbstraction } from "../../abstractions/policy/policy-api.service.abstraction"; +import { InternalPolicyService } from "../../abstractions/policy/policy.service.abstraction"; +import { StateService } from "../../abstractions/state.service"; +import { PolicyType } from "../../enums/policyType"; +import { PolicyData } from "../../models/data/policyData"; +import { MasterPasswordPolicyOptions } from "../../models/domain/masterPasswordPolicyOptions"; +import { Policy } from "../../models/domain/policy"; +import { PolicyRequest } from "../../models/request/policyRequest"; +import { ListResponse } from "../../models/response/listResponse"; +import { PolicyResponse } from "../../models/response/policyResponse"; export class PolicyApiService implements PolicyApiServiceAbstraction { constructor(