[PM-328] Move generator to tools (#4980)

* Move generator to tools

libs/angular:
- Move generator.component to tools
libs/common:
- Move password generation to tools
- Move username generation including email-forwarders to tools

apps/*
- create tools-subfolder and move files regarding generator functionality
- Update all the imports

.github/:
- Cleaned up whitelist-capital-letters.txt
- Added team-tools-dev folders to CODEOWNERS

* Remove unused barrel file

libs/angular/src/auth/components/change-password.component.ts

@@ -4,7 +4,6 @@ import { Subject, takeUntil } from "rxjs";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
@@ -14,6 +13,7 @@ import { Utils } from "@bitwarden/common/misc/utils";
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 
 import { PasswordColorText } from "../../shared/components/password-strength/password-strength.component";
 
@@ -39,7 +39,7 @@ export class ChangePasswordComponent implements OnInit, OnDestroy {
     protected i18nService: I18nService,
     protected cryptoService: CryptoService,
     protected messagingService: MessagingService,
-    protected passwordGenerationService: PasswordGenerationService,
+    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
     protected platformUtilsService: PlatformUtilsService,
     protected policyService: PolicyService,
     protected stateService: StateService

libs/angular/src/auth/components/login-with-device.component.ts

@@ -10,7 +10,6 @@ import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunc
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { ValidationService } from "@bitwarden/common/abstractions/validation.service";
@@ -23,6 +22,7 @@ import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth
 import { Utils } from "@bitwarden/common/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 
 import { CaptchaProtectedComponent } from "./captcha-protected.component";
 
@@ -51,7 +51,7 @@ export class LoginWithDeviceComponent
     private cryptoService: CryptoService,
     private cryptoFunctionService: CryptoFunctionService,
     private appIdService: AppIdService,
-    private passwordGenerationService: PasswordGenerationService,
+    private passwordGenerationService: PasswordGenerationServiceAbstraction,
     private apiService: ApiService,
     private authService: AuthService,
     private logService: LogService,

libs/angular/src/auth/components/login.component.ts

@@ -13,7 +13,6 @@ import {
 } from "@bitwarden/common/abstractions/formValidationErrors.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -21,6 +20,7 @@ import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { PasswordLogInCredentials } from "@bitwarden/common/auth/models/domain/log-in-credentials";
 import { Utils } from "@bitwarden/common/misc/utils";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 
 import { CaptchaProtectedComponent } from "./captcha-protected.component";
 
@@ -60,7 +60,7 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
     i18nService: I18nService,
     protected stateService: StateService,
     environmentService: EnvironmentService,
-    protected passwordGenerationService: PasswordGenerationService,
+    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
     protected cryptoFunctionService: CryptoFunctionService,
     protected logService: LogService,
     protected ngZone: NgZone,

libs/angular/src/auth/components/sso.component.ts

@@ -7,7 +7,6 @@ import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunc
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -15,6 +14,7 @@ import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { SsoLogInCredentials } from "@bitwarden/common/auth/models/domain/log-in-credentials";
 import { SsoPreValidateResponse } from "@bitwarden/common/auth/models/response/sso-pre-validate.response";
 import { Utils } from "@bitwarden/common/misc/utils";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 
 @Directive()
 export class SsoComponent {
@@ -48,7 +48,7 @@ export class SsoComponent {
     protected apiService: ApiService,
     protected cryptoFunctionService: CryptoFunctionService,
     protected environmentService: EnvironmentService,
-    protected passwordGenerationService: PasswordGenerationService,
+    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
     protected logService: LogService
   ) {}
 

libs/angular/src/auth/components/update-password.component.ts

@@ -6,7 +6,6 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
@@ -16,6 +15,7 @@ import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { Verification } from "@bitwarden/common/types/verification";
 
 import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component";
@@ -34,7 +34,7 @@ export class UpdatePasswordComponent extends BaseChangePasswordComponent {
     protected router: Router,
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
-    passwordGenerationService: PasswordGenerationService,
+    passwordGenerationService: PasswordGenerationServiceAbstraction,
     policyService: PolicyService,
     cryptoService: CryptoService,
     messagingService: MessagingService,

libs/angular/src/auth/components/update-temp-password.component.ts

@@ -5,7 +5,6 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
@@ -13,6 +12,7 @@ import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component";
@@ -29,7 +29,7 @@ export class UpdateTempPasswordComponent extends BaseChangePasswordComponent {
   constructor(
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
-    passwordGenerationService: PasswordGenerationService,
+    passwordGenerationService: PasswordGenerationServiceAbstraction,
     policyService: PolicyService,
     cryptoService: CryptoService,
     messagingService: MessagingService,

libs/angular/src/components/register.component.ts

@@ -12,7 +12,6 @@ import {
 } from "@bitwarden/common/abstractions/formValidationErrors.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -23,6 +22,7 @@ import { Utils } from "@bitwarden/common/misc/utils";
 import { KeysRequest } from "@bitwarden/common/models/request/keys.request";
 import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request";
 import { RegisterRequest } from "@bitwarden/common/models/request/register.request";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 
 import { CaptchaProtectedComponent } from "../auth/components/captcha-protected.component";
 import { PasswordColorText } from "../shared/components/password-strength/password-strength.component";
@@ -87,7 +87,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn
     protected apiService: ApiService,
     protected stateService: StateService,
     platformUtilsService: PlatformUtilsService,
-    protected passwordGenerationService: PasswordGenerationService,
+    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
     environmentService: EnvironmentService,
     protected logService: LogService,
     protected auditService: AuditService

libs/angular/src/components/set-password.component.ts

@@ -9,7 +9,6 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/abstractions/organization-user/requests";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
@@ -21,6 +20,7 @@ import { Utils } from "@bitwarden/common/misc/utils";
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
 import { KeysRequest } from "@bitwarden/common/models/request/keys.request";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { ChangePasswordComponent as BaseChangePasswordComponent } from "../auth/components/change-password.component";
@@ -41,7 +41,7 @@ export class SetPasswordComponent extends BaseChangePasswordComponent {
     i18nService: I18nService,
     cryptoService: CryptoService,
     messagingService: MessagingService,
-    passwordGenerationService: PasswordGenerationService,
+    passwordGenerationService: PasswordGenerationServiceAbstraction,
     platformUtilsService: PlatformUtilsService,
     private policyApiService: PolicyApiServiceAbstraction,
     policyService: PolicyService,

libs/angular/src/services/jslib-services.module.ts

@@ -33,7 +33,6 @@ import {
   InternalOrganizationService,
   OrganizationService as OrganizationServiceAbstraction,
 } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
 import {
@@ -50,7 +49,6 @@ import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.s
 import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service";
 import { UserVerificationApiServiceAbstraction } from "@bitwarden/common/abstractions/userVerification/userVerification-api.service.abstraction";
 import { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
-import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "@bitwarden/common/abstractions/usernameGeneration.service";
 import { ValidationService as ValidationServiceAbstraction } from "@bitwarden/common/abstractions/validation.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
@@ -101,7 +99,6 @@ import { OrgDomainService } from "@bitwarden/common/services/organization-domain
 import { OrganizationUserServiceImplementation } from "@bitwarden/common/services/organization-user/organization-user.service.implementation";
 import { OrganizationApiService } from "@bitwarden/common/services/organization/organization-api.service";
 import { OrganizationService } from "@bitwarden/common/services/organization/organization.service";
-import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service";
 import { PolicyApiService } from "@bitwarden/common/services/policy/policy-api.service";
 import { PolicyService } from "@bitwarden/common/services/policy/policy.service";
 import { ProviderService } from "@bitwarden/common/services/provider.service";
@@ -111,11 +108,18 @@ import { SettingsService } from "@bitwarden/common/services/settings.service";
 import { StateService } from "@bitwarden/common/services/state.service";
 import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
 import { TotpService } from "@bitwarden/common/services/totp.service";
-import { UsernameGenerationService } from "@bitwarden/common/services/usernameGeneration.service";
 import { ValidationService } from "@bitwarden/common/services/validation.service";
 import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service";
 import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service";
+import {
+  PasswordGenerationService,
+  PasswordGenerationServiceAbstraction,
+} from "@bitwarden/common/tools/generator/password";
+import {
+  UsernameGenerationService,
+  UsernameGenerationServiceAbstraction,
+} from "@bitwarden/common/tools/generator/username";
 import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
 import {

libs/angular/src/shared/components/password-strength/password-strength.component.ts

@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnChanges, Output } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 
 export interface PasswordColorText {
   color: string;
@@ -59,7 +59,7 @@ export class PasswordStrengthComponent implements OnChanges {
 
   constructor(
     private i18nService: I18nService,
-    private passwordGenerationService: PasswordGenerationService
+    private passwordGenerationService: PasswordGenerationServiceAbstraction
   ) {}
 
   ngOnChanges(): void {

libs/angular/src/tools/generator/components/generator.component.ts

@@ -4,11 +4,11 @@ import { first } from "rxjs/operators";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service";
 import { PasswordGeneratorPolicyOptions } from "@bitwarden/common/models/domain/password-generator-policy-options";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
+import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username";
 
 @Directive()
 export class GeneratorComponent implements OnInit {
@@ -33,8 +33,8 @@ export class GeneratorComponent implements OnInit {
   usernameWebsite: string = null;
 
   constructor(
-    protected passwordGenerationService: PasswordGenerationService,
-    protected usernameGenerationService: UsernameGenerationService,
+    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
+    protected usernameGenerationService: UsernameGenerationServiceAbstraction,
     protected platformUtilsService: PlatformUtilsService,
     protected stateService: StateService,
     protected i18nService: I18nService,

libs/angular/src/tools/generator/components/password-generator-history.component.ts

@@ -1,16 +1,18 @@
 import { Directive, OnInit } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { GeneratedPasswordHistory } from "@bitwarden/common/models/domain/generated-password-history";
+import {
+  GeneratedPasswordHistory,
+  PasswordGenerationServiceAbstraction,
+} from "@bitwarden/common/tools/generator/password";
 
 @Directive()
 export class PasswordGeneratorHistoryComponent implements OnInit {
   history: GeneratedPasswordHistory[] = [];
 
   constructor(
-    protected passwordGenerationService: PasswordGenerationService,
+    protected passwordGenerationService: PasswordGenerationServiceAbstraction,
     protected platformUtilsService: PlatformUtilsService,
     protected i18nService: I18nService,
     private win: Window

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

@@ -15,13 +15,13 @@ import { SendData } from "../models/data/send.data";
 import { ServerConfigData } from "../models/data/server-config.data";
 import { Account, AccountSettingsSettings } from "../models/domain/account";
 import { EncString } from "../models/domain/enc-string";
-import { GeneratedPasswordHistory } from "../models/domain/generated-password-history";
 import { Policy } from "../models/domain/policy";
 import { StorageOptions } from "../models/domain/storage-options";
 import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
 import { WindowState } from "../models/domain/window-state";
 import { CollectionView } from "../models/view/collection.view";
 import { SendView } from "../models/view/send.view";
+import { GeneratedPasswordHistory } from "../tools/generator/password";
 import { CipherData } from "../vault/models/data/cipher.data";
 import { FolderData } from "../vault/models/data/folder.data";
 import { LocalData } from "../vault/models/data/local.data";

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

@@ -5,6 +5,7 @@ import { EnvironmentUrls } from "../../auth/models/domain/environment-urls";
 import { KdfType } from "../../enums/kdfType";
 import { UriMatchType } from "../../enums/uriMatchType";
 import { Utils } from "../../misc/utils";
+import { GeneratedPasswordHistory } from "../../tools/generator/password";
 import { DeepJsonify } from "../../types/deep-jsonify";
 import { CipherData } from "../../vault/models/data/cipher.data";
 import { FolderData } from "../../vault/models/data/folder.data";
@@ -21,7 +22,6 @@ import { CollectionView } from "../view/collection.view";
 import { SendView } from "../view/send.view";
 
 import { EncString } from "./enc-string";
-import { GeneratedPasswordHistory } from "./generated-password-history";
 import { Policy } from "./policy";
 import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 

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

@@ -32,7 +32,6 @@ import {
   AccountSettingsSettings,
 } from "../models/domain/account";
 import { EncString } from "../models/domain/enc-string";
-import { GeneratedPasswordHistory } from "../models/domain/generated-password-history";
 import { GlobalState } from "../models/domain/global-state";
 import { Policy } from "../models/domain/policy";
 import { State } from "../models/domain/state";
@@ -41,6 +40,7 @@ import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
 import { WindowState } from "../models/domain/window-state";
 import { CollectionView } from "../models/view/collection.view";
 import { SendView } from "../models/view/send.view";
+import { GeneratedPasswordHistory } from "../tools/generator/password";
 import { CipherData } from "../vault/models/data/cipher.data";
 import { FolderData } from "../vault/models/data/folder.data";
 import { LocalData } from "../vault/models/data/local.data";

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

@@ -19,9 +19,9 @@ import {
   EncryptionPair,
 } from "../models/domain/account";
 import { EncString } from "../models/domain/enc-string";
-import { GeneratedPasswordHistory } from "../models/domain/generated-password-history";
 import { GlobalState } from "../models/domain/global-state";
 import { StorageOptions } from "../models/domain/storage-options";
+import { GeneratedPasswordHistory } from "../tools/generator/password";
 import { CipherData } from "../vault/models/data/cipher.data";
 import { FolderData } from "../vault/models/data/folder.data";
 

libs/common/src/tools/generator/password/index.ts

@@ -0,0 +1,3 @@
+export { PasswordGenerationServiceAbstraction } from "./password-generation.service.abstraction";
+export { PasswordGenerationService } from "./password-generation.service";
+export { GeneratedPasswordHistory } from "./generated-password-history";

libs/common/src/tools/generator/password/password-generation.service.abstraction.ts

@@ -1,10 +1,11 @@
 import * as zxcvbn from "zxcvbn";
 
-import { GeneratedPasswordHistory } from "../models/domain/generated-password-history";
-import { PasswordGeneratorOptions } from "../models/domain/password-generator-options";
-import { PasswordGeneratorPolicyOptions } from "../models/domain/password-generator-policy-options";
+import { PasswordGeneratorPolicyOptions } from "../../../models/domain/password-generator-policy-options";
 
-export abstract class PasswordGenerationService {
+import { GeneratedPasswordHistory } from "./generated-password-history";
+import { PasswordGeneratorOptions } from "./password-generator-options";
+
+export abstract class PasswordGenerationServiceAbstraction {
   generatePassword: (options: PasswordGeneratorOptions) => Promise<string>;
   generatePassphrase: (options: PasswordGeneratorOptions) => Promise<string>;
   getOptions: () => Promise<[PasswordGeneratorOptions, PasswordGeneratorPolicyOptions]>;

libs/common/src/tools/generator/password/password-generation.service.ts

@@ -1,15 +1,16 @@
 import * as zxcvbn from "zxcvbn";
 
-import { CryptoService } from "../abstractions/crypto.service";
-import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "../abstractions/passwordGeneration.service";
-import { PolicyService } from "../abstractions/policy/policy.service.abstraction";
-import { StateService } from "../abstractions/state.service";
-import { PolicyType } from "../enums/policyType";
-import { EFFLongWordList } from "../misc/wordlist";
-import { EncString } from "../models/domain/enc-string";
-import { GeneratedPasswordHistory } from "../models/domain/generated-password-history";
-import { PasswordGeneratorOptions } from "../models/domain/password-generator-options";
-import { PasswordGeneratorPolicyOptions } from "../models/domain/password-generator-policy-options";
+import { CryptoService } from "../../../abstractions/crypto.service";
+import { PolicyService } from "../../../abstractions/policy/policy.service.abstraction";
+import { StateService } from "../../../abstractions/state.service";
+import { PolicyType } from "../../../enums/policyType";
+import { EFFLongWordList } from "../../../misc/wordlist";
+import { EncString } from "../../../models/domain/enc-string";
+import { PasswordGeneratorPolicyOptions } from "../../../models/domain/password-generator-policy-options";
+
+import { GeneratedPasswordHistory } from "./generated-password-history";
+import { PasswordGenerationServiceAbstraction } from "./password-generation.service.abstraction";
+import { PasswordGeneratorOptions } from "./password-generator-options";
 
 const DefaultOptions: PasswordGeneratorOptions = {
   length: 14,

libs/common/src/tools/generator/username/email-forwarders/anon-addy-forwarder.ts

@@ -1,4 +1,4 @@
-import { ApiService } from "../abstractions/api.service";
+import { ApiService } from "../../../../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
 import { ForwarderOptions } from "./forwarder-options";

libs/common/src/tools/generator/username/email-forwarders/duck-duck-go-forwarder.ts

@@ -1,4 +1,4 @@
-import { ApiService } from "../abstractions/api.service";
+import { ApiService } from "../../../../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
 import { ForwarderOptions } from "./forwarder-options";

libs/common/src/tools/generator/username/email-forwarders/fastmail-forwarder.ts

@@ -1,4 +1,4 @@
-import { ApiService } from "../abstractions/api.service";
+import { ApiService } from "../../../../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
 import { ForwarderOptions } from "./forwarder-options";

libs/common/src/tools/generator/username/email-forwarders/firefox-relay-forwarder.ts

@@ -1,4 +1,4 @@
-import { ApiService } from "../abstractions/api.service";
+import { ApiService } from "../../../../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
 import { ForwarderOptions } from "./forwarder-options";

libs/common/src/tools/generator/username/email-forwarders/forwarder.ts

@@ -1,4 +1,4 @@
-import { ApiService } from "../abstractions/api.service";
+import { ApiService } from "../../../../abstractions/api.service";
 
 import { ForwarderOptions } from "./forwarder-options";
 

libs/common/src/tools/generator/username/email-forwarders/index.ts

@@ -0,0 +1,7 @@
+export { AnonAddyForwarder } from "./anon-addy-forwarder";
+export { DuckDuckGoForwarder } from "./duck-duck-go-forwarder";
+export { FastmailForwarder } from "./fastmail-forwarder";
+export { FirefoxRelayForwarder } from "./firefox-relay-forwarder";
+export { Forwarder } from "./forwarder";
+export { ForwarderOptions } from "./forwarder-options";
+export { SimpleLoginForwarder } from "./simple-login-forwarder";

libs/common/src/tools/generator/username/email-forwarders/simple-login-forwarder.ts

@@ -1,4 +1,4 @@
-import { ApiService } from "../abstractions/api.service";
+import { ApiService } from "../../../../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
 import { ForwarderOptions } from "./forwarder-options";

libs/common/src/tools/generator/username/index.ts

@@ -0,0 +1,2 @@
+export { UsernameGenerationServiceAbstraction } from "./username-generation.service.abstraction";
+export { UsernameGenerationService } from "./username-generation.service";

libs/common/src/tools/generator/username/username-generation.service.abstraction.ts

@@ -1,4 +1,4 @@
-export abstract class UsernameGenerationService {
+export abstract class UsernameGenerationServiceAbstraction {
   generateUsername: (options: any) => Promise<string>;
   generateWord: (options: any) => Promise<string>;
   generateSubaddress: (options: any) => Promise<string>;

libs/common/src/tools/generator/username/username-generation.service.ts

@@ -1,15 +1,18 @@
-import { ApiService } from "../abstractions/api.service";
-import { CryptoService } from "../abstractions/crypto.service";
-import { StateService } from "../abstractions/state.service";
-import { UsernameGenerationService as BaseUsernameGenerationService } from "../abstractions/usernameGeneration.service";
-import { AnonAddyForwarder } from "../email-forwarders/anon-addy-forwarder";
-import { DuckDuckGoForwarder } from "../email-forwarders/duck-duck-go-forwarder";
-import { FastmailForwarder } from "../email-forwarders/fastmail-forwarder";
-import { FirefoxRelayForwarder } from "../email-forwarders/firefox-relay-forwarder";
-import { Forwarder } from "../email-forwarders/forwarder";
-import { ForwarderOptions } from "../email-forwarders/forwarder-options";
-import { SimpleLoginForwarder } from "../email-forwarders/simple-login-forwarder";
-import { EFFLongWordList } from "../misc/wordlist";
+import { ApiService } from "../../../abstractions/api.service";
+import { CryptoService } from "../../../abstractions/crypto.service";
+import { StateService } from "../../../abstractions/state.service";
+import { EFFLongWordList } from "../../../misc/wordlist";
+
+import {
+  AnonAddyForwarder,
+  DuckDuckGoForwarder,
+  FastmailForwarder,
+  FirefoxRelayForwarder,
+  Forwarder,
+  ForwarderOptions,
+  SimpleLoginForwarder,
+} from "./email-forwarders";
+import { UsernameGenerationServiceAbstraction } from "./username-generation.service.abstraction";
 
 const DefaultOptions = {
   type: "word",
@@ -21,7 +24,7 @@ const DefaultOptions = {
   forwardedAnonAddyDomain: "anonaddy.me",
 };
 
-export class UsernameGenerationService implements BaseUsernameGenerationService {
+export class UsernameGenerationService implements UsernameGenerationServiceAbstraction {
   constructor(
     private cryptoService: CryptoService,
     private stateService: StateService,