Assign ownership to many libs files (#6928)

Assign ownership to many of the remaining libs/common files.

Criteria for ownership:
* Files used by a single team, is now owned by that team.
* Files related to a domain owned by a team is now owned by that team.
* Where ownership is unclear the "lowest level" service takes ownership.

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

@@ -1,5 +1,5 @@
-import { KdfType } from "../../../../enums";
 import { BaseResponse } from "../../../../models/response/base.response";
+import { KdfType } from "../../../../platform/enums";
 import { OrganizationUserStatusType, OrganizationUserType } from "../../../enums";
 import { PermissionsApi } from "../../../models/api/permissions.api";
 import { SelectionReadOnlyResponse } from "../../../models/response/selection-read-only.response";

libs/common/src/admin-console/abstractions/provider.service.ts

@@ -1,5 +1,5 @@
-import { Provider } from "../../models/domain/provider";
 import { ProviderData } from "../models/data/provider.data";
+import { Provider } from "../models/domain/provider";
 
 export abstract class ProviderService {
   get: (id: string) => Promise<Provider>;

libs/common/src/admin-console/enums/index.ts

@@ -3,6 +3,7 @@ export * from "./organization-connection-type.enum";
 export * from "./organization-user-status-type.enum";
 export * from "./organization-user-type.enum";
 export * from "./policy-type.enum";
+export * from "./provider-type.enum";
 export * from "./provider-user-status-type.enum";
 export * from "./provider-user-type.enum";
 export * from "./scim-provider-type.enum";

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

@@ -1,5 +1,5 @@
-import { ProductType, ProviderType } from "../../../enums";
-import { OrganizationUserStatusType, OrganizationUserType } from "../../enums";
+import { ProductType } from "../../../enums";
+import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums";
 import { PermissionsApi } from "../api/permissions.api";
 import { ProfileOrganizationResponse } from "../response/profile-organization.response";
 

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

@@ -1,7 +1,7 @@
 import { Jsonify } from "type-fest";
 
-import { ProductType, ProviderType } from "../../../enums";
-import { OrganizationUserStatusType, OrganizationUserType } from "../../enums";
+import { ProductType } from "../../../enums";
+import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums";
 import { PermissionsApi } from "../api/permissions.api";
 import { OrganizationData } from "../data/organization.data";
 

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

@@ -1,5 +1,5 @@
-import { ProviderUserStatusType, ProviderUserType } from "../../admin-console/enums";
-import { ProviderData } from "../../admin-console/models/data/provider.data";
+import { ProviderUserStatusType, ProviderUserType } from "../../enums";
+import { ProviderData } from "../data/provider.data";
 
 export class Provider {
   id: string;

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

@@ -1,6 +1,6 @@
-import { ProductType, ProviderType } from "../../../enums";
+import { ProductType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
-import { OrganizationUserStatusType, OrganizationUserType } from "../../enums";
+import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums";
 import { PermissionsApi } from "../api/permissions.api";
 
 export class ProfileOrganizationResponse extends BaseResponse {

libs/common/src/admin-console/services/provider.service.ts

@@ -1,7 +1,7 @@
-import { Provider } from "../../models/domain/provider";
 import { StateService } from "../../platform/abstractions/state.service";
 import { ProviderService as ProviderServiceAbstraction } from "../abstractions/provider.service";
 import { ProviderData } from "../models/data/provider.data";
+import { Provider } from "../models/domain/provider";
 
 export class ProviderService implements ProviderServiceAbstraction {
   constructor(private stateService: StateService) {}

libs/common/src/auth/abstractions/account-api.service.ts

@@ -1,4 +1,4 @@
-import { Verification } from "../../types/verification";
+import { Verification } from "../types/verification";
 
 export abstract class AccountApiService {
   abstract deleteAccount(verification: Verification): Promise<void>;

libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts

@@ -1,5 +1,5 @@
-import { Verification } from "../../../types/verification";
 import { SecretVerificationRequest } from "../../models/request/secret-verification.request";
+import { Verification } from "../../types/verification";
 
 export abstract class UserVerificationService {
   buildRequest: <T extends SecretVerificationRequest>(

libs/common/src/auth/captcha-iframe.ts

@@ -1,6 +1,7 @@
-import { IFrameComponent } from "../misc/iframe_component";
 import { I18nService } from "../platform/abstractions/i18n.service";
 
+import { IFrameComponent } from "./iframe-component";
+
 export class CaptchaIFrame extends IFrameComponent {
   constructor(
     win: Window,

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

@@ -2,13 +2,13 @@ import { mock, MockProxy } from "jest-mock-extended";
 
 import { ApiService } from "../../abstractions/api.service";
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
-import { HashPurpose } from "../../enums";
 import { AppIdService } from "../../platform/abstractions/app-id.service";
 import { CryptoService } from "../../platform/abstractions/crypto.service";
 import { LogService } from "../../platform/abstractions/log.service";
 import { MessagingService } from "../../platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 import { StateService } from "../../platform/abstractions/state.service";
+import { HashPurpose } from "../../platform/enums";
 import { Utils } from "../../platform/misc/utils";
 import {
   MasterKey,

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

@@ -1,13 +1,13 @@
 import { ApiService } from "../../abstractions/api.service";
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
 import { MasterPasswordPolicyOptions } from "../../admin-console/models/domain/master-password-policy-options";
-import { HashPurpose } from "../../enums";
 import { AppIdService } from "../../platform/abstractions/app-id.service";
 import { CryptoService } from "../../platform/abstractions/crypto.service";
 import { LogService } from "../../platform/abstractions/log.service";
 import { MessagingService } from "../../platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 import { StateService } from "../../platform/abstractions/state.service";
+import { HashPurpose } from "../../platform/enums";
 import { MasterKey } from "../../platform/models/domain/symmetric-crypto-key";
 import { PasswordStrengthServiceAbstraction } from "../../tools/password-strength";
 import { AuthService } from "../abstractions/auth.service";

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

@@ -1,5 +1,5 @@
-import { KdfType } from "../../../enums";
 import { KeysRequest } from "../../../models/request/keys.request";
+import { KdfType } from "../../../platform/enums";
 import { KdfConfig } from "../domain/kdf-config";
 
 export class SetKeyConnectorKeyRequest {

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

@@ -1,5 +1,5 @@
-import { KdfType } from "../../../enums";
 import { KeysRequest } from "../../../models/request/keys.request";
+import { KdfType } from "../../../platform/enums";
 
 export class SetPasswordRequest {
   masterPasswordHash: string;

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

@@ -1,5 +1,5 @@
-import { KdfType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
+import { KdfType } from "../../../platform/enums";
 
 import { MasterPasswordPolicyResponse } from "./master-password-policy.response";
 import { UserDecryptionOptionsResponse } from "./user-decryption-options/user-decryption-options.response";

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

@@ -1,5 +1,5 @@
-import { KdfType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
+import { KdfType } from "../../../platform/enums";
 
 export class PreloginResponse extends BaseResponse {
   kdf: KdfType;

libs/common/src/auth/services/account-api.service.ts

@@ -1,9 +1,9 @@
 import { ApiService } from "../../abstractions/api.service";
 import { LogService } from "../../platform/abstractions/log.service";
-import { Verification } from "../../types/verification";
 import { AccountApiService } from "../abstractions/account-api.service";
 import { InternalAccountService } from "../abstractions/account.service";
 import { UserVerificationService } from "../abstractions/user-verification/user-verification.service.abstraction";
+import { Verification } from "../types/verification";
 
 export class AccountApiServiceImplementation implements AccountApiService {
   constructor(

libs/common/src/auth/services/anonymous-hub.service.ts

@@ -6,15 +6,14 @@ import {
 } from "@microsoft/signalr";
 import { MessagePackHubProtocol } from "@microsoft/signalr-protocol-msgpack";
 
-import { AnonymousHubService as AnonymousHubServiceAbstraction } from "../abstractions/anonymousHub.service";
-import { AuthService } from "../auth/abstractions/auth.service";
-import { EnvironmentService } from "../platform/abstractions/environment.service";
-import { LogService } from "../platform/abstractions/log.service";
-
 import {
   AuthRequestPushNotification,
   NotificationResponse,
-} from "./../models/response/notification.response";
+} from "../../models/response/notification.response";
+import { EnvironmentService } from "../../platform/abstractions/environment.service";
+import { LogService } from "../../platform/abstractions/log.service";
+import { AnonymousHubService as AnonymousHubServiceAbstraction } from "../abstractions/anonymous-hub.service";
+import { AuthService } from "../abstractions/auth.service";
 
 export class AnonymousHubService implements AnonymousHubServiceAbstraction {
   private anonHubConnection: HubConnection;

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

@@ -2,7 +2,6 @@ import { Observable, Subject } from "rxjs";
 
 import { ApiService } from "../../abstractions/api.service";
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
-import { KdfType, KeySuffixOptions } from "../../enums";
 import { PreloginRequest } from "../../models/request/prelogin.request";
 import { ErrorResponse } from "../../models/response/error.response";
 import { AuthRequestPushNotification } from "../../models/response/notification.response";
@@ -15,6 +14,7 @@ import { LogService } from "../../platform/abstractions/log.service";
 import { MessagingService } from "../../platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 import { StateService } from "../../platform/abstractions/state.service";
+import { KdfType, KeySuffixOptions } from "../../platform/enums";
 import { Utils } from "../../platform/misc/utils";
 import { MasterKey } from "../../platform/models/domain/symmetric-crypto-key";
 import { PasswordStrengthServiceAbstraction } from "../../tools/password-strength";

libs/common/src/auth/services/device-trust-crypto.service.spec.ts

@@ -1,7 +1,6 @@
 import { matches, mock } from "jest-mock-extended";
 
 import { DeviceType } from "../../enums";
-import { EncryptionType } from "../../enums/encryption-type.enum";
 import { AppIdService } from "../../platform/abstractions/app-id.service";
 import { CryptoFunctionService } from "../../platform/abstractions/crypto-function.service";
 import { CryptoService } from "../../platform/abstractions/crypto.service";
@@ -9,6 +8,7 @@ import { EncryptService } from "../../platform/abstractions/encrypt.service";
 import { I18nService } from "../../platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 import { StateService } from "../../platform/abstractions/state.service";
+import { EncryptionType } from "../../platform/enums/encryption-type.enum";
 import { EncString } from "../../platform/models/domain/enc-string";
 import {
   SymmetricCryptoKey,

libs/common/src/auth/services/user-verification/user-verification.service.ts

@@ -1,12 +1,12 @@
 import { CryptoService } from "../../../platform/abstractions/crypto.service";
 import { I18nService } from "../../../platform/abstractions/i18n.service";
 import { StateService } from "../../../platform/abstractions/state.service";
-import { Verification } from "../../../types/verification";
 import { UserVerificationApiServiceAbstraction } from "../../abstractions/user-verification/user-verification-api.service.abstraction";
 import { UserVerificationService as UserVerificationServiceAbstraction } from "../../abstractions/user-verification/user-verification.service.abstraction";
 import { VerificationType } from "../../enums/verification-type";
 import { SecretVerificationRequest } from "../../models/request/secret-verification.request";
 import { VerifyOTPRequest } from "../../models/request/verify-otp.request";
+import { Verification } from "../../types/verification";
 
 /**
  * Used for general-purpose user verification throughout the app.

libs/common/src/auth/types/verification.ts

@@ -1,4 +1,4 @@
-import { VerificationType } from "../auth/enums/verification-type";
+import { VerificationType } from "../enums/verification-type";
 
 export type Verification = {
   type: VerificationType;

libs/common/src/enums/index.ts

@@ -1,23 +1,8 @@
 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 "./provider-type.enum";
-export * from "./secure-note-type.enum";
-export * from "./storage-location.enum";
-export * from "./theme-type.enum";
-export * from "./uri-match-type.enum";

libs/common/src/misc/nodeUtils.ts

@@ -1,34 +0,0 @@
-import * as fs from "fs";
-import * as path from "path";
-import * as readline from "readline";
-
-export class NodeUtils {
-  static mkdirpSync(targetDir: string, mode = "700", relative = false, relativeDir: string = null) {
-    const initialDir = path.isAbsolute(targetDir) ? path.sep : "";
-    const baseDir = relative ? (relativeDir != null ? relativeDir : __dirname) : ".";
-    targetDir.split(path.sep).reduce((parentDir, childDir) => {
-      const dir = path.resolve(baseDir, parentDir, childDir);
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, mode);
-      }
-      return dir;
-    }, initialDir);
-  }
-  static readFirstLine(fileName: string) {
-    return new Promise<string>((resolve, reject) => {
-      const readStream = fs.createReadStream(fileName, { encoding: "utf8" });
-      const readInterface = readline.createInterface(readStream);
-      readInterface
-        .on("line", (line) => {
-          readStream.close();
-          resolve(line);
-        })
-        .on("error", (err) => reject(err));
-    });
-  }
-
-  // https://stackoverflow.com/a/31394257
-  static bufferToArrayBuffer(buf: Buffer): ArrayBuffer {
-    return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-  }
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ import { ProfileOrganizationResponse } from "../../admin-console/models/response
 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 { KeySuffixOptions, KdfType, HashPurpose } from "../../enums";
+import { KeySuffixOptions, KdfType, HashPurpose } from "../enums";
 import { EncArrayBuffer } from "../models/domain/enc-array-buffer";
 import { EncString } from "../models/domain/enc-string";
 import {

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

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

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

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

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

@@ -10,7 +10,6 @@ import { EnvironmentUrls } from "../../auth/models/domain/environment-urls";
 import { ForceSetPasswordReason } from "../../auth/models/domain/force-set-password-reason";
 import { KdfConfig } from "../../auth/models/domain/kdf-config";
 import { BiometricKey } from "../../auth/types/biometric-key";
-import { KdfType, ThemeType, UriMatchType } from "../../enums";
 import { EventData } from "../../models/data/event.data";
 import { WindowState } from "../../models/domain/window-state";
 import { GeneratorOptions } from "../../tools/generator/generator-options";
@@ -18,6 +17,7 @@ import { GeneratedPasswordHistory, PasswordGeneratorOptions } from "../../tools/
 import { UsernameGeneratorOptions } from "../../tools/generator/username";
 import { SendData } from "../../tools/send/models/data/send.data";
 import { SendView } from "../../tools/send/models/view/send.view";
+import { UriMatchType } from "../../vault/enums";
 import { CipherData } from "../../vault/models/data/cipher.data";
 import { CollectionData } from "../../vault/models/data/collection.data";
 import { FolderData } from "../../vault/models/data/folder.data";
@@ -25,6 +25,7 @@ import { LocalData } from "../../vault/models/data/local.data";
 import { CipherView } from "../../vault/models/view/cipher.view";
 import { CollectionView } from "../../vault/models/view/collection.view";
 import { AddEditCipherInfo } from "../../vault/types/add-edit-cipher-info";
+import { KdfType, ThemeType } from "../enums";
 import { ServerConfigData } from "../models/data/server-config.data";
 import {
   Account,

libs/common/src/platform/enums/index.ts

@@ -0,0 +1,9 @@
+export * from "./encryption-type.enum";
+export * from "./file-upload-type.enum";
+export * from "./hash-purpose.enum";
+export * from "./html-storage-location.enum";
+export * from "./kdf-type.enum";
+export * from "./key-suffix-options.enum";
+export * from "./log-level-type.enum";
+export * from "./storage-location.enum";
+export * from "./theme-type.enum";

libs/common/src/platform/enums/kdf-type.enum.ts

@@ -1,4 +1,4 @@
-import { KdfConfig } from "../auth/models/domain/kdf-config";
+import { KdfConfig } from "../../auth/models/domain/kdf-config";
 
 export enum KdfType {
   PBKDF2_SHA256 = 0,
@@ -12,4 +12,3 @@ export const DEFAULT_ARGON2_ITERATIONS = 3;
 export const DEFAULT_KDF_TYPE = KdfType.PBKDF2_SHA256;
 export const DEFAULT_PBKDF2_ITERATIONS = 600000;
 export const DEFAULT_KDF_CONFIG = new KdfConfig(DEFAULT_PBKDF2_ITERATIONS);
-export const SEND_KDF_ITERATIONS = 100000;

libs/common/src/platform/interfaces/encrypted.ts

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

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

@@ -11,7 +11,6 @@ import { ForceSetPasswordReason } from "../../../auth/models/domain/force-set-pa
 import { KeyConnectorUserDecryptionOption } from "../../../auth/models/domain/user-decryption-options/key-connector-user-decryption-option";
 import { TrustedDeviceUserDecryptionOption } from "../../../auth/models/domain/user-decryption-options/trusted-device-user-decryption-option";
 import { IdentityTokenResponse } from "../../../auth/models/response/identity-token.response";
-import { KdfType, UriMatchType } from "../../../enums";
 import { EventData } from "../../../models/data/event.data";
 import { GeneratorOptions } from "../../../tools/generator/generator-options";
 import {
@@ -22,11 +21,13 @@ import { UsernameGeneratorOptions } from "../../../tools/generator/username/user
 import { SendData } from "../../../tools/send/models/data/send.data";
 import { SendView } from "../../../tools/send/models/view/send.view";
 import { DeepJsonify } from "../../../types/deep-jsonify";
+import { UriMatchType } from "../../../vault/enums";
 import { CipherData } from "../../../vault/models/data/cipher.data";
 import { CollectionData } from "../../../vault/models/data/collection.data";
 import { FolderData } from "../../../vault/models/data/folder.data";
 import { CipherView } from "../../../vault/models/view/cipher.view";
 import { CollectionView } from "../../../vault/models/view/collection.view";
+import { KdfType } from "../../enums";
 import { Utils } from "../../misc/utils";
 import { ServerConfigData } from "../../models/data/server-config.data";
 

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

@@ -1,5 +1,5 @@
 import { makeStaticByteArray } from "../../../../spec";
-import { EncryptionType } from "../../../enums";
+import { EncryptionType } from "../../enums";
 
 import { EncArrayBuffer } from "./enc-array-buffer";
 

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

@@ -1,5 +1,5 @@
-import { EncryptionType } from "../../../enums";
 import { Utils } from "../../../platform/misc/utils";
+import { EncryptionType } from "../../enums";
 import { Encrypted } from "../../interfaces/encrypted";
 
 const ENC_TYPE_LENGTH = 1;

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

@@ -1,7 +1,6 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
 import { makeStaticByteArray } from "../../../../spec";
-import { EncryptionType } from "../../../enums";
 import { EncryptService } from "../../../platform/abstractions/encrypt.service";
 import {
   OrgKey,
@@ -9,6 +8,7 @@ import {
   UserKey,
 } from "../../../platform/models/domain/symmetric-crypto-key";
 import { CryptoService } from "../../abstractions/crypto.service";
+import { EncryptionType } from "../../enums";
 import { ContainerService } from "../../services/container.service";
 
 import { EncString } from "./enc-string";

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

@@ -1,8 +1,8 @@
 import { Jsonify, Opaque } from "type-fest";
 
-import { EncryptionType, EXPECTED_NUM_PARTS_BY_ENCRYPTION_TYPE } from "../../../enums";
-import { Utils } from "../../../platform/misc/utils";
+import { EncryptionType, EXPECTED_NUM_PARTS_BY_ENCRYPTION_TYPE } from "../../enums";
 import { Encrypted } from "../../interfaces/encrypted";
+import { Utils } from "../../misc/utils";
 
 import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 

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

@@ -1,6 +1,6 @@
 import { EnvironmentUrls } from "../../../auth/models/domain/environment-urls";
-import { ThemeType } from "../../../enums";
 import { WindowState } from "../../../models/domain/window-state";
+import { ThemeType } from "../../enums";
 
 export class GlobalState {
   enableAlwaysOnTop?: boolean;

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

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

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

@@ -1,5 +1,5 @@
 import { makeStaticByteArray } from "../../../../spec";
-import { EncryptionType } from "../../../enums";
+import { EncryptionType } from "../../enums";
 
 import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 

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

@@ -1,7 +1,7 @@
 import { Jsonify, Opaque } from "type-fest";
 
-import { EncryptionType } from "../../../enums";
 import { Utils } from "../../../platform/misc/utils";
+import { EncryptionType } from "../../enums";
 
 export class SymmetricCryptoKey {
   key: Uint8Array;

libs/common/src/platform/services/app-id.service.ts

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

libs/common/src/platform/services/console-log.service.ts

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

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

@@ -6,6 +6,13 @@ import { ProfileOrganizationResponse } from "../../admin-console/models/response
 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 { Utils } from "../../platform/misc/utils";
+import { CryptoFunctionService } from "../abstractions/crypto-function.service";
+import { CryptoService as CryptoServiceAbstraction } from "../abstractions/crypto.service";
+import { EncryptService } from "../abstractions/encrypt.service";
+import { LogService } from "../abstractions/log.service";
+import { PlatformUtilsService } from "../abstractions/platform-utils.service";
+import { StateService } from "../abstractions/state.service";
 import {
   KeySuffixOptions,
   HashPurpose,
@@ -14,14 +21,7 @@ import {
   DEFAULT_ARGON2_MEMORY,
   DEFAULT_ARGON2_PARALLELISM,
   EncryptionType,
-} from "../../enums";
-import { Utils } from "../../platform/misc/utils";
-import { CryptoFunctionService } from "../abstractions/crypto-function.service";
-import { CryptoService as CryptoServiceAbstraction } from "../abstractions/crypto.service";
-import { EncryptService } from "../abstractions/encrypt.service";
-import { LogService } from "../abstractions/log.service";
-import { PlatformUtilsService } from "../abstractions/platform-utils.service";
-import { StateService } from "../abstractions/state.service";
+} from "../enums";
 import { sequentialize } from "../misc/sequentialize";
 import { EFFLongWordList } from "../misc/wordlist";
 import { EncArrayBuffer } from "../models/domain/enc-array-buffer";

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

@@ -1,8 +1,8 @@
-import { EncryptionType } from "../../../enums";
 import { Utils } from "../../../platform/misc/utils";
 import { CryptoFunctionService } from "../../abstractions/crypto-function.service";
 import { EncryptService } from "../../abstractions/encrypt.service";
 import { LogService } from "../../abstractions/log.service";
+import { EncryptionType } from "../../enums";
 import { Decryptable } from "../../interfaces/decryptable.interface";
 import { Encrypted } from "../../interfaces/encrypted";
 import { InitializerMetadata } from "../../interfaces/initializer-metadata.interface";

libs/common/src/platform/services/encrypt.service.spec.ts

@@ -1,10 +1,10 @@
 import { mockReset, mock } from "jest-mock-extended";
 
 import { makeStaticByteArray } from "../../../spec";
-import { EncryptionType } from "../../enums";
 import { CsprngArray } from "../../types/csprng";
 import { CryptoFunctionService } from "../abstractions/crypto-function.service";
 import { LogService } from "../abstractions/log.service";
+import { EncryptionType } from "../enums";
 import { EncArrayBuffer } from "../models/domain/enc-array-buffer";
 import { EncString } from "../models/domain/enc-string";
 import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";

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

@@ -1,9 +1,9 @@
-import { FileUploadType } from "../../../enums";
 import {
   FileUploadApiMethods,
   FileUploadService as FileUploadServiceAbstraction,
 } from "../../abstractions/file-upload/file-upload.service";
 import { LogService } from "../../abstractions/log.service";
+import { FileUploadType } from "../../enums";
 import { EncArrayBuffer } from "../../models/domain/enc-array-buffer";
 import { EncString } from "../../models/domain/enc-string";
 

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

@@ -14,13 +14,6 @@ import { EnvironmentUrls } from "../../auth/models/domain/environment-urls";
 import { ForceSetPasswordReason } from "../../auth/models/domain/force-set-password-reason";
 import { KdfConfig } from "../../auth/models/domain/kdf-config";
 import { BiometricKey } from "../../auth/types/biometric-key";
-import {
-  HtmlStorageLocation,
-  KdfType,
-  StorageLocation,
-  ThemeType,
-  UriMatchType,
-} from "../../enums";
 import { VaultTimeoutAction } from "../../enums/vault-timeout-action.enum";
 import { EventData } from "../../models/data/event.data";
 import { WindowState } from "../../models/domain/window-state";
@@ -31,6 +24,7 @@ import { UsernameGeneratorOptions } from "../../tools/generator/username";
 import { SendData } from "../../tools/send/models/data/send.data";
 import { SendView } from "../../tools/send/models/view/send.view";
 import { UserId } from "../../types/guid";
+import { UriMatchType } from "../../vault/enums";
 import { CipherData } from "../../vault/models/data/cipher.data";
 import { CollectionData } from "../../vault/models/data/collection.data";
 import { FolderData } from "../../vault/models/data/folder.data";
@@ -44,6 +38,7 @@ import {
   AbstractMemoryStorageService,
   AbstractStorageService,
 } from "../abstractions/storage.service";
+import { HtmlStorageLocation, KdfType, StorageLocation, ThemeType } from "../enums";
 import { StateFactory } from "../factories/state-factory";
 import { Utils } from "../misc/utils";
 import { ServerConfigData } from "../models/data/server-config.data";

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

@@ -1,10 +1,10 @@
 import * as lunr from "lunr";
 
 import { SearchService as SearchServiceAbstraction } from "../abstractions/search.service";
-import { FieldType, UriMatchType } from "../enums";
 import { I18nService } from "../platform/abstractions/i18n.service";
 import { LogService } from "../platform/abstractions/log.service";
 import { SendView } from "../tools/send/models/view/send.view";
+import { FieldType, UriMatchType } from "../vault/enums";
 import { CipherType } from "../vault/enums/cipher-type";
 import { CipherView } from "../vault/models/view/cipher.view";
 

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

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

libs/common/src/tools/send/send-kdf.ts

@@ -0,0 +1 @@
+export const SEND_KDF_ITERATIONS = 100000;

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

@@ -1,6 +1,5 @@
 import { BehaviorSubject, concatMap } from "rxjs";
 
-import { SEND_KDF_ITERATIONS } from "../../../enums";
 import { CryptoFunctionService } from "../../../platform/abstractions/crypto-function.service";
 import { CryptoService } from "../../../platform/abstractions/crypto.service";
 import { I18nService } from "../../../platform/abstractions/i18n.service";
@@ -15,6 +14,7 @@ import { Send } from "../models/domain/send";
 import { SendFile } from "../models/domain/send-file";
 import { SendText } from "../models/domain/send-text";
 import { SendView } from "../models/view/send.view";
+import { SEND_KDF_ITERATIONS } from "../send-kdf";
 
 import { InternalSendService as InternalSendServiceAbstraction } from "./send.service.abstraction";
 

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

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

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

@@ -1,6 +1,6 @@
-import { TreeNode } from "../../models/domain/tree-node";
 import { CollectionData } from "../models/data/collection.data";
 import { Collection } from "../models/domain/collection";
+import { TreeNode } from "../models/domain/tree-node";
 import { CollectionView } from "../models/view/collection.view";
 
 export abstract class CollectionService {

libs/common/src/vault/enums/index.ts

@@ -0,0 +1,6 @@
+export * from "./cipher-reprompt-type";
+export * from "./cipher-type";
+export * from "./field-type.enum";
+export * from "./linked-id-type.enum";
+export * from "./secure-note-type.enum";
+export * from "./uri-match-type.enum";

libs/common/src/vault/linked-field-option.decorator.ts

@@ -1,5 +1,5 @@
-import { LinkedIdType } from "../enums";
-import { ItemView } from "../vault/models/view/item.view";
+import { LinkedIdType } from "./enums";
+import { ItemView } from "./models/view/item.view";
 
 export class LinkedMetadata {
   constructor(readonly propertyKey: string, private readonly _i18nKey?: string) {}

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

@@ -1,4 +1,4 @@
-import { BaseResponse } from "../response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class CardApi extends BaseResponse {
   cardholderName: string;

libs/common/src/vault/models/api/fido2-credential.api.ts

@@ -1,4 +1,4 @@
-import { BaseResponse } from "../../models/response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class Fido2CredentialApi extends BaseResponse {
   credentialId: string;

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

@@ -1,5 +1,5 @@
+import { BaseResponse } from "../../../models/response/base.response";
 import { FieldType, LinkedIdType } from "../../enums";
-import { BaseResponse } from "../response/base.response";
 
 export class FieldApi extends BaseResponse {
   name: string;

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

@@ -1,4 +1,4 @@
-import { BaseResponse } from "../response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class IdentityApi extends BaseResponse {
   title: string;

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

@@ -1,5 +1,5 @@
+import { BaseResponse } from "../../../models/response/base.response";
 import { UriMatchType } from "../../enums";
-import { BaseResponse } from "../response/base.response";
 
 export class LoginUriApi extends BaseResponse {
   uri: string;

libs/common/src/vault/models/api/login.api.ts

@@ -1,8 +1,8 @@
 import { JsonObject } from "type-fest";
 
-import { Fido2CredentialApi } from "../../vault/api/fido2-credential.api";
-import { BaseResponse } from "../response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
+import { Fido2CredentialApi } from "./fido2-credential.api";
 import { LoginUriApi } from "./login-uri.api";
 
 export class LoginApi extends BaseResponse {

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

@@ -1,5 +1,5 @@
+import { BaseResponse } from "../../../models/response/base.response";
 import { SecureNoteType } from "../../enums";
-import { BaseResponse } from "../response/base.response";
 
 export class SecureNoteApi extends BaseResponse {
   type: SecureNoteType;

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

@@ -1,4 +1,4 @@
-import { CardApi } from "../../../models/api/card.api";
+import { CardApi } from "../api/card.api";
 
 export class CardData {
   cardholderName: string;

libs/common/src/vault/models/data/fido2-credential.data.ts

@@ -1,4 +1,4 @@
-import { Fido2CredentialApi } from "../../api/fido2-credential.api";
+import { Fido2CredentialApi } from "../api/fido2-credential.api";
 
 export class Fido2CredentialData {
   credentialId: string;

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

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

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

@@ -1,4 +1,4 @@
-import { IdentityApi } from "../../../models/api/identity.api";
+import { IdentityApi } from "../api/identity.api";
 
 export class IdentityData {
   title: string;

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

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

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

@@ -1,4 +1,4 @@
-import { LoginApi } from "../../../models/api/login.api";
+import { LoginApi } from "../api/login.api";
 
 import { Fido2CredentialData } from "./fido2-credential.data";
 import { LoginUriData } from "./login-uri.data";

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

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

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

@@ -2,13 +2,13 @@ import { mock } from "jest-mock-extended";
 import { Jsonify } from "type-fest";
 
 import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec/utils";
-import { FieldType, SecureNoteType, UriMatchType } from "../../../enums";
 import { CryptoService } from "../../../platform/abstractions/crypto.service";
 import { EncryptService } from "../../../platform/abstractions/encrypt.service";
 import { EncString } from "../../../platform/models/domain/enc-string";
 import { ContainerService } from "../../../platform/services/container.service";
 import { InitializerKey } from "../../../platform/services/cryptography/initializer-key";
 import { CipherService } from "../../abstractions/cipher.service";
+import { FieldType, SecureNoteType, UriMatchType } from "../../enums";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
 import { CipherType } from "../../enums/cipher-type";
 import { CipherData } from "../../models/data/cipher.data";

libs/common/src/vault/models/domain/fido2-credential.spec.ts

@@ -1,5 +1,5 @@
 import { mockEnc } from "../../../../spec";
-import { EncryptionType } from "../../../enums";
+import { EncryptionType } from "../../../platform/enums";
 import { EncString } from "../../../platform/models/domain/enc-string";
 import { Fido2CredentialData } from "../data/fido2-credential.data";
 

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

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

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

@@ -1,9 +1,9 @@
 import { Jsonify } from "type-fest";
 
-import { FieldType, LinkedIdType } from "../../../enums";
 import Domain from "../../../platform/models/domain/domain-base";
 import { EncString } from "../../../platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { FieldType, LinkedIdType } from "../../enums";
 import { FieldData } from "../data/field.data";
 import { FieldView } from "../view/field.view";
 

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

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

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

@@ -1,9 +1,9 @@
 import { Jsonify } from "type-fest";
 
-import { UriMatchType } from "../../../enums";
 import Domain from "../../../platform/models/domain/domain-base";
 import { EncString } from "../../../platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { UriMatchType } from "../../enums";
 import { LoginUriData } from "../data/login-uri.data";
 import { LoginUriView } from "../view/login-uri.view";
 

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

@@ -1,13 +1,13 @@
 import { mock } from "jest-mock-extended";
 
 import { mockEnc, mockFromJson } from "../../../../spec";
-import { UriMatchType } from "../../../enums";
 import { EncryptedString, EncString } from "../../../platform/models/domain/enc-string";
-import { Fido2CredentialApi } from "../../api/fido2-credential.api";
+import { UriMatchType } from "../../enums";
 import { LoginData } from "../../models/data/login.data";
 import { Login } from "../../models/domain/login";
 import { LoginUri } from "../../models/domain/login-uri";
 import { LoginUriView } from "../../models/view/login-uri.view";
+import { Fido2CredentialApi } from "../api/fido2-credential.api";
 import { Fido2CredentialData } from "../data/fido2-credential.data";
 import { Fido2CredentialView } from "../view/fido2-credential.view";