[SM-255] Forbid absolute imports in libs (#3624)

.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/**/*"] }]
+      }
+    }
+  ]
 }

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";

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")) {

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";

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";

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<Account> {
   abstract getFromSessionMemory<T>(key: string, deserializer?: (obj: Jsonify<T>) => T): Promise<T>;

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(

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) {}

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(

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";
 

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";
 

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";
 

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/**/*"
+        ]
       }
     ]
   }

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";
 

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({

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<EncString>;

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<void>;

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<ServerConfigResponse>;

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;

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<any>;

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<PolicyResponse>;

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<void>;

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;

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 {

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";

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";

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;

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";

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";
 

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 {

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;

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) {}

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";
 

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) {}

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 {

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) {}

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<ServerConfig | null>(null);

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(

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) {}

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

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.

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(