Merged with master and fixed conflicts

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

@@ -1,5 +1,4 @@
 import { OrganizationConnectionType } from "../admin-console/enums";
-import { CollectionRequest } from "../admin-console/models/request/collection.request";
 import { OrganizationSponsorshipCreateRequest } from "../admin-console/models/request/organization/organization-sponsorship-create.request";
 import { OrganizationSponsorshipRedeemRequest } from "../admin-console/models/request/organization/organization-sponsorship-redeem.request";
 import { OrganizationConnectionRequest } from "../admin-console/models/request/organization-connection.request";
@@ -14,10 +13,6 @@ import { ProviderUserConfirmRequest } from "../admin-console/models/request/prov
 import { ProviderUserInviteRequest } from "../admin-console/models/request/provider/provider-user-invite.request";
 import { ProviderUserUpdateRequest } from "../admin-console/models/request/provider/provider-user-update.request";
 import { SelectionReadOnlyRequest } from "../admin-console/models/request/selection-read-only.request";
-import {
-  CollectionAccessDetailsResponse,
-  CollectionResponse,
-} from "../admin-console/models/response/collection.response";
 import {
   OrganizationConnectionConfigApis,
   OrganizationConnectionResponse,
@@ -135,9 +130,14 @@ import { CipherCreateRequest } from "../vault/models/request/cipher-create.reque
 import { CipherPartialRequest } from "../vault/models/request/cipher-partial.request";
 import { CipherShareRequest } from "../vault/models/request/cipher-share.request";
 import { CipherRequest } from "../vault/models/request/cipher.request";
+import { CollectionRequest } from "../vault/models/request/collection.request";
 import { AttachmentUploadDataResponse } from "../vault/models/response/attachment-upload-data.response";
 import { AttachmentResponse } from "../vault/models/response/attachment.response";
 import { CipherResponse } from "../vault/models/response/cipher.response";
+import {
+  CollectionAccessDetailsResponse,
+  CollectionResponse,
+} from "../vault/models/response/collection.response";
 import { SyncResponse } from "../vault/models/response/sync.response";
 
 /**

libs/common/src/abstractions/device-crypto.service.abstraction.ts

@@ -1,4 +1,4 @@
-import { DeviceKey } from "../models/domain/symmetric-crypto-key";
+import { DeviceKey } from "../platform/models/domain/symmetric-crypto-key";
 
 import { DeviceResponse } from "./devices/responses/device.response";
 

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

@@ -1,13 +0,0 @@
-import { AbstractControl } from "@angular/forms";
-export interface AllValidationErrors {
-  controlName: string;
-  errorName: string;
-}
-
-export interface FormGroupControls {
-  [key: string]: AbstractControl;
-}
-
-export abstract class FormValidationErrorsService {
-  getFormValidationErrors: (controls: FormGroupControls) => AllValidationErrors[];
-}

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

@@ -1,6 +1,6 @@
 import { Observable } from "rxjs";
 
-import { AccountSettingsSettings } from "../models/domain/account";
+import { AccountSettingsSettings } from "../platform/models/domain/account";
 
 export abstract class SettingsService {
   settings$: Observable<AccountSettingsSettings>;

libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts

@@ -1,7 +1,7 @@
 import { map, Observable } from "rxjs";
 
-import { I18nService } from "../../../abstractions/i18n.service";
-import { Utils } from "../../../misc/utils";
+import { I18nService } from "../../../platform/abstractions/i18n.service";
+import { Utils } from "../../../platform/misc/utils";
 import { OrganizationData } from "../../models/data/organization.data";
 import { Organization } from "../../models/domain/organization";
 

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

@@ -1,6 +1,6 @@
-import { CryptoService } from "../../../abstractions/crypto.service";
-import { EncString } from "../../../models/domain/enc-string";
-import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key";
+import { CryptoService } from "../../../platform/abstractions/crypto.service";
+import { EncString } from "../../../platform/models/domain/enc-string";
+import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
 import { EncryptedOrganizationKeyData } from "../data/encrypted-organization-key.data";
 
 export abstract class BaseEncryptedOrganizationKey {

libs/common/src/admin-console/models/domain/master-password-policy-options.ts

@@ -1,5 +1,5 @@
 import { MasterPasswordPolicyResponse } from "../../../auth/models/response/master-password-policy.response";
-import Domain from "../../../models/domain/domain-base";
+import Domain from "../../../platform/models/domain/domain-base";
 
 export class MasterPasswordPolicyOptions extends Domain {
   minComplexity = 0;

libs/common/src/admin-console/models/domain/password-generator-policy-options.ts

@@ -1,4 +1,4 @@
-import Domain from "../../../models/domain/domain-base";
+import Domain from "../../../platform/models/domain/domain-base";
 
 export class PasswordGeneratorPolicyOptions extends Domain {
   defaultType = "";

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

@@ -1,4 +1,4 @@
-import Domain from "../../../models/domain/domain-base";
+import Domain from "../../../platform/models/domain/domain-base";
 import { PolicyType } from "../../enums";
 import { PolicyData } from "../data/policy.data";
 

libs/common/src/admin-console/models/domain/reset-password-policy-options.ts

@@ -1,4 +1,4 @@
-import Domain from "../../../models/domain/domain-base";
+import Domain from "../../../platform/models/domain/domain-base";
 
 export class ResetPasswordPolicyOptions extends Domain {
   autoEnrollEnabled = false;

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

@@ -1,7 +1,6 @@
 import { BaseResponse } from "../../../models/response/base.response";
 import { CipherResponse } from "../../../vault/models/response/cipher.response";
-
-import { CollectionResponse } from "./collection.response";
+import { CollectionResponse } from "../../../vault/models/response/collection.response";
 
 export class OrganizationExportResponse extends BaseResponse {
   collections: CollectionResponse[];

libs/common/src/admin-console/services/organization/organization.service.spec.ts

@@ -1,7 +1,7 @@
 import { MockProxy, mock, any, mockClear } from "jest-mock-extended";
 import { BehaviorSubject, firstValueFrom } from "rxjs";
 
-import { StateService } from "../../../abstractions/state.service";
+import { StateService } from "../../../platform/abstractions/state.service";
 import { OrganizationData } from "../../models/data/organization.data";
 
 import { OrganizationService } from "./organization.service";

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

@@ -1,6 +1,6 @@
 import { BehaviorSubject, concatMap, map, Observable } from "rxjs";
 
-import { StateService } from "../../../abstractions/state.service";
+import { StateService } from "../../../platform/abstractions/state.service";
 import {
   InternalOrganizationService as InternalOrganizationServiceAbstraction,
   isMember,

libs/common/src/admin-console/services/policy/policy-api.service.ts

@@ -1,9 +1,9 @@
 import { firstValueFrom } from "rxjs";
 
 import { ApiService } from "../../../abstractions/api.service";
-import { StateService } from "../../../abstractions/state.service";
-import { Utils } from "../../../misc/utils";
 import { ListResponse } from "../../../models/response/list.response";
+import { StateService } from "../../../platform/abstractions/state.service";
+import { Utils } from "../../../platform/misc/utils";
 import { PolicyApiServiceAbstraction } from "../../abstractions/policy/policy-api.service.abstraction";
 import { InternalPolicyService } from "../../abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "../../enums";

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

@@ -1,8 +1,8 @@
 import { BehaviorSubject, concatMap, map, Observable, of } from "rxjs";
 
-import { StateService } from "../../../abstractions/state.service";
-import { Utils } from "../../../misc/utils";
 import { ListResponse } from "../../../models/response/list.response";
+import { StateService } from "../../../platform/abstractions/state.service";
+import { Utils } from "../../../platform/misc/utils";
 import { OrganizationService } from "../../abstractions/organization/organization.service.abstraction";
 import { InternalPolicyService as InternalPolicyServiceAbstraction } from "../../abstractions/policy/policy.service.abstraction";
 import { OrganizationUserStatusType, OrganizationUserType, PolicyType } from "../../enums";

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

@@ -1,5 +1,5 @@
-import { StateService } from "../../abstractions/state.service";
 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";
 

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

@@ -1,7 +1,7 @@
 import { Observable } from "rxjs";
 
-import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
 import { AuthRequestPushNotification } from "../../models/response/notification.response";
+import { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key";
 import { AuthenticationStatus } from "../enums/authentication-status";
 import { AuthResult } from "../models/domain/auth-result";
 import {

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

@@ -1,5 +1,5 @@
-import { I18nService } from "../abstractions/i18n.service";
 import { IFrameComponent } from "../misc/iframe_component";
+import { I18nService } from "../platform/abstractions/i18n.service";
 
 export class CaptchaIFrame extends IFrameComponent {
   constructor(

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

@@ -1,17 +1,20 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
 import { ApiService } from "../../abstractions/api.service";
-import { AppIdService } from "../../abstractions/appId.service";
-import { CryptoService } from "../../abstractions/crypto.service";
-import { LogService } from "../../abstractions/log.service";
-import { MessagingService } from "../../abstractions/messaging.service";
-import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
-import { StateService } from "../../abstractions/state.service";
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
-import { Utils } from "../../misc/utils";
-import { Account, AccountProfile, AccountTokens } from "../../models/domain/account";
-import { EncString } from "../../models/domain/enc-string";
-import { PasswordGenerationService } from "../../tools/generator/password";
+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 { Utils } from "../../platform/misc/utils";
+import { Account, AccountProfile, AccountTokens } from "../../platform/models/domain/account";
+import { EncString } from "../../platform/models/domain/enc-string";
+import {
+  PasswordStrengthService,
+  PasswordStrengthServiceAbstraction,
+} from "../../tools/password-strength";
 import { AuthService } from "../abstractions/auth.service";
 import { TokenService } from "../abstractions/token.service";
 import { TwoFactorService } from "../abstractions/two-factor.service";
@@ -85,7 +88,7 @@ describe("LogInStrategy", () => {
   let twoFactorService: MockProxy<TwoFactorService>;
   let authService: MockProxy<AuthService>;
   let policyService: MockProxy<PolicyService>;
-  let passwordGenerationService: MockProxy<PasswordGenerationService>;
+  let passwordStrengthService: MockProxy<PasswordStrengthServiceAbstraction>;
 
   let passwordLogInStrategy: PasswordLogInStrategy;
   let credentials: PasswordLogInCredentials;
@@ -102,7 +105,7 @@ describe("LogInStrategy", () => {
     twoFactorService = mock<TwoFactorService>();
     authService = mock<AuthService>();
     policyService = mock<PolicyService>();
-    passwordGenerationService = mock<PasswordGenerationService>();
+    passwordStrengthService = mock<PasswordStrengthService>();
 
     appIdService.getAppId.mockResolvedValue(deviceId);
     tokenService.decodeToken.calledWith(accessToken).mockResolvedValue(decodedToken);
@@ -118,7 +121,7 @@ describe("LogInStrategy", () => {
       logService,
       stateService,
       twoFactorService,
-      passwordGenerationService,
+      passwordStrengthService,
       policyService,
       authService
     );

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

@@ -1,12 +1,12 @@
 import { ApiService } from "../../abstractions/api.service";
-import { AppIdService } from "../../abstractions/appId.service";
-import { CryptoService } from "../../abstractions/crypto.service";
-import { LogService } from "../../abstractions/log.service";
-import { MessagingService } from "../../abstractions/messaging.service";
-import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
-import { StateService } from "../../abstractions/state.service";
-import { Account, AccountProfile, AccountTokens } from "../../models/domain/account";
 import { KeysRequest } from "../../models/request/keys.request";
+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 { Account, AccountProfile, AccountTokens } from "../../platform/models/domain/account";
 import { TokenService } from "../abstractions/token.service";
 import { TwoFactorService } from "../abstractions/two-factor.service";
 import { TwoFactorProviderType } from "../enums/two-factor-provider-type";

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

@@ -1,17 +1,20 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
 import { ApiService } from "../../abstractions/api.service";
-import { AppIdService } from "../../abstractions/appId.service";
-import { CryptoService } from "../../abstractions/crypto.service";
-import { LogService } from "../../abstractions/log.service";
-import { MessagingService } from "../../abstractions/messaging.service";
-import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
-import { StateService } from "../../abstractions/state.service";
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
 import { HashPurpose } from "../../enums";
-import { Utils } from "../../misc/utils";
-import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
-import { PasswordGenerationService } from "../../tools/generator/password";
+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 { Utils } from "../../platform/misc/utils";
+import { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key";
+import {
+  PasswordStrengthService,
+  PasswordStrengthServiceAbstraction,
+} from "../../tools/password-strength";
 import { AuthService } from "../abstractions/auth.service";
 import { TokenService } from "../abstractions/token.service";
 import { TwoFactorService } from "../abstractions/two-factor.service";
@@ -51,7 +54,7 @@ describe("PasswordLogInStrategy", () => {
   let twoFactorService: MockProxy<TwoFactorService>;
   let authService: MockProxy<AuthService>;
   let policyService: MockProxy<PolicyService>;
-  let passwordGenerationService: MockProxy<PasswordGenerationService>;
+  let passwordStrengthService: MockProxy<PasswordStrengthServiceAbstraction>;
 
   let passwordLogInStrategy: PasswordLogInStrategy;
   let credentials: PasswordLogInCredentials;
@@ -68,7 +71,7 @@ describe("PasswordLogInStrategy", () => {
     twoFactorService = mock<TwoFactorService>();
     authService = mock<AuthService>();
     policyService = mock<PolicyService>();
-    passwordGenerationService = mock<PasswordGenerationService>();
+    passwordStrengthService = mock<PasswordStrengthService>();
 
     appIdService.getAppId.mockResolvedValue(deviceId);
     tokenService.decodeToken.mockResolvedValue({});
@@ -94,7 +97,7 @@ describe("PasswordLogInStrategy", () => {
       logService,
       stateService,
       twoFactorService,
-      passwordGenerationService,
+      passwordStrengthService,
       policyService,
       authService
     );
@@ -141,7 +144,7 @@ describe("PasswordLogInStrategy", () => {
   });
 
   it("does not force the user to update their master password when it meets requirements", async () => {
-    passwordGenerationService.passwordStrength.mockReturnValue({ score: 5 } as any);
+    passwordStrengthService.getPasswordStrength.mockReturnValue({ score: 5 } as any);
     policyService.evaluateMasterPassword.mockReturnValue(true);
 
     const result = await passwordLogInStrategy.logIn(credentials);
@@ -151,7 +154,7 @@ describe("PasswordLogInStrategy", () => {
   });
 
   it("forces the user to update their master password on successful login when it does not meet master password policy requirements", async () => {
-    passwordGenerationService.passwordStrength.mockReturnValue({ score: 0 } as any);
+    passwordStrengthService.getPasswordStrength.mockReturnValue({ score: 0 } as any);
     policyService.evaluateMasterPassword.mockReturnValue(false);
 
     const result = await passwordLogInStrategy.logIn(credentials);
@@ -164,7 +167,7 @@ describe("PasswordLogInStrategy", () => {
   });
 
   it("forces the user to update their master password on successful 2FA login when it does not meet master password policy requirements", async () => {
-    passwordGenerationService.passwordStrength.mockReturnValue({ score: 0 } as any);
+    passwordStrengthService.getPasswordStrength.mockReturnValue({ score: 0 } as any);
     policyService.evaluateMasterPassword.mockReturnValue(false);
 
     const token2FAResponse = new IdentityTwoFactorResponse({

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

@@ -1,15 +1,15 @@
 import { ApiService } from "../../abstractions/api.service";
-import { AppIdService } from "../../abstractions/appId.service";
-import { CryptoService } from "../../abstractions/crypto.service";
-import { LogService } from "../../abstractions/log.service";
-import { MessagingService } from "../../abstractions/messaging.service";
-import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
-import { StateService } from "../../abstractions/state.service";
 import { 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 { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
-import { PasswordGenerationServiceAbstraction } from "../../tools/generator/password";
+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 { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key";
+import { PasswordStrengthServiceAbstraction } from "../../tools/password-strength";
 import { AuthService } from "../abstractions/auth.service";
 import { TokenService } from "../abstractions/token.service";
 import { TwoFactorService } from "../abstractions/two-factor.service";
@@ -54,7 +54,7 @@ export class PasswordLogInStrategy extends LogInStrategy {
     logService: LogService,
     protected stateService: StateService,
     twoFactorService: TwoFactorService,
-    private passwordGenerationService: PasswordGenerationServiceAbstraction,
+    private passwordStrengthService: PasswordStrengthServiceAbstraction,
     private policyService: PolicyService,
     private authService: AuthService
   ) {
@@ -158,7 +158,7 @@ export class PasswordLogInStrategy extends LogInStrategy {
     { masterPassword, email }: PasswordLogInCredentials,
     options: MasterPasswordPolicyOptions
   ): boolean {
-    const passwordStrength = this.passwordGenerationService.passwordStrength(
+    const passwordStrength = this.passwordStrengthService.getPasswordStrength(
       masterPassword,
       email
     )?.score;

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

@@ -1,10 +1,10 @@
 import { ApiService } from "../../abstractions/api.service";
-import { AppIdService } from "../../abstractions/appId.service";
-import { CryptoService } from "../../abstractions/crypto.service";
-import { LogService } from "../../abstractions/log.service";
-import { MessagingService } from "../../abstractions/messaging.service";
-import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
-import { StateService } from "../../abstractions/state.service";
+import { 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 { AuthService } from "../abstractions/auth.service";
 import { TokenService } from "../abstractions/token.service";
 import { TwoFactorService } from "../abstractions/two-factor.service";

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

@@ -1,13 +1,13 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
 import { ApiService } from "../../abstractions/api.service";
-import { AppIdService } from "../../abstractions/appId.service";
-import { CryptoService } from "../../abstractions/crypto.service";
-import { LogService } from "../../abstractions/log.service";
-import { MessagingService } from "../../abstractions/messaging.service";
-import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
-import { StateService } from "../../abstractions/state.service";
-import { Utils } from "../../misc/utils";
+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 { Utils } from "../../platform/misc/utils";
 import { KeyConnectorService } from "../abstractions/key-connector.service";
 import { TokenService } from "../abstractions/token.service";
 import { TwoFactorService } from "../abstractions/two-factor.service";

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

@@ -1,10 +1,10 @@
 import { ApiService } from "../../abstractions/api.service";
-import { AppIdService } from "../../abstractions/appId.service";
-import { CryptoService } from "../../abstractions/crypto.service";
-import { LogService } from "../../abstractions/log.service";
-import { MessagingService } from "../../abstractions/messaging.service";
-import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
-import { StateService } from "../../abstractions/state.service";
+import { 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 { KeyConnectorService } from "../abstractions/key-connector.service";
 import { TokenService } from "../abstractions/token.service";
 import { TwoFactorService } from "../abstractions/two-factor.service";

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

@@ -1,14 +1,14 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
 import { ApiService } from "../../abstractions/api.service";
-import { AppIdService } from "../../abstractions/appId.service";
-import { CryptoService } from "../../abstractions/crypto.service";
-import { EnvironmentService } from "../../abstractions/environment.service";
-import { LogService } from "../../abstractions/log.service";
-import { MessagingService } from "../../abstractions/messaging.service";
-import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
-import { StateService } from "../../abstractions/state.service";
-import { Utils } from "../../misc/utils";
+import { AppIdService } from "../../platform/abstractions/app-id.service";
+import { CryptoService } from "../../platform/abstractions/crypto.service";
+import { EnvironmentService } from "../../platform/abstractions/environment.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 { Utils } from "../../platform/misc/utils";
 import { KeyConnectorService } from "../abstractions/key-connector.service";
 import { TokenService } from "../abstractions/token.service";
 import { TwoFactorService } from "../abstractions/two-factor.service";

libs/common/src/auth/login-strategies/user-api-login.strategy.ts

@@ -1,13 +1,13 @@
 import { ApiService } from "../../abstractions/api.service";
-import { AppIdService } from "../../abstractions/appId.service";
-import { CryptoService } from "../../abstractions/crypto.service";
-import { EnvironmentService } from "../../abstractions/environment.service";
-import { LogService } from "../../abstractions/log.service";
-import { MessagingService } from "../../abstractions/messaging.service";
-import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
-import { StateService } from "../../abstractions/state.service";
 import { TokenService } from "../../auth/abstractions/token.service";
 import { TwoFactorService } from "../../auth/abstractions/two-factor.service";
+import { AppIdService } from "../../platform/abstractions/app-id.service";
+import { CryptoService } from "../../platform/abstractions/crypto.service";
+import { EnvironmentService } from "../../platform/abstractions/environment.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 { KeyConnectorService } from "../abstractions/key-connector.service";
 import { UserApiLogInCredentials } from "../models/domain/log-in-credentials";
 import { UserApiTokenRequest } from "../models/request/identity-token/user-api-token.request";

libs/common/src/auth/models/domain/auth-result.ts

@@ -1,4 +1,4 @@
-import { Utils } from "../../../misc/utils";
+import { Utils } from "../../../platform/misc/utils";
 import { TwoFactorProviderType } from "../../enums/two-factor-provider-type";
 
 import { ForceResetPasswordReason } from "./force-reset-password-reason";

libs/common/src/auth/models/domain/log-in-credentials.ts

@@ -1,4 +1,4 @@
-import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key";
+import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
 import { AuthenticationType } from "../../enums/authentication-type";
 import { TokenTwoFactorRequest } from "../request/identity-token/token-two-factor.request";
 

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

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

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

@@ -1,5 +1,5 @@
 import { ClientType } from "../../../../enums";
-import { Utils } from "../../../../misc/utils";
+import { Utils } from "../../../../platform/misc/utils";
 import { CaptchaProtectedRequest } from "../captcha-protected.request";
 
 import { DeviceRequest } from "./device.request";

libs/common/src/auth/models/response/two-factor-web-authn.response.ts

@@ -1,5 +1,5 @@
-import { Utils } from "../../../misc/utils";
 import { BaseResponse } from "../../../models/response/base.response";
+import { Utils } from "../../../platform/misc/utils";
 
 export class TwoFactorWebAuthnResponse extends BaseResponse {
   enabled: boolean;

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

@@ -1,6 +1,6 @@
 import { ApiService } from "../../abstractions/api.service";
-import { LogService } from "../../abstractions/log.service";
 import { UserVerificationService } from "../../abstractions/userVerification/userVerification.service.abstraction";
+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";

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

@@ -1,6 +1,6 @@
-import { LogService } from "../../abstractions/log.service";
-import { MessagingService } from "../../abstractions/messaging.service";
 import { InternalAccountService } from "../../auth/abstractions/account.service";
+import { LogService } from "../../platform/abstractions/log.service";
+import { MessagingService } from "../../platform/abstractions/messaging.service";
 
 export class AccountServiceImplementation implements InternalAccountService {
   constructor(private messagingService: MessagingService, private logService: LogService) {}

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

@@ -1,23 +1,23 @@
 import { Observable, Subject } from "rxjs";
 
 import { ApiService } from "../../abstractions/api.service";
-import { AppIdService } from "../../abstractions/appId.service";
-import { CryptoService } from "../../abstractions/crypto.service";
-import { EncryptService } from "../../abstractions/encrypt.service";
-import { EnvironmentService } from "../../abstractions/environment.service";
-import { I18nService } from "../../abstractions/i18n.service";
-import { LogService } from "../../abstractions/log.service";
-import { MessagingService } from "../../abstractions/messaging.service";
-import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
-import { StateService } from "../../abstractions/state.service";
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
 import { KdfType, KeySuffixOptions } from "../../enums";
-import { Utils } from "../../misc/utils";
-import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
 import { PreloginRequest } from "../../models/request/prelogin.request";
 import { ErrorResponse } from "../../models/response/error.response";
 import { AuthRequestPushNotification } from "../../models/response/notification.response";
-import { PasswordGenerationServiceAbstraction } from "../../tools/generator/password";
+import { AppIdService } from "../../platform/abstractions/app-id.service";
+import { CryptoService } from "../../platform/abstractions/crypto.service";
+import { EncryptService } from "../../platform/abstractions/encrypt.service";
+import { EnvironmentService } from "../../platform/abstractions/environment.service";
+import { I18nService } from "../../platform/abstractions/i18n.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 { Utils } from "../../platform/misc/utils";
+import { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key";
+import { PasswordStrengthServiceAbstraction } from "../../tools/password-strength";
 import { AuthService as AuthServiceAbstraction } from "../abstractions/auth.service";
 import { KeyConnectorService } from "../abstractions/key-connector.service";
 import { TokenService } from "../abstractions/token.service";
@@ -102,7 +102,7 @@ export class AuthService implements AuthServiceAbstraction {
     protected twoFactorService: TwoFactorService,
     protected i18nService: I18nService,
     protected encryptService: EncryptService,
-    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
+    protected passwordStrengthService: PasswordStrengthServiceAbstraction,
     protected policyService: PolicyService
   ) {}
 
@@ -133,7 +133,7 @@ export class AuthService implements AuthServiceAbstraction {
           this.logService,
           this.stateService,
           this.twoFactorService,
-          this.passwordGenerationService,
+          this.passwordStrengthService,
           this.policyService,
           this
         );

libs/common/src/auth/services/key-connector.service.ts

@@ -1,13 +1,13 @@
 import { ApiService } from "../../abstractions/api.service";
-import { CryptoService } from "../../abstractions/crypto.service";
-import { CryptoFunctionService } from "../../abstractions/cryptoFunction.service";
-import { LogService } from "../../abstractions/log.service";
-import { StateService } from "../../abstractions/state.service";
 import { OrganizationService } from "../../admin-console/abstractions/organization/organization.service.abstraction";
 import { OrganizationUserType } from "../../admin-console/enums";
-import { Utils } from "../../misc/utils";
-import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
 import { KeysRequest } from "../../models/request/keys.request";
+import { CryptoFunctionService } from "../../platform/abstractions/crypto-function.service";
+import { CryptoService } from "../../platform/abstractions/crypto.service";
+import { LogService } from "../../platform/abstractions/log.service";
+import { StateService } from "../../platform/abstractions/state.service";
+import { Utils } from "../../platform/misc/utils";
+import { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key";
 import { KeyConnectorService as KeyConnectorServiceAbstraction } from "../abstractions/key-connector.service";
 import { TokenService } from "../abstractions/token.service";
 import { KdfConfig } from "../models/domain/kdf-config";

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

@@ -1,4 +1,4 @@
-import { StateService } from "../../abstractions/state.service";
+import { StateService } from "../../platform/abstractions/state.service";
 import { LoginService as LoginServiceAbstraction } from "../abstractions/login.service";
 
 export class LoginService implements LoginServiceAbstraction {

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

@@ -1,5 +1,5 @@
-import { StateService } from "../../abstractions/state.service";
-import { Utils } from "../../misc/utils";
+import { StateService } from "../../platform/abstractions/state.service";
+import { Utils } from "../../platform/misc/utils";
 import { TokenService as TokenServiceAbstraction } from "../abstractions/token.service";
 import { IdentityTokenResponse } from "../models/response/identity-token.response";
 

libs/common/src/auth/services/two-factor.service.ts

@@ -1,5 +1,5 @@
-import { I18nService } from "../../abstractions/i18n.service";
-import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
+import { I18nService } from "../../platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 import {
   TwoFactorProviderDetails,
   TwoFactorService as TwoFactorServiceAbstraction,

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

@@ -1,7 +1,7 @@
-import { CryptoService } from "../../../abstractions/crypto.service";
-import { I18nService } from "../../../abstractions/i18n.service";
 import { UserVerificationApiServiceAbstraction } from "../../../abstractions/userVerification/userVerification-api.service.abstraction";
 import { UserVerificationService as UserVerificationServiceAbstraction } from "../../../abstractions/userVerification/userVerification.service.abstraction";
+import { CryptoService } from "../../../platform/abstractions/crypto.service";
+import { I18nService } from "../../../platform/abstractions/i18n.service";
 import { Verification } from "../../../types/verification";
 import { VerificationType } from "../../enums/verification-type";
 import { SecretVerificationRequest } from "../../models/request/secret-verification.request";

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

@@ -1,5 +1,5 @@
-import { I18nService } from "../abstractions/i18n.service";
-import { PlatformUtilsService } from "../abstractions/platformUtils.service";
+import { I18nService } from "../platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "../platform/abstractions/platform-utils.service";
 
 export class WebAuthnIFrame {
   private iframe: HTMLIFrameElement = null;

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

@@ -1,6 +1,6 @@
+import { EncString } from "../../platform/models/domain/enc-string";
 import { Card as CardDomain } from "../../vault/models/domain/card";
 import { CardView } from "../../vault/models/view/card.view";
-import { EncString } from "../domain/enc-string";
 
 export class CardExport {
   static template(): CardExport {

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

@@ -1,8 +1,8 @@
+import { EncString } from "../../platform/models/domain/enc-string";
 import { CipherRepromptType } from "../../vault/enums/cipher-reprompt-type";
 import { CipherType } from "../../vault/enums/cipher-type";
 import { Cipher as CipherDomain } from "../../vault/models/domain/cipher";
 import { CipherView } from "../../vault/models/view/cipher.view";
-import { EncString } from "../domain/enc-string";
 
 import { CardExport } from "./card.export";
 import { FieldExport } from "./field.export";

libs/common/src/models/export/collection-with-id.export.ts

@@ -1,5 +1,5 @@
-import { Collection as CollectionDomain } from "../../admin-console/models/domain/collection";
-import { CollectionView } from "../../admin-console/models/view/collection.view";
+import { Collection as CollectionDomain } from "../../vault/models/domain/collection";
+import { CollectionView } from "../../vault/models/view/collection.view";
 
 import { CollectionExport } from "./collection.export";
 

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

@@ -1,6 +1,6 @@
-import { Collection as CollectionDomain } from "../../admin-console/models/domain/collection";
-import { CollectionView } from "../../admin-console/models/view/collection.view";
-import { EncString } from "../domain/enc-string";
+import { EncString } from "../../platform/models/domain/enc-string";
+import { Collection as CollectionDomain } from "../../vault/models/domain/collection";
+import { CollectionView } from "../../vault/models/view/collection.view";
 
 export class CollectionExport {
   static template(): CollectionExport {

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

@@ -1,7 +1,7 @@
 import { FieldType, LinkedIdType } from "../../enums";
+import { EncString } from "../../platform/models/domain/enc-string";
 import { Field as FieldDomain } from "../../vault/models/domain/field";
 import { FieldView } from "../../vault/models/view/field.view";
-import { EncString } from "../domain/enc-string";
 
 export class FieldExport {
   static template(): FieldExport {

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

@@ -1,6 +1,6 @@
+import { EncString } from "../../platform/models/domain/enc-string";
 import { Folder as FolderDomain } from "../../vault/models/domain/folder";
 import { FolderView } from "../../vault/models/view/folder.view";
-import { EncString } from "../domain/enc-string";
 
 export class FolderExport {
   static template(): FolderExport {

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

@@ -1,6 +1,6 @@
+import { EncString } from "../../platform/models/domain/enc-string";
 import { Identity as IdentityDomain } from "../../vault/models/domain/identity";
 import { IdentityView } from "../../vault/models/view/identity.view";
-import { EncString } from "../domain/enc-string";
 
 export class IdentityExport {
   static template(): IdentityExport {

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

@@ -1,7 +1,7 @@
 import { UriMatchType } from "../../enums";
+import { EncString } from "../../platform/models/domain/enc-string";
 import { LoginUri as LoginUriDomain } from "../../vault/models/domain/login-uri";
 import { LoginUriView } from "../../vault/models/view/login-uri.view";
-import { EncString } from "../domain/enc-string";
 
 export class LoginUriExport {
   static template(): LoginUriExport {

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

@@ -1,6 +1,6 @@
+import { EncString } from "../../platform/models/domain/enc-string";
 import { Login as LoginDomain } from "../../vault/models/domain/login";
 import { LoginView } from "../../vault/models/view/login.view";
-import { EncString } from "../domain/enc-string";
 
 import { LoginUriExport } from "./login-uri.export";
 

libs/common/src/models/request/import-organization-ciphers.request.ts

@@ -1,5 +1,5 @@
-import { CollectionWithIdRequest } from "../../admin-console/models/request/collection-with-id.request";
 import { CipherRequest } from "../../vault/models/request/cipher.request";
+import { CollectionWithIdRequest } from "../../vault/models/request/collection-with-id.request";
 
 import { KvpRequest } from "./kvp.request";
 

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

@@ -1,4 +1,4 @@
-import { Utils } from "../../misc/utils";
+import { Utils } from "../../platform/misc/utils";
 
 import { BaseResponse } from "./base.response";
 

libs/common/src/platform/abstractions/config/config.service.abstraction.ts

@@ -1,6 +1,6 @@
 import { Observable } from "rxjs";
 
-import { FeatureFlag } from "../../enums/feature-flag.enum";
+import { FeatureFlag } from "../../../enums/feature-flag.enum";
 
 import { ServerConfig } from "./server-config";
 

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

@@ -1,6 +1,6 @@
+import { CsprngArray } from "../../types/csprng";
 import { DecryptParameters } from "../models/domain/decrypt-parameters";
 import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
-import { CsprngArray } from "../types/csprng";
 
 export abstract class CryptoFunctionService {
   pbkdf2: (

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

@@ -1,8 +1,8 @@
-import { ProfileOrganizationResponse } from "../admin-console/models/response/profile-organization.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 { HashPurpose, KdfType, KeySuffixOptions } from "../enums";
+import { ProfileOrganizationResponse } from "../../admin-console/models/response/profile-organization.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 { 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/abstractions/encrypt.service.ts

@@ -1,5 +1,5 @@
-import { IEncrypted } from "../interfaces/IEncrypted";
 import { Decryptable } from "../interfaces/decryptable.interface";
+import { Encrypted } from "../interfaces/encrypted";
 import { InitializerMetadata } from "../interfaces/initializer-metadata.interface";
 import { EncArrayBuffer } from "../models/domain/enc-array-buffer";
 import { EncString } from "../models/domain/enc-string";
@@ -12,8 +12,8 @@ export abstract class EncryptService {
     key?: SymmetricCryptoKey
   ) => Promise<EncArrayBuffer>;
   abstract decryptToUtf8: (encString: EncString, key: SymmetricCryptoKey) => Promise<string>;
-  abstract decryptToBytes: (encThing: IEncrypted, key: SymmetricCryptoKey) => Promise<ArrayBuffer>;
-  abstract resolveLegacyKey: (key: SymmetricCryptoKey, encThing: IEncrypted) => SymmetricCryptoKey;
+  abstract decryptToBytes: (encThing: Encrypted, key: SymmetricCryptoKey) => Promise<ArrayBuffer>;
+  abstract resolveLegacyKey: (key: SymmetricCryptoKey, encThing: Encrypted) => SymmetricCryptoKey;
   abstract decryptItems: <T extends InitializerMetadata>(
     items: Decryptable<T>[],
     key: SymmetricCryptoKey

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

@@ -18,7 +18,7 @@ export type PayPalConfig = {
 };
 
 export abstract class EnvironmentService {
-  urls: Observable<Urls>;
+  urls: Observable<void>;
 
   hasBaseUrl: () => boolean;
   getNotificationsUrl: () => string;

libs/common/src/platform/abstractions/file-download/file-download.builder.ts

@@ -1,4 +1,4 @@
-import { FileDownloadRequest } from "./fileDownloadRequest";
+import { FileDownloadRequest } from "./file-download.request";
 
 export class FileDownloadBuilder {
   get blobOptions(): any {

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

@@ -1,4 +1,4 @@
-import { FileDownloadRequest } from "./fileDownloadRequest";
+import { FileDownloadRequest } from "./file-download.request";
 
 export abstract class FileDownloadService {
   download: (request: FileDownloadRequest) => void;

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";
 
 export abstract class LogService {
   debug: (message: string) => void;

libs/common/src/platform/abstractions/platform-utils.service.ts

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

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

@@ -1,32 +1,32 @@
 import { Observable } from "rxjs";
 
-import { CollectionData } from "../admin-console/models/data/collection.data";
-import { EncryptedOrganizationKeyData } from "../admin-console/models/data/encrypted-organization-key.data";
-import { OrganizationData } from "../admin-console/models/data/organization.data";
-import { PolicyData } from "../admin-console/models/data/policy.data";
-import { ProviderData } from "../admin-console/models/data/provider.data";
-import { Policy } from "../admin-console/models/domain/policy";
-import { CollectionView } from "../admin-console/models/view/collection.view";
-import { EnvironmentUrls } from "../auth/models/domain/environment-urls";
-import { ForceResetPasswordReason } from "../auth/models/domain/force-reset-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 { EncryptedOrganizationKeyData } from "../../admin-console/models/data/encrypted-organization-key.data";
+import { OrganizationData } from "../../admin-console/models/data/organization.data";
+import { PolicyData } from "../../admin-console/models/data/policy.data";
+import { ProviderData } from "../../admin-console/models/data/provider.data";
+import { Policy } from "../../admin-console/models/domain/policy";
+import { EnvironmentUrls } from "../../auth/models/domain/environment-urls";
+import { ForceResetPasswordReason } from "../../auth/models/domain/force-reset-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 { GeneratedPasswordHistory } from "../../tools/generator/password";
+import { SendData } from "../../tools/send/models/data/send.data";
+import { SendView } from "../../tools/send/models/view/send.view";
+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 { 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 { ServerConfigData } from "../models/data/server-config.data";
 import { Account, AccountSettingsSettings } from "../models/domain/account";
 import { EncString } from "../models/domain/enc-string";
 import { StorageOptions } from "../models/domain/storage-options";
 import { DeviceKey, SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
-import { WindowState } from "../models/domain/window-state";
-import { GeneratedPasswordHistory } from "../tools/generator/password";
-import { SendData } from "../tools/send/models/data/send.data";
-import { SendView } from "../tools/send/models/view/send.view";
-import { CipherData } from "../vault/models/data/cipher.data";
-import { FolderData } from "../vault/models/data/folder.data";
-import { LocalData } from "../vault/models/data/local.data";
-import { CipherView } from "../vault/models/view/cipher.view";
-import { AddEditCipherInfo } from "../vault/types/add-edit-cipher-info";
 
 export abstract class StateService<T extends Account = Account> {
   accounts$: Observable<{ [userId: string]: T }>;

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

@@ -1,4 +1,4 @@
-import { AuthService } from "../auth/abstractions/auth.service";
+import { AuthService } from "../../auth/abstractions/auth.service";
 
 export abstract class SystemService {
   startProcessReload: (authService: AuthService) => Promise<void>;

libs/common/src/platform/factories/state-factory.ts

@@ -1,8 +1,8 @@
 import { Account } from "../models/domain/account";
 import { GlobalState } from "../models/domain/global-state";
 
-import { AccountFactory } from "./accountFactory";
-import { GlobalStateFactory } from "./globalStateFactory";
+import { AccountFactory } from "./account-factory";
+import { GlobalStateFactory } from "./global-state-factory";
 
 export class StateFactory<
   TGlobal extends GlobalState = GlobalState,

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

@@ -1,6 +1,6 @@
-import { EncryptionType } from "../enums";
+import { EncryptionType } from "../../enums";
 
-export interface IEncrypted {
+export interface Encrypted {
   encryptionType?: EncryptionType;
   dataBytes: ArrayBuffer;
   macBytes: ArrayBuffer;

libs/common/src/platform/models/domain/account-keys.spec.ts

@@ -1,4 +1,4 @@
-import { makeStaticByteArray } from "../../../spec";
+import { makeStaticByteArray } from "../../../../spec";
 import { Utils } from "../../misc/utils";
 
 import { AccountKeys, EncryptionPair } from "./account";

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

@@ -1,26 +1,26 @@
 import { Jsonify } from "type-fest";
 
-import { CollectionData } from "../../admin-console/models/data/collection.data";
-import { EncryptedOrganizationKeyData } from "../../admin-console/models/data/encrypted-organization-key.data";
-import { OrganizationData } from "../../admin-console/models/data/organization.data";
-import { PolicyData } from "../../admin-console/models/data/policy.data";
-import { ProviderData } from "../../admin-console/models/data/provider.data";
-import { Policy } from "../../admin-console/models/domain/policy";
-import { CollectionView } from "../../admin-console/models/view/collection.view";
-import { AuthenticationStatus } from "../../auth/enums/authentication-status";
-import { EnvironmentUrls } from "../../auth/models/domain/environment-urls";
-import { ForceResetPasswordReason } from "../../auth/models/domain/force-reset-password-reason";
-import { KdfType, UriMatchType } from "../../enums";
+import { EncryptedOrganizationKeyData } from "../../../admin-console/models/data/encrypted-organization-key.data";
+import { OrganizationData } from "../../../admin-console/models/data/organization.data";
+import { PolicyData } from "../../../admin-console/models/data/policy.data";
+import { ProviderData } from "../../../admin-console/models/data/provider.data";
+import { Policy } from "../../../admin-console/models/domain/policy";
+import { AuthenticationStatus } from "../../../auth/enums/authentication-status";
+import { EnvironmentUrls } from "../../../auth/models/domain/environment-urls";
+import { ForceResetPasswordReason } from "../../../auth/models/domain/force-reset-password-reason";
+import { KdfType, UriMatchType } from "../../../enums";
+import { EventData } from "../../../models/data/event.data";
+import { GeneratedPasswordHistory } from "../../../tools/generator/password";
+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 { 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 { Utils } from "../../misc/utils";
-import { GeneratedPasswordHistory } from "../../tools/generator/password";
-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 { CipherData } from "../../vault/models/data/cipher.data";
-import { FolderData } from "../../vault/models/data/folder.data";
-import { CipherView } from "../../vault/models/view/cipher.view";
-import { EventData } from "../data/event.data";
-import { ServerConfigData } from "../data/server-config.data";
+import { ServerConfigData } from "../../models/data/server-config.data";
 
 import { EncString } from "./enc-string";
 import { DeviceKey, SymmetricCryptoKey } from "./symmetric-crypto-key";

libs/common/src/platform/models/domain/domain-base.ts

@@ -1,4 +1,4 @@
-import { View } from "../view/view";
+import { View } from "../../../models/view/view";
 
 import { EncString } from "./enc-string";
 import { SymmetricCryptoKey } from "./symmetric-crypto-key";