From d4c812160f95c150aedc63af6b488bcae05f6b17 Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Fri, 10 Mar 2023 21:39:46 +0100 Subject: [PATCH] [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 --- .github/CODEOWNERS | 8 +++++ .github/whitelist-capital-letters.txt | 4 --- .../auth/popup/login-with-device.component.ts | 4 +-- .../browser/src/auth/popup/login.component.ts | 4 +-- .../src/auth/popup/register.component.ts | 4 +-- .../src/auth/popup/set-password.component.ts | 4 +-- apps/browser/src/auth/popup/sso.component.ts | 4 +-- .../popup/update-temp-password.component.ts | 4 +-- ...rate-password-to-clipboard-command.spec.ts | 6 ++-- .../generate-password-to-clipboard-command.ts | 4 +-- .../src/background/commands.background.ts | 4 +-- .../browser/src/background/main.background.ts | 12 +++++--- .../password-generation-service.factory.ts | 10 ++++--- apps/browser/src/popup/app-routing.module.ts | 4 +-- apps/browser/src/popup/app.module.ts | 4 +-- .../src/popup/services/services.module.ts | 12 ++++---- .../popup/generator/generator.component.html | 0 .../popup/generator/generator.component.ts | 10 +++---- .../password-generator-history.component.html | 0 .../password-generator-history.component.ts | 6 ++-- apps/cli/src/auth/commands/login.command.ts | 4 +-- apps/cli/src/bw.ts | 7 +++-- apps/cli/src/commands/serve.command.ts | 2 +- apps/cli/src/program.ts | 2 +- .../{commands => tools}/generate.command.ts | 4 +-- apps/desktop/src/app/app.component.ts | 8 ++--- apps/desktop/src/app/app.module.ts | 4 +-- .../src/app/services/services.module.ts | 2 +- .../{vault => tools}/generator.component.html | 0 .../generator.component.spec.ts | 12 ++++---- .../{vault => tools}/generator.component.ts | 10 +++---- .../password-generator-history.component.html | 0 .../password-generator-history.component.ts | 6 ++-- .../auth/login/login-with-device.component.ts | 4 +-- .../desktop/src/auth/login/login.component.ts | 4 +-- apps/desktop/src/auth/register.component.ts | 4 +-- .../src/auth/set-password.component.ts | 4 +-- apps/desktop/src/auth/sso.component.ts | 4 +-- .../auth/update-temp-password.component.ts | 4 +-- .../encrypted-message-handler.service.ts | 4 +-- .../src/vault/app/vault/vault.component.ts | 2 +- apps/web/src/app/app.component.ts | 4 +-- .../components/reset-password.component.ts | 4 +-- .../tools/weak-passwords-report.component.ts | 4 +-- .../pages/weak-passwords-report.component.ts | 4 +-- .../app/settings/change-password.component.ts | 4 +-- apps/web/src/app/tools/generator.component.ts | 10 +++---- .../password-generator-history.component.ts | 6 ++-- .../individual-vault/add-edit.component.ts | 4 +-- .../components/link-sso.component.ts | 4 +-- .../app/vault/org-vault/add-edit.component.ts | 4 +-- .../auth/login/login-with-device.component.ts | 4 +-- apps/web/src/auth/login/login.component.ts | 4 +-- .../register-form/register-form.component.ts | 4 +-- apps/web/src/auth/set-password.component.ts | 4 +-- .../emergency-access-takeover.component.ts | 4 +-- .../emergency-add-edit.component.ts | 4 +-- apps/web/src/auth/sso.component.ts | 4 +-- .../web/src/auth/update-password.component.ts | 4 +-- .../auth/update-temp-password.component.ts | 4 +-- .../components/change-password.component.ts | 4 +-- .../components/login-with-device.component.ts | 4 +-- .../src/auth/components/login.component.ts | 4 +-- .../src/auth/components/sso.component.ts | 4 +-- .../components/update-password.component.ts | 4 +-- .../update-temp-password.component.ts | 4 +-- .../src/components/register.component.ts | 4 +-- .../src/components/set-password.component.ts | 4 +-- .../src/services/jslib-services.module.ts | 12 +++++--- .../password-strength.component.ts | 4 +-- .../components/generator.component.ts | 8 ++--- .../password-generator-history.component.ts | 8 +++-- libs/common/src/abstractions/state.service.ts | 2 +- libs/common/src/models/domain/account.ts | 2 +- libs/common/src/services/state.service.ts | 2 +- .../src/services/stateMigration.service.ts | 2 +- .../password}/generated-password-history.ts | 0 .../src/tools/generator/password/index.ts | 3 ++ ...assword-generation.service.abstraction.ts} | 9 +++--- .../password/password-generation.service.ts} | 21 +++++++------- .../password}/password-generator-options.ts | 0 .../email-forwarders/anon-addy-forwarder.ts | 2 +- .../duck-duck-go-forwarder.ts | 2 +- .../email-forwarders/fastmail-forwarder.ts | 2 +- .../firefox-relay-forwarder.ts | 2 +- .../email-forwarders/forwarder-options.ts | 0 .../username}/email-forwarders/forwarder.ts | 2 +- .../username/email-forwarders/index.ts | 7 +++++ .../simple-login-forwarder.ts | 2 +- .../src/tools/generator/username/index.ts | 2 ++ ...sername-generation.service.abstraction.ts} | 2 +- .../username/username-generation.service.ts} | 29 ++++++++++--------- 92 files changed, 238 insertions(+), 202 deletions(-) rename apps/browser/src/{ => tools}/popup/generator/generator.component.html (100%) rename apps/browser/src/{ => tools}/popup/generator/generator.component.ts (84%) rename apps/browser/src/{ => tools}/popup/generator/password-generator-history.component.html (100%) rename apps/browser/src/{ => tools}/popup/generator/password-generator-history.component.ts (73%) rename apps/cli/src/{commands => tools}/generate.command.ts (96%) rename apps/desktop/src/app/{vault => tools}/generator.component.html (100%) rename apps/desktop/src/app/{vault => tools}/generator.component.spec.ts (83%) rename apps/desktop/src/app/{vault => tools}/generator.component.ts (74%) rename apps/desktop/src/app/{vault => tools}/password-generator-history.component.html (100%) rename apps/desktop/src/app/{vault => tools}/password-generator-history.component.ts (70%) rename libs/angular/src/{ => tools/generator}/components/generator.component.ts (97%) rename libs/angular/src/{ => tools/generator}/components/password-generator-history.component.ts (83%) rename libs/common/src/{models/domain => tools/generator/password}/generated-password-history.ts (100%) create mode 100644 libs/common/src/tools/generator/password/index.ts rename libs/common/src/{abstractions/passwordGeneration.service.ts => tools/generator/password/password-generation.service.abstraction.ts} (74%) rename libs/common/src/{services/passwordGeneration.service.ts => tools/generator/password/password-generation.service.ts} (95%) rename libs/common/src/{models/domain => tools/generator/password}/password-generator-options.ts (100%) rename libs/common/src/{ => tools/generator/username}/email-forwarders/anon-addy-forwarder.ts (95%) rename libs/common/src/{ => tools/generator/username}/email-forwarders/duck-duck-go-forwarder.ts (94%) rename libs/common/src/{ => tools/generator/username}/email-forwarders/fastmail-forwarder.ts (97%) rename libs/common/src/{ => tools/generator/username}/email-forwarders/firefox-relay-forwarder.ts (95%) rename libs/common/src/{ => tools/generator/username}/email-forwarders/forwarder-options.ts (100%) rename libs/common/src/{ => tools/generator/username}/email-forwarders/forwarder.ts (71%) create mode 100644 libs/common/src/tools/generator/username/email-forwarders/index.ts rename libs/common/src/{ => tools/generator/username}/email-forwarders/simple-login-forwarder.ts (95%) create mode 100644 libs/common/src/tools/generator/username/index.ts rename libs/common/src/{abstractions/usernameGeneration.service.ts => tools/generator/username/username-generation.service.abstraction.ts} (85%) rename libs/common/src/{services/usernameGeneration.service.ts => tools/generator/username/username-generation.service.ts} (84%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e0443da4f8..4206b39079 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -19,6 +19,14 @@ apps/web/src/connectors @bitwarden/team-auth-dev libs/angular/src/auth @bitwarden/team-auth-dev libs/common/src/auth @bitwarden/team-auth-dev +## Tools team files ## +apps/browser/src/app/tools @bitwarden/team-tools-dev +apps/cli/src/app/tools @bitwarden/team-tools-dev +apps/desktop/src/app/tools @bitwarden/team-tools-dev +apps/web/src/app/tools @bitwarden/team-tools-dev +libs/angular/src/tools @bitwarden/team-tools-dev +libs/common/src/tools @bitwarden/team-tools-dev + ## Vault team files ## apps/browser/src/autofill @bitwarden/team-vault-dev apps/browser/src/vault @bitwarden/team-vault-dev diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index 4cc5f5949d..28d55d0deb 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -86,7 +86,6 @@ ./libs/common/src/abstractions/fileDownload/fileDownloadBuilder.ts ./libs/common/src/abstractions/fileDownload/fileDownload.service.ts ./libs/common/src/abstractions/fileDownload/fileDownloadRequest.ts -./libs/common/src/abstractions/passwordGeneration.service.ts ./libs/common/src/abstractions/formValidationErrors.service.ts ./libs/common/src/abstractions/vaultTimeout/vaultTimeoutSettings.service.ts ./libs/common/src/abstractions/vaultTimeout/vaultTimeout.service.ts @@ -94,10 +93,8 @@ ./libs/common/src/abstractions/cryptoFunction.service.ts ./libs/common/src/abstractions/anonymousHub.service.ts ./libs/common/src/abstractions/appId.service.ts -./libs/common/src/abstractions/usernameGeneration.service.ts ./libs/common/src/services/azureFileUpload.service.ts ./libs/common/src/services/stateMigration.service.ts -./libs/common/src/services/passwordGeneration.service.ts ./libs/common/src/services/consoleLog.service.ts ./libs/common/src/services/formValidationErrors.service.ts ./libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts @@ -105,7 +102,6 @@ ./libs/common/src/services/fileUpload.service.ts ./libs/common/src/services/anonymousHub.service.ts ./libs/common/src/services/appId.service.ts -./libs/common/src/services/usernameGeneration.service.ts ./libs/common/src/services/noopMessaging.service.ts ./libs/common/src/services/memoryStorage.service.ts ./libs/common/src/services/bitwardenFileUpload.service.ts diff --git a/apps/browser/src/auth/popup/login-with-device.component.ts b/apps/browser/src/auth/popup/login-with-device.component.ts index 9b89c123e1..dae6fd2d4d 100644 --- a/apps/browser/src/auth/popup/login-with-device.component.ts +++ b/apps/browser/src/auth/popup/login-with-device.component.ts @@ -10,12 +10,12 @@ 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"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ @@ -31,7 +31,7 @@ export class LoginWithDeviceComponent cryptoService: CryptoService, cryptoFunctionService: CryptoFunctionService, appIdService: AppIdService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, apiService: ApiService, authService: AuthService, logService: LogService, diff --git a/apps/browser/src/auth/popup/login.component.ts b/apps/browser/src/auth/popup/login.component.ts index 5b8a77b799..cc48a75e4e 100644 --- a/apps/browser/src/auth/popup/login.component.ts +++ b/apps/browser/src/auth/popup/login.component.ts @@ -10,12 +10,12 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { FormValidationErrorsService } 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"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; import { Utils } from "@bitwarden/common/misc/utils"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { flagEnabled } from "../../flags"; @@ -35,7 +35,7 @@ export class LoginComponent extends BaseLoginComponent { protected i18nService: I18nService, protected stateService: StateService, protected environmentService: EnvironmentService, - protected passwordGenerationService: PasswordGenerationService, + protected passwordGenerationService: PasswordGenerationServiceAbstraction, protected cryptoFunctionService: CryptoFunctionService, syncService: SyncService, logService: LogService, diff --git a/apps/browser/src/auth/popup/register.component.ts b/apps/browser/src/auth/popup/register.component.ts index 85faff832d..11b01dd38f 100644 --- a/apps/browser/src/auth/popup/register.component.ts +++ b/apps/browser/src/auth/popup/register.component.ts @@ -10,10 +10,10 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { FormValidationErrorsService } 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"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ selector: "app-register", @@ -33,7 +33,7 @@ export class RegisterComponent extends BaseRegisterComponent { apiService: ApiService, stateService: StateService, platformUtilsService: PlatformUtilsService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, environmentService: EnvironmentService, logService: LogService, auditService: AuditService diff --git a/apps/browser/src/auth/popup/set-password.component.ts b/apps/browser/src/auth/popup/set-password.component.ts index c8d42b961a..d8e36015fc 100644 --- a/apps/browser/src/auth/popup/set-password.component.ts +++ b/apps/browser/src/auth/popup/set-password.component.ts @@ -8,11 +8,11 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; 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"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ @@ -26,7 +26,7 @@ export class SetPasswordComponent extends BaseSetPasswordComponent { cryptoService: CryptoService, messagingService: MessagingService, stateService: StateService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, platformUtilsService: PlatformUtilsService, policyApiService: PolicyApiServiceAbstraction, policyService: PolicyService, diff --git a/apps/browser/src/auth/popup/sso.component.ts b/apps/browser/src/auth/popup/sso.component.ts index ec95be9e4f..3892704ca4 100644 --- a/apps/browser/src/auth/popup/sso.component.ts +++ b/apps/browser/src/auth/popup/sso.component.ts @@ -7,12 +7,12 @@ 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 { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { BrowserApi } from "../../browser/browserApi"; @@ -31,7 +31,7 @@ export class SsoComponent extends BaseSsoComponent { platformUtilsService: PlatformUtilsService, apiService: ApiService, cryptoFunctionService: CryptoFunctionService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, syncService: SyncService, environmentService: EnvironmentService, logService: LogService, diff --git a/apps/browser/src/auth/popup/update-temp-password.component.ts b/apps/browser/src/auth/popup/update-temp-password.component.ts index 968400e7f6..438479bf74 100644 --- a/apps/browser/src/auth/popup/update-temp-password.component.ts +++ b/apps/browser/src/auth/popup/update-temp-password.component.ts @@ -6,10 +6,10 @@ 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"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ @@ -20,7 +20,7 @@ export class UpdateTempPasswordComponent extends BaseUpdateTempPasswordComponent constructor( i18nService: I18nService, platformUtilsService: PlatformUtilsService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, policyService: PolicyService, cryptoService: CryptoService, stateService: StateService, diff --git a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts index 4c1460c86e..38c62231ac 100644 --- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts +++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts @@ -1,6 +1,6 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { setAlarmTime } from "../../alarms/alarm-state"; import { BrowserApi } from "../../browser/browserApi"; @@ -18,13 +18,13 @@ jest.mock("../../alarms/alarm-state", () => { const setAlarmTimeMock = setAlarmTime as jest.Mock; describe("GeneratePasswordToClipboardCommand", () => { - let passwordGenerationService: MockProxy; + let passwordGenerationService: MockProxy; let stateService: MockProxy; let sut: GeneratePasswordToClipboardCommand; beforeEach(() => { - passwordGenerationService = mock(); + passwordGenerationService = mock(); stateService = mock(); passwordGenerationService.getOptions.mockResolvedValue([{ length: 8 }, {} as any]); diff --git a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts index eec0b31834..7dd37a64ad 100644 --- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts +++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts @@ -1,4 +1,4 @@ -import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { setAlarmTime } from "../../alarms/alarm-state"; import { BrowserStateService } from "../../services/abstractions/browser-state.service"; @@ -8,7 +8,7 @@ import { copyToClipboard } from "./copy-to-clipboard-command"; export class GeneratePasswordToClipboardCommand { constructor( - private passwordGenerationService: PasswordGenerationService, + private passwordGenerationService: PasswordGenerationServiceAbstraction, private stateService: BrowserStateService ) {} diff --git a/apps/browser/src/background/commands.background.ts b/apps/browser/src/background/commands.background.ts index 7e2c11e2e8..b53c809c35 100644 --- a/apps/browser/src/background/commands.background.ts +++ b/apps/browser/src/background/commands.background.ts @@ -1,8 +1,8 @@ -import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { BrowserApi } from "../browser/browserApi"; @@ -15,7 +15,7 @@ export default class CommandsBackground { constructor( private main: MainBackground, - private passwordGenerationService: PasswordGenerationService, + private passwordGenerationService: PasswordGenerationServiceAbstraction, private platformUtilsService: PlatformUtilsService, private vaultTimeoutService: VaultTimeoutService, private authService: AuthService diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index 7a5dec5145..8cb8744de2 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -15,7 +15,6 @@ import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstracti import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service"; import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; import { InternalOrganizationService as InternalOrganizationServiceAbstraction } 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 { InternalPolicyService as InternalPolicyServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; @@ -31,7 +30,6 @@ import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/abs 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 { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service"; @@ -61,7 +59,6 @@ import { ExportService } from "@bitwarden/common/services/export.service"; import { FileUploadService } from "@bitwarden/common/services/fileUpload.service"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { NotificationsService } from "@bitwarden/common/services/notifications.service"; -import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service"; import { PolicyApiService } from "@bitwarden/common/services/policy/policy-api.service"; import { ProviderService } from "@bitwarden/common/services/provider.service"; import { SearchService } from "@bitwarden/common/services/search.service"; @@ -69,9 +66,16 @@ import { SendService } from "@bitwarden/common/services/send.service"; import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; import { SystemService } from "@bitwarden/common/services/system.service"; import { TotpService } from "@bitwarden/common/services/totp.service"; -import { UsernameGenerationService } from "@bitwarden/common/services/usernameGeneration.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 { InternalFolderService as InternalFolderServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; diff --git a/apps/browser/src/background/service_factories/password-generation-service.factory.ts b/apps/browser/src/background/service_factories/password-generation-service.factory.ts index d69f22401c..e8c9596f65 100644 --- a/apps/browser/src/background/service_factories/password-generation-service.factory.ts +++ b/apps/browser/src/background/service_factories/password-generation-service.factory.ts @@ -1,5 +1,7 @@ -import { PasswordGenerationService as AbstractPasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; -import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service"; +import { + PasswordGenerationService, + PasswordGenerationServiceAbstraction, +} from "@bitwarden/common/tools/generator/password"; import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; import { CachedServices, factory, FactoryOptions } from "./factory-options"; @@ -14,9 +16,9 @@ export type PasswordGenerationServiceInitOptions = PasswordGenerationServiceFact StateServiceInitOptions; export function passwordGenerationServiceFactory( - cache: { passwordGenerationService?: AbstractPasswordGenerationService } & CachedServices, + cache: { passwordGenerationService?: PasswordGenerationServiceAbstraction } & CachedServices, opts: PasswordGenerationServiceInitOptions -): Promise { +): Promise { return factory( cache, "passwordGenerationService", diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index 3d13ae0d06..902f6300f2 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -18,6 +18,8 @@ import { SsoComponent } from "../auth/popup/sso.component"; import { TwoFactorOptionsComponent } from "../auth/popup/two-factor-options.component"; import { TwoFactorComponent } from "../auth/popup/two-factor.component"; import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component"; +import { GeneratorComponent } from "../tools/popup/generator/generator.component"; +import { PasswordGeneratorHistoryComponent } from "../tools/popup/generator/password-generator-history.component"; import { AddEditComponent } from "../vault/popup/components/vault/add-edit.component"; import { AttachmentsComponent } from "../vault/popup/components/vault/attachments.component"; import { CurrentTabComponent } from "../vault/popup/components/vault/current-tab.component"; @@ -27,8 +29,6 @@ import { VaultFilterComponent } from "../vault/popup/components/vault/vault-filt import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items.component"; import { ViewComponent } from "../vault/popup/components/vault/view.component"; -import { GeneratorComponent } from "./generator/generator.component"; -import { PasswordGeneratorHistoryComponent } from "./generator/password-generator-history.component"; import { SendAddEditComponent } from "./send/send-add-edit.component"; import { SendGroupingsComponent } from "./send/send-groupings.component"; import { SendTypeComponent } from "./send/send-type.component"; diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts index af649439bf..b4073f0214 100644 --- a/apps/browser/src/popup/app.module.ts +++ b/apps/browser/src/popup/app.module.ts @@ -33,6 +33,8 @@ import { TwoFactorOptionsComponent } from "../auth/popup/two-factor-options.comp import { TwoFactorComponent } from "../auth/popup/two-factor.component"; import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component"; import { CollectionsComponent } from "../popup/vault/collections.component"; +import { GeneratorComponent } from "../tools/popup/generator/generator.component"; +import { PasswordGeneratorHistoryComponent } from "../tools/popup/generator/password-generator-history.component"; import { ActionButtonsComponent } from "../vault/popup/components/action-buttons.component"; import { CipherRowComponent } from "../vault/popup/components/cipher-row.component"; import { PasswordRepromptComponent } from "../vault/popup/components/password-reprompt.component"; @@ -55,8 +57,6 @@ import { PrivateModeWarningComponent } from "./components/private-mode-warning.c import { SendListComponent } from "./components/send-list.component"; import { SetPinComponent } from "./components/set-pin.component"; import { UserVerificationComponent } from "./components/user-verification.component"; -import { GeneratorComponent } from "./generator/generator.component"; -import { PasswordGeneratorHistoryComponent } from "./generator/password-generator-history.component"; import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component"; import { SendAddEditComponent } from "./send/send-add-edit.component"; import { SendGroupingsComponent } from "./send/send-groupings.component"; diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 7f4fad3fd9..baf9878e87 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -26,7 +26,6 @@ import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstracti import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.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 { @@ -48,7 +47,6 @@ import { } from "@bitwarden/common/abstractions/storage.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service"; @@ -64,6 +62,8 @@ import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service import { ContainerService } from "@bitwarden/common/services/container.service"; import { PolicyApiService } from "@bitwarden/common/services/policy/policy-api.service"; import { SearchService } from "@bitwarden/common/services/search.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; +import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; import { @@ -280,8 +280,8 @@ function getBgService(service: keyof MainBackground) { deps: [], }, { - provide: PasswordGenerationService, - useFactory: getBgService("passwordGenerationService"), + provide: PasswordGenerationServiceAbstraction, + useFactory: getBgService("passwordGenerationService"), deps: [], }, { provide: ApiService, useFactory: getBgService("apiService"), deps: [] }, @@ -409,8 +409,8 @@ function getBgService(service: keyof MainBackground) { ], }, { - provide: UsernameGenerationService, - useFactory: getBgService("usernameGenerationService"), + provide: UsernameGenerationServiceAbstraction, + useFactory: getBgService("usernameGenerationService"), deps: [], }, { diff --git a/apps/browser/src/popup/generator/generator.component.html b/apps/browser/src/tools/popup/generator/generator.component.html similarity index 100% rename from apps/browser/src/popup/generator/generator.component.html rename to apps/browser/src/tools/popup/generator/generator.component.html diff --git a/apps/browser/src/popup/generator/generator.component.ts b/apps/browser/src/tools/popup/generator/generator.component.ts similarity index 84% rename from apps/browser/src/popup/generator/generator.component.ts rename to apps/browser/src/tools/popup/generator/generator.component.ts index 3eff8a1cbd..e869f6d779 100644 --- a/apps/browser/src/popup/generator/generator.component.ts +++ b/apps/browser/src/tools/popup/generator/generator.component.ts @@ -2,13 +2,13 @@ import { Location } from "@angular/common"; import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { GeneratorComponent as BaseGeneratorComponent } from "@bitwarden/angular/components/generator.component"; +import { GeneratorComponent as BaseGeneratorComponent } from "@bitwarden/angular/tools/generator/components/generator.component"; 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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; +import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { AddEditCipherInfo } from "@bitwarden/common/vault/types/add-edit-cipher-info"; @@ -21,8 +21,8 @@ export class GeneratorComponent extends BaseGeneratorComponent { private cipherState: CipherView; constructor( - passwordGenerationService: PasswordGenerationService, - usernameGenerationService: UsernameGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, + usernameGenerationService: UsernameGenerationServiceAbstraction, platformUtilsService: PlatformUtilsService, i18nService: I18nService, stateService: StateService, diff --git a/apps/browser/src/popup/generator/password-generator-history.component.html b/apps/browser/src/tools/popup/generator/password-generator-history.component.html similarity index 100% rename from apps/browser/src/popup/generator/password-generator-history.component.html rename to apps/browser/src/tools/popup/generator/password-generator-history.component.html diff --git a/apps/browser/src/popup/generator/password-generator-history.component.ts b/apps/browser/src/tools/popup/generator/password-generator-history.component.ts similarity index 73% rename from apps/browser/src/popup/generator/password-generator-history.component.ts rename to apps/browser/src/tools/popup/generator/password-generator-history.component.ts index ca586d8f99..18110fc5d9 100644 --- a/apps/browser/src/popup/generator/password-generator-history.component.ts +++ b/apps/browser/src/tools/popup/generator/password-generator-history.component.ts @@ -1,10 +1,10 @@ import { Location } from "@angular/common"; import { Component } from "@angular/core"; -import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "@bitwarden/angular/components/password-generator-history.component"; +import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "@bitwarden/angular/tools/generator/components/password-generator-history.component"; 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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ selector: "app-password-generator-history", @@ -12,7 +12,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti }) export class PasswordGeneratorHistoryComponent extends BasePasswordGeneratorHistoryComponent { constructor( - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, platformUtilsService: PlatformUtilsService, i18nService: I18nService, private location: Location diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts index 085c1be206..675c94c149 100644 --- a/apps/cli/src/auth/commands/login.command.ts +++ b/apps/cli/src/auth/commands/login.command.ts @@ -9,7 +9,6 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.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"; @@ -29,6 +28,7 @@ import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { Utils } from "@bitwarden/common/misc/utils"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { Response } from "../../models/response"; @@ -47,7 +47,7 @@ export class LoginCommand { protected apiService: ApiService, protected cryptoFunctionService: CryptoFunctionService, protected environmentService: EnvironmentService, - protected passwordGenerationService: PasswordGenerationService, + protected passwordGenerationService: PasswordGenerationServiceAbstraction, protected platformUtilsService: PlatformUtilsService, protected stateService: StateService, protected cryptoService: CryptoService, diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index fa2d313979..d563cd14da 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -36,7 +36,6 @@ import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.s 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 { PolicyService } from "@bitwarden/common/services/policy/policy.service"; import { ProviderService } from "@bitwarden/common/services/provider.service"; import { SearchService } from "@bitwarden/common/services/search.service"; @@ -47,6 +46,10 @@ import { StateMigrationService } from "@bitwarden/common/services/stateMigration import { TotpService } from "@bitwarden/common/services/totp.service"; import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service"; +import { + PasswordGenerationService, + PasswordGenerationServiceAbstraction, +} from "@bitwarden/common/tools/generator/password"; import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/services/cipher.service"; import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service"; @@ -91,7 +94,7 @@ export class Main { vaultTimeoutService: VaultTimeoutService; vaultTimeoutSettingsService: VaultTimeoutSettingsService; syncService: SyncService; - passwordGenerationService: PasswordGenerationService; + passwordGenerationService: PasswordGenerationServiceAbstraction; totpService: TotpService; containerService: ContainerService; auditService: AuditService; diff --git a/apps/cli/src/commands/serve.command.ts b/apps/cli/src/commands/serve.command.ts index f3acc5b282..c0a6032a1f 100644 --- a/apps/cli/src/commands/serve.command.ts +++ b/apps/cli/src/commands/serve.command.ts @@ -13,13 +13,13 @@ import { UnlockCommand } from "../auth/commands/unlock.command"; import { Main } from "../bw"; import { Response } from "../models/response"; import { FileResponse } from "../models/response/file.response"; +import { GenerateCommand } from "../tools/generate.command"; import { CreateCommand } from "../vault/create.command"; import { DeleteCommand } from "../vault/delete.command"; import { SyncCommand } from "../vault/sync.command"; import { ConfirmCommand } from "./confirm.command"; import { EditCommand } from "./edit.command"; -import { GenerateCommand } from "./generate.command"; import { GetCommand } from "./get.command"; import { ListCommand } from "./list.command"; import { RestoreCommand } from "./restore.command"; diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts index 62e4a991b4..7c8d8c4418 100644 --- a/apps/cli/src/program.ts +++ b/apps/cli/src/program.ts @@ -12,7 +12,6 @@ import { Main } from "./bw"; import { CompletionCommand } from "./commands/completion.command"; import { ConfigCommand } from "./commands/config.command"; import { EncodeCommand } from "./commands/encode.command"; -import { GenerateCommand } from "./commands/generate.command"; import { ServeCommand } from "./commands/serve.command"; import { StatusCommand } from "./commands/status.command"; import { UpdateCommand } from "./commands/update.command"; @@ -21,6 +20,7 @@ import { ListResponse } from "./models/response/list.response"; import { MessageResponse } from "./models/response/message.response"; import { StringResponse } from "./models/response/string.response"; import { TemplateResponse } from "./models/response/template.response"; +import { GenerateCommand } from "./tools/generate.command"; import { CliUtils } from "./utils"; import { SyncCommand } from "./vault/sync.command"; diff --git a/apps/cli/src/commands/generate.command.ts b/apps/cli/src/tools/generate.command.ts similarity index 96% rename from apps/cli/src/commands/generate.command.ts rename to apps/cli/src/tools/generate.command.ts index aebc084a06..c203c14ea8 100644 --- a/apps/cli/src/commands/generate.command.ts +++ b/apps/cli/src/tools/generate.command.ts @@ -1,5 +1,5 @@ -import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { Response } from "../models/response"; import { StringResponse } from "../models/response/string.response"; @@ -7,7 +7,7 @@ import { CliUtils } from "../utils"; export class GenerateCommand { constructor( - private passwordGenerationService: PasswordGenerationService, + private passwordGenerationService: PasswordGenerationServiceAbstraction, private stateService: StateService ) {} diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts index 67a761a32d..1a4562b8da 100644 --- a/apps/desktop/src/app/app.component.ts +++ b/apps/desktop/src/app/app.component.ts @@ -23,7 +23,6 @@ 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 { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; -import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; @@ -35,6 +34,7 @@ import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaul import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @@ -47,9 +47,9 @@ import { PremiumComponent } from "../vault/app/accounts/premium.component"; import { FolderAddEditComponent } from "../vault/app/vault/folder-add-edit.component"; import { SettingsComponent } from "./accounts/settings.component"; +import { GeneratorComponent } from "./tools/generator.component"; +import { PasswordGeneratorHistoryComponent } from "./tools/password-generator-history.component"; import { ExportComponent } from "./vault/export.component"; -import { GeneratorComponent } from "./vault/generator.component"; -import { PasswordGeneratorHistoryComponent } from "./vault/password-generator-history.component"; const BroadcasterSubscriptionId = "AppComponent"; const IdleTimeout = 60000 * 10; // 10 minutes @@ -110,7 +110,7 @@ export class AppComponent implements OnInit, OnDestroy { private folderService: InternalFolderService, private settingsService: SettingsService, private syncService: SyncService, - private passwordGenerationService: PasswordGenerationService, + private passwordGenerationService: PasswordGenerationServiceAbstraction, private cipherService: CipherService, private authService: AuthService, private router: Router, diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts index 58bcef23f5..1b81a49d2e 100644 --- a/apps/desktop/src/app/app.module.ts +++ b/apps/desktop/src/app/app.module.ts @@ -50,10 +50,10 @@ import { AddEditComponent as SendAddEditComponent } from "./send/add-edit.compon import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component"; import { SendComponent } from "./send/send.component"; import { SharedModule } from "./shared/shared.module"; +import { GeneratorComponent } from "./tools/generator.component"; +import { PasswordGeneratorHistoryComponent } from "./tools/password-generator-history.component"; import { CollectionsComponent } from "./vault/collections.component"; import { ExportComponent } from "./vault/export.component"; -import { GeneratorComponent } from "./vault/generator.component"; -import { PasswordGeneratorHistoryComponent } from "./vault/password-generator-history.component"; @NgModule({ imports: [SharedModule, AppRoutingModule, VaultFilterModule, LoginModule], diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts index e2d2ae988e..b7e1c8ac10 100644 --- a/apps/desktop/src/app/services/services.module.ts +++ b/apps/desktop/src/app/services/services.module.ts @@ -22,7 +22,6 @@ import { LogService as LogServiceAbstraction, } from "@bitwarden/common/abstractions/log.service"; import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service"; -import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; @@ -37,6 +36,7 @@ import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { SystemService } from "@bitwarden/common/services/system.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/apps/desktop/src/app/vault/generator.component.html b/apps/desktop/src/app/tools/generator.component.html similarity index 100% rename from apps/desktop/src/app/vault/generator.component.html rename to apps/desktop/src/app/tools/generator.component.html diff --git a/apps/desktop/src/app/vault/generator.component.spec.ts b/apps/desktop/src/app/tools/generator.component.spec.ts similarity index 83% rename from apps/desktop/src/app/vault/generator.component.spec.ts rename to apps/desktop/src/app/tools/generator.component.spec.ts index 59638bb758..5b932de110 100644 --- a/apps/desktop/src/app/vault/generator.component.spec.ts +++ b/apps/desktop/src/app/tools/generator.component.spec.ts @@ -8,10 +8,10 @@ import { mock, MockProxy } from "jest-mock-extended"; import { I18nPipe } from "@bitwarden/angular/pipes/i18n.pipe"; 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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; +import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username"; import { GeneratorComponent } from "./generator.component"; @@ -27,12 +27,12 @@ describe("GeneratorComponent", () => { declarations: [GeneratorComponent, I18nPipe], providers: [ { - provide: PasswordGenerationService, - useClass: Substitute.for(), + provide: PasswordGenerationServiceAbstraction, + useClass: Substitute.for(), }, { - provide: UsernameGenerationService, - useClass: Substitute.for(), + provide: UsernameGenerationServiceAbstraction, + useClass: Substitute.for(), }, { provide: StateService, diff --git a/apps/desktop/src/app/vault/generator.component.ts b/apps/desktop/src/app/tools/generator.component.ts similarity index 74% rename from apps/desktop/src/app/vault/generator.component.ts rename to apps/desktop/src/app/tools/generator.component.ts index aaa134aef9..83c2f48f77 100644 --- a/apps/desktop/src/app/vault/generator.component.ts +++ b/apps/desktop/src/app/tools/generator.component.ts @@ -1,13 +1,13 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { GeneratorComponent as BaseGeneratorComponent } from "@bitwarden/angular/components/generator.component"; +import { GeneratorComponent as BaseGeneratorComponent } from "@bitwarden/angular/tools/generator/components/generator.component"; 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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; +import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username"; @Component({ selector: "app-generator", @@ -15,8 +15,8 @@ import { UsernameGenerationService } from "@bitwarden/common/abstractions/userna }) export class GeneratorComponent extends BaseGeneratorComponent { constructor( - passwordGenerationService: PasswordGenerationService, - usernameGenerationService: UsernameGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, + usernameGenerationService: UsernameGenerationServiceAbstraction, stateService: StateService, platformUtilsService: PlatformUtilsService, i18nService: I18nService, diff --git a/apps/desktop/src/app/vault/password-generator-history.component.html b/apps/desktop/src/app/tools/password-generator-history.component.html similarity index 100% rename from apps/desktop/src/app/vault/password-generator-history.component.html rename to apps/desktop/src/app/tools/password-generator-history.component.html diff --git a/apps/desktop/src/app/vault/password-generator-history.component.ts b/apps/desktop/src/app/tools/password-generator-history.component.ts similarity index 70% rename from apps/desktop/src/app/vault/password-generator-history.component.ts rename to apps/desktop/src/app/tools/password-generator-history.component.ts index 71c57932aa..bd1928fff1 100644 --- a/apps/desktop/src/app/vault/password-generator-history.component.ts +++ b/apps/desktop/src/app/tools/password-generator-history.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; -import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "@bitwarden/angular/components/password-generator-history.component"; +import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "@bitwarden/angular/tools/generator/components/password-generator-history.component"; 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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ selector: "app-password-generator-history", @@ -11,7 +11,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti }) export class PasswordGeneratorHistoryComponent extends BasePasswordGeneratorHistoryComponent { constructor( - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, platformUtilsService: PlatformUtilsService, i18nService: I18nService ) { diff --git a/apps/desktop/src/auth/login/login-with-device.component.ts b/apps/desktop/src/auth/login/login-with-device.component.ts index 506ca36d74..5a4224e3ad 100644 --- a/apps/desktop/src/auth/login/login-with-device.component.ts +++ b/apps/desktop/src/auth/login/login-with-device.component.ts @@ -11,12 +11,12 @@ 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"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { EnvironmentComponent } from "../environment.component"; @@ -38,7 +38,7 @@ export class LoginWithDeviceComponent cryptoService: CryptoService, cryptoFunctionService: CryptoFunctionService, appIdService: AppIdService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, apiService: ApiService, authService: AuthService, logService: LogService, diff --git a/apps/desktop/src/auth/login/login.component.ts b/apps/desktop/src/auth/login/login.component.ts index 38af5e32fe..4aca3cd0e7 100644 --- a/apps/desktop/src/auth/login/login.component.ts +++ b/apps/desktop/src/auth/login/login.component.ts @@ -13,11 +13,11 @@ import { FormValidationErrorsService } from "@bitwarden/common/abstractions/form 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 { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { EnvironmentComponent } from "../environment.component"; @@ -57,7 +57,7 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy { platformUtilsService: PlatformUtilsService, stateService: StateService, environmentService: EnvironmentService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, cryptoFunctionService: CryptoFunctionService, private broadcasterService: BroadcasterService, ngZone: NgZone, diff --git a/apps/desktop/src/auth/register.component.ts b/apps/desktop/src/auth/register.component.ts index 2f459993e0..bb036d3609 100644 --- a/apps/desktop/src/auth/register.component.ts +++ b/apps/desktop/src/auth/register.component.ts @@ -11,10 +11,10 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { FormValidationErrorsService } 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"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; const BroadcasterSubscriptionId = "RegisterComponent"; @@ -33,7 +33,7 @@ export class RegisterComponent extends BaseRegisterComponent implements OnInit, apiService: ApiService, stateService: StateService, platformUtilsService: PlatformUtilsService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, environmentService: EnvironmentService, private broadcasterService: BroadcasterService, private ngZone: NgZone, diff --git a/apps/desktop/src/auth/set-password.component.ts b/apps/desktop/src/auth/set-password.component.ts index 2fe0e161dc..26782432b7 100644 --- a/apps/desktop/src/auth/set-password.component.ts +++ b/apps/desktop/src/auth/set-password.component.ts @@ -9,11 +9,11 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; 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"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; const BroadcasterSubscriptionId = "SetPasswordComponent"; @@ -28,7 +28,7 @@ export class SetPasswordComponent extends BaseSetPasswordComponent implements On i18nService: I18nService, cryptoService: CryptoService, messagingService: MessagingService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, platformUtilsService: PlatformUtilsService, policyApiService: PolicyApiServiceAbstraction, policyService: PolicyService, diff --git a/apps/desktop/src/auth/sso.component.ts b/apps/desktop/src/auth/sso.component.ts index 0fa12ae33a..b56fc663a4 100644 --- a/apps/desktop/src/auth/sso.component.ts +++ b/apps/desktop/src/auth/sso.component.ts @@ -7,10 +7,10 @@ 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"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ @@ -29,7 +29,7 @@ export class SsoComponent extends BaseSsoComponent { apiService: ApiService, cryptoFunctionService: CryptoFunctionService, environmentService: EnvironmentService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, logService: LogService ) { super( diff --git a/apps/desktop/src/auth/update-temp-password.component.ts b/apps/desktop/src/auth/update-temp-password.component.ts index 4e7edb07fc..65ccf9ea5b 100644 --- a/apps/desktop/src/auth/update-temp-password.component.ts +++ b/apps/desktop/src/auth/update-temp-password.component.ts @@ -6,10 +6,10 @@ 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"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ @@ -20,7 +20,7 @@ export class UpdateTempPasswordComponent extends BaseUpdateTempPasswordComponent constructor( i18nService: I18nService, platformUtilsService: PlatformUtilsService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, policyService: PolicyService, cryptoService: CryptoService, messagingService: MessagingService, diff --git a/apps/desktop/src/services/encrypted-message-handler.service.ts b/apps/desktop/src/services/encrypted-message-handler.service.ts index f02cec3868..77c8598e68 100644 --- a/apps/desktop/src/services/encrypted-message-handler.service.ts +++ b/apps/desktop/src/services/encrypted-message-handler.service.ts @@ -1,11 +1,11 @@ import { firstValueFrom } from "rxjs"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; @@ -34,7 +34,7 @@ export class EncryptedMessageHandlerService { private cipherService: CipherService, private policyService: PolicyService, private messagingService: MessagingService, - private passwordGenerationService: PasswordGenerationService + private passwordGenerationService: PasswordGenerationServiceAbstraction ) {} async responseDataForCommand( diff --git a/apps/desktop/src/vault/app/vault/vault.component.ts b/apps/desktop/src/vault/app/vault/vault.component.ts index 554f73aceb..04a942f7cc 100644 --- a/apps/desktop/src/vault/app/vault/vault.component.ts +++ b/apps/desktop/src/vault/app/vault/vault.component.ts @@ -30,8 +30,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { SearchBarService } from "../../../app/layout/search/search-bar.service"; +import { GeneratorComponent } from "../../../app/tools/generator.component"; import { CollectionsComponent } from "../../../app/vault/collections.component"; -import { GeneratorComponent } from "../../../app/vault/generator.component"; import { invokeMenu, RendererMenuItem } from "../../../utils"; import { AddEditComponent } from "./add-edit.component"; diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts index c65d616044..d3b3e57e8d 100644 --- a/apps/web/src/app/app.component.ts +++ b/apps/web/src/app/app.component.ts @@ -13,7 +13,6 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; -import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; @@ -22,6 +21,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @@ -58,7 +58,7 @@ export class AppComponent implements OnDestroy, OnInit { private folderService: InternalFolderService, private settingsService: SettingsService, private syncService: SyncService, - private passwordGenerationService: PasswordGenerationService, + private passwordGenerationService: PasswordGenerationServiceAbstraction, private cipherService: CipherService, private authService: AuthService, private router: Router, diff --git a/apps/web/src/app/organizations/members/components/reset-password.component.ts b/apps/web/src/app/organizations/members/components/reset-password.component.ts index a411377ddf..8969524939 100644 --- a/apps/web/src/app/organizations/members/components/reset-password.component.ts +++ b/apps/web/src/app/organizations/members/components/reset-password.component.ts @@ -16,7 +16,6 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/abstractions/organization-user/requests"; -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 { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; @@ -24,6 +23,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"; @Component({ selector: "app-reset-password", @@ -48,7 +48,7 @@ export class ResetPasswordComponent implements OnInit, OnDestroy { constructor( private i18nService: I18nService, private platformUtilsService: PlatformUtilsService, - private passwordGenerationService: PasswordGenerationService, + private passwordGenerationService: PasswordGenerationServiceAbstraction, private policyService: PolicyService, private cryptoService: CryptoService, private logService: LogService, diff --git a/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts b/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts index ea0c336526..19c58c4d54 100644 --- a/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts +++ b/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts @@ -4,7 +4,7 @@ import { ActivatedRoute } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; @@ -23,7 +23,7 @@ export class WeakPasswordsReportComponent extends BaseWeakPasswordsReportCompone constructor( cipherService: CipherService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, modalService: ModalService, messagingService: MessagingService, private route: ActivatedRoute, diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts index e354973fca..93a3bfbc57 100644 --- a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; @@ -22,7 +22,7 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen constructor( protected cipherService: CipherService, - protected passwordGenerationService: PasswordGenerationService, + protected passwordGenerationService: PasswordGenerationServiceAbstraction, modalService: ModalService, messagingService: MessagingService, passwordRepromptService: PasswordRepromptService diff --git a/apps/web/src/app/settings/change-password.component.ts b/apps/web/src/app/settings/change-password.component.ts index fa57b9f4ae..61cf92d2ab 100644 --- a/apps/web/src/app/settings/change-password.component.ts +++ b/apps/web/src/app/settings/change-password.component.ts @@ -12,7 +12,6 @@ import { OrganizationUserService } from "@bitwarden/common/abstractions/organiza import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/abstractions/organization-user/requests"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -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 { SendService } from "@bitwarden/common/abstractions/send.service"; @@ -26,6 +25,7 @@ import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { SendWithIdRequest } from "@bitwarden/common/models/request/send-with-id.request"; import { UpdateKeyRequest } from "@bitwarden/common/models/request/update-key.request"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @@ -48,7 +48,7 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent { cryptoService: CryptoService, messagingService: MessagingService, stateService: StateService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, platformUtilsService: PlatformUtilsService, policyService: PolicyService, private auditService: AuditService, diff --git a/apps/web/src/app/tools/generator.component.ts b/apps/web/src/app/tools/generator.component.ts index 6a5f00c19b..78c3ad875d 100644 --- a/apps/web/src/app/tools/generator.component.ts +++ b/apps/web/src/app/tools/generator.component.ts @@ -1,14 +1,14 @@ import { Component, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { GeneratorComponent as BaseGeneratorComponent } from "@bitwarden/angular/components/generator.component"; import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { GeneratorComponent as BaseGeneratorComponent } from "@bitwarden/angular/tools/generator/components/generator.component"; 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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; +import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username"; import { PasswordGeneratorHistoryComponent } from "./password-generator-history.component"; @@ -21,8 +21,8 @@ export class GeneratorComponent extends BaseGeneratorComponent { historyModalRef: ViewContainerRef; constructor( - passwordGenerationService: PasswordGenerationService, - usernameGenerationService: UsernameGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, + usernameGenerationService: UsernameGenerationServiceAbstraction, stateService: StateService, platformUtilsService: PlatformUtilsService, i18nService: I18nService, diff --git a/apps/web/src/app/tools/password-generator-history.component.ts b/apps/web/src/app/tools/password-generator-history.component.ts index 71c57932aa..bd1928fff1 100644 --- a/apps/web/src/app/tools/password-generator-history.component.ts +++ b/apps/web/src/app/tools/password-generator-history.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; -import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "@bitwarden/angular/components/password-generator-history.component"; +import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "@bitwarden/angular/tools/generator/components/password-generator-history.component"; 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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ selector: "app-password-generator-history", @@ -11,7 +11,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti }) export class PasswordGeneratorHistoryComponent extends BasePasswordGeneratorHistoryComponent { constructor( - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, platformUtilsService: PlatformUtilsService, i18nService: I18nService ) { diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts index 35a9bfbe2e..e78b308d69 100644 --- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts +++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts @@ -8,13 +8,13 @@ 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 { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -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"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { EventType } from "@bitwarden/common/enums/eventType"; import { ProductType } from "@bitwarden/common/enums/productType"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; @@ -50,7 +50,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On stateService: StateService, collectionService: CollectionService, protected totpService: TotpService, - protected passwordGenerationService: PasswordGenerationService, + protected passwordGenerationService: PasswordGenerationServiceAbstraction, protected messagingService: MessagingService, eventCollectionService: EventCollectionService, protected policyService: PolicyService, diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/link-sso.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/link-sso.component.ts index b0aa80bc0f..47b628b748 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/components/link-sso.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/link-sso.component.ts @@ -7,11 +7,11 @@ 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"; import { Organization } from "@bitwarden/common/models/domain/organization"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ selector: "app-link-sso", @@ -29,7 +29,7 @@ export class LinkSsoComponent extends SsoComponent implements AfterContentInit { router: Router, route: ActivatedRoute, cryptoFunctionService: CryptoFunctionService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, stateService: StateService, environmentService: EnvironmentService, logService: LogService diff --git a/apps/web/src/app/vault/org-vault/add-edit.component.ts b/apps/web/src/app/vault/org-vault/add-edit.component.ts index ef347f856f..6c521b4961 100644 --- a/apps/web/src/app/vault/org-vault/add-edit.component.ts +++ b/apps/web/src/app/vault/org-vault/add-edit.component.ts @@ -8,11 +8,11 @@ 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 { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -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"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; @@ -40,7 +40,7 @@ export class AddEditComponent extends BaseAddEditComponent { stateService: StateService, collectionService: CollectionService, totpService: TotpService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, private apiService: ApiService, messagingService: MessagingService, eventCollectionService: EventCollectionService, diff --git a/apps/web/src/auth/login/login-with-device.component.ts b/apps/web/src/auth/login/login-with-device.component.ts index c39acb663a..037c0d95c6 100644 --- a/apps/web/src/auth/login/login-with-device.component.ts +++ b/apps/web/src/auth/login/login-with-device.component.ts @@ -10,11 +10,11 @@ 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 { ValidationService } from "@bitwarden/common/abstractions/validation.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { StateService } from "../../app/core"; @@ -31,7 +31,7 @@ export class LoginWithDeviceComponent cryptoService: CryptoService, cryptoFunctionService: CryptoFunctionService, appIdService: AppIdService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, apiService: ApiService, authService: AuthService, logService: LogService, diff --git a/apps/web/src/auth/login/login.component.ts b/apps/web/src/auth/login/login.component.ts index 4bd961756b..dae68c617e 100644 --- a/apps/web/src/auth/login/login.component.ts +++ b/apps/web/src/auth/login/login.component.ts @@ -13,7 +13,6 @@ import { FormValidationErrorsService } from "@bitwarden/common/abstractions/form 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 { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; @@ -24,6 +23,7 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/mas import { Policy } from "@bitwarden/common/models/domain/policy"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { RouterService, StateService } from "../../app/core"; import { flagEnabled } from "../../utils/flags"; @@ -49,7 +49,7 @@ export class LoginComponent extends BaseLoginComponent implements OnInit, OnDest route: ActivatedRoute, platformUtilsService: PlatformUtilsService, environmentService: EnvironmentService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, cryptoFunctionService: CryptoFunctionService, private policyApiService: PolicyApiServiceAbstraction, private policyService: InternalPolicyService, diff --git a/apps/web/src/auth/register-form/register-form.component.ts b/apps/web/src/auth/register-form/register-form.component.ts index be0a8dd51d..5601829c20 100644 --- a/apps/web/src/auth/register-form/register-form.component.ts +++ b/apps/web/src/auth/register-form/register-form.component.ts @@ -10,13 +10,13 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { FormValidationErrorsService } 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 { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ selector: "app-register-form", @@ -40,7 +40,7 @@ export class RegisterFormComponent extends BaseRegisterComponent { apiService: ApiService, stateService: StateService, platformUtilsService: PlatformUtilsService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, private policyService: PolicyService, environmentService: EnvironmentService, logService: LogService, diff --git a/apps/web/src/auth/set-password.component.ts b/apps/web/src/auth/set-password.component.ts index 4046d3d087..c31cd2b17c 100644 --- a/apps/web/src/auth/set-password.component.ts +++ b/apps/web/src/auth/set-password.component.ts @@ -8,11 +8,11 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; 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"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ @@ -25,7 +25,7 @@ export class SetPasswordComponent extends BaseSetPasswordComponent { i18nService: I18nService, cryptoService: CryptoService, messagingService: MessagingService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, platformUtilsService: PlatformUtilsService, policyApiService: PolicyApiServiceAbstraction, policyService: PolicyService, diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts index 13e4fd76d8..8579856898 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts @@ -7,7 +7,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"; @@ -18,6 +17,7 @@ import { PolicyData } from "@bitwarden/common/models/data/policy.data"; import { Policy } from "@bitwarden/common/models/domain/policy"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ selector: "emergency-access-takeover", @@ -42,7 +42,7 @@ export class EmergencyAccessTakeoverComponent cryptoService: CryptoService, messagingService: MessagingService, stateService: StateService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, platformUtilsService: PlatformUtilsService, policyService: PolicyService, private apiService: ApiService, diff --git a/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts index 7684e3a0d1..b5815be43f 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts @@ -7,11 +7,11 @@ 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 { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -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"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password/"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; @@ -37,7 +37,7 @@ export class EmergencyAddEditComponent extends BaseAddEditComponent { stateService: StateService, collectionService: CollectionService, totpService: TotpService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, messagingService: MessagingService, eventCollectionService: EventCollectionService, policyService: PolicyService, diff --git a/apps/web/src/auth/sso.component.ts b/apps/web/src/auth/sso.component.ts index 63dc54cec9..e80135c6ab 100644 --- a/apps/web/src/auth/sso.component.ts +++ b/apps/web/src/auth/sso.component.ts @@ -10,7 +10,6 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/abstractions/organization-domain/org-domain-api.service.abstraction"; import { OrganizationDomainSsoDetailsResponse } from "@bitwarden/common/abstractions/organization-domain/responses/organization-domain-sso-details.response"; -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"; @@ -18,6 +17,7 @@ import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; import { HttpStatusCode } from "@bitwarden/common/enums/http-status-code.enum"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ selector: "app-sso", @@ -35,7 +35,7 @@ export class SsoComponent extends BaseSsoComponent { apiService: ApiService, cryptoFunctionService: CryptoFunctionService, environmentService: EnvironmentService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, logService: LogService, private orgDomainApiService: OrgDomainApiServiceAbstraction, private loginService: LoginService, diff --git a/apps/web/src/auth/update-password.component.ts b/apps/web/src/auth/update-password.component.ts index 183f13d213..3baa3bc0d4 100644 --- a/apps/web/src/auth/update-password.component.ts +++ b/apps/web/src/auth/update-password.component.ts @@ -7,11 +7,11 @@ 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"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ selector: "app-update-password", @@ -22,7 +22,7 @@ export class UpdatePasswordComponent extends BaseUpdatePasswordComponent { router: Router, i18nService: I18nService, platformUtilsService: PlatformUtilsService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, policyService: PolicyService, cryptoService: CryptoService, messagingService: MessagingService, diff --git a/apps/web/src/auth/update-temp-password.component.ts b/apps/web/src/auth/update-temp-password.component.ts index f34cafb8f9..7c55f7b2ba 100644 --- a/apps/web/src/auth/update-temp-password.component.ts +++ b/apps/web/src/auth/update-temp-password.component.ts @@ -6,10 +6,10 @@ 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"; +import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ @@ -20,7 +20,7 @@ export class UpdateTempPasswordComponent extends BaseUpdateTempPasswordComponent constructor( i18nService: I18nService, platformUtilsService: PlatformUtilsService, - passwordGenerationService: PasswordGenerationService, + passwordGenerationService: PasswordGenerationServiceAbstraction, policyService: PolicyService, cryptoService: CryptoService, messagingService: MessagingService, diff --git a/libs/angular/src/auth/components/change-password.component.ts b/libs/angular/src/auth/components/change-password.component.ts index 989b18f90f..3a2c9bf827 100644 --- a/libs/angular/src/auth/components/change-password.component.ts +++ b/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 diff --git a/libs/angular/src/auth/components/login-with-device.component.ts b/libs/angular/src/auth/components/login-with-device.component.ts index 14b23aa1da..61aaec1dd8 100644 --- a/libs/angular/src/auth/components/login-with-device.component.ts +++ b/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, diff --git a/libs/angular/src/auth/components/login.component.ts b/libs/angular/src/auth/components/login.component.ts index 10ff052187..640461a6f8 100644 --- a/libs/angular/src/auth/components/login.component.ts +++ b/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, diff --git a/libs/angular/src/auth/components/sso.component.ts b/libs/angular/src/auth/components/sso.component.ts index 61f65aeab6..a7f5250d2a 100644 --- a/libs/angular/src/auth/components/sso.component.ts +++ b/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 ) {} diff --git a/libs/angular/src/auth/components/update-password.component.ts b/libs/angular/src/auth/components/update-password.component.ts index 48979ab097..a568f55e23 100644 --- a/libs/angular/src/auth/components/update-password.component.ts +++ b/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, diff --git a/libs/angular/src/auth/components/update-temp-password.component.ts b/libs/angular/src/auth/components/update-temp-password.component.ts index 26e6389e5f..6f46db3e18 100644 --- a/libs/angular/src/auth/components/update-temp-password.component.ts +++ b/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, diff --git a/libs/angular/src/components/register.component.ts b/libs/angular/src/components/register.component.ts index 60b9adb8a9..b694ac66be 100644 --- a/libs/angular/src/components/register.component.ts +++ b/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 diff --git a/libs/angular/src/components/set-password.component.ts b/libs/angular/src/components/set-password.component.ts index 7868651c6c..5a24494f16 100644 --- a/libs/angular/src/components/set-password.component.ts +++ b/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, diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index b67a3f1bf1..4a0922acb9 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/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 { diff --git a/libs/angular/src/shared/components/password-strength/password-strength.component.ts b/libs/angular/src/shared/components/password-strength/password-strength.component.ts index e14284eb75..8611048f8a 100644 --- a/libs/angular/src/shared/components/password-strength/password-strength.component.ts +++ b/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 { diff --git a/libs/angular/src/components/generator.component.ts b/libs/angular/src/tools/generator/components/generator.component.ts similarity index 97% rename from libs/angular/src/components/generator.component.ts rename to libs/angular/src/tools/generator/components/generator.component.ts index 6a104b45da..2f75446cf8 100644 --- a/libs/angular/src/components/generator.component.ts +++ b/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, diff --git a/libs/angular/src/components/password-generator-history.component.ts b/libs/angular/src/tools/generator/components/password-generator-history.component.ts similarity index 83% rename from libs/angular/src/components/password-generator-history.component.ts rename to libs/angular/src/tools/generator/components/password-generator-history.component.ts index 38e493ee93..3b86ef05e4 100644 --- a/libs/angular/src/components/password-generator-history.component.ts +++ b/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 diff --git a/libs/common/src/abstractions/state.service.ts b/libs/common/src/abstractions/state.service.ts index c14bc90461..8df321092b 100644 --- a/libs/common/src/abstractions/state.service.ts +++ b/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"; diff --git a/libs/common/src/models/domain/account.ts b/libs/common/src/models/domain/account.ts index 9eebeae6f8..efd6208d36 100644 --- a/libs/common/src/models/domain/account.ts +++ b/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"; diff --git a/libs/common/src/services/state.service.ts b/libs/common/src/services/state.service.ts index 103b6f16a7..9018bdc495 100644 --- a/libs/common/src/services/state.service.ts +++ b/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"; diff --git a/libs/common/src/services/stateMigration.service.ts b/libs/common/src/services/stateMigration.service.ts index 026952e233..40b1b99905 100644 --- a/libs/common/src/services/stateMigration.service.ts +++ b/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"; diff --git a/libs/common/src/models/domain/generated-password-history.ts b/libs/common/src/tools/generator/password/generated-password-history.ts similarity index 100% rename from libs/common/src/models/domain/generated-password-history.ts rename to libs/common/src/tools/generator/password/generated-password-history.ts diff --git a/libs/common/src/tools/generator/password/index.ts b/libs/common/src/tools/generator/password/index.ts new file mode 100644 index 0000000000..4dafe20d3a --- /dev/null +++ b/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"; diff --git a/libs/common/src/abstractions/passwordGeneration.service.ts b/libs/common/src/tools/generator/password/password-generation.service.abstraction.ts similarity index 74% rename from libs/common/src/abstractions/passwordGeneration.service.ts rename to libs/common/src/tools/generator/password/password-generation.service.abstraction.ts index b1057c312d..eef48cf614 100644 --- a/libs/common/src/abstractions/passwordGeneration.service.ts +++ b/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; generatePassphrase: (options: PasswordGeneratorOptions) => Promise; getOptions: () => Promise<[PasswordGeneratorOptions, PasswordGeneratorPolicyOptions]>; diff --git a/libs/common/src/services/passwordGeneration.service.ts b/libs/common/src/tools/generator/password/password-generation.service.ts similarity index 95% rename from libs/common/src/services/passwordGeneration.service.ts rename to libs/common/src/tools/generator/password/password-generation.service.ts index ca2c07a648..baa08ce599 100644 --- a/libs/common/src/services/passwordGeneration.service.ts +++ b/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, diff --git a/libs/common/src/models/domain/password-generator-options.ts b/libs/common/src/tools/generator/password/password-generator-options.ts similarity index 100% rename from libs/common/src/models/domain/password-generator-options.ts rename to libs/common/src/tools/generator/password/password-generator-options.ts diff --git a/libs/common/src/email-forwarders/anon-addy-forwarder.ts b/libs/common/src/tools/generator/username/email-forwarders/anon-addy-forwarder.ts similarity index 95% rename from libs/common/src/email-forwarders/anon-addy-forwarder.ts rename to libs/common/src/tools/generator/username/email-forwarders/anon-addy-forwarder.ts index c4657f8372..6b4bc42314 100644 --- a/libs/common/src/email-forwarders/anon-addy-forwarder.ts +++ b/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"; diff --git a/libs/common/src/email-forwarders/duck-duck-go-forwarder.ts b/libs/common/src/tools/generator/username/email-forwarders/duck-duck-go-forwarder.ts similarity index 94% rename from libs/common/src/email-forwarders/duck-duck-go-forwarder.ts rename to libs/common/src/tools/generator/username/email-forwarders/duck-duck-go-forwarder.ts index a600c904bc..45e4f8f3a4 100644 --- a/libs/common/src/email-forwarders/duck-duck-go-forwarder.ts +++ b/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"; diff --git a/libs/common/src/email-forwarders/fastmail-forwarder.ts b/libs/common/src/tools/generator/username/email-forwarders/fastmail-forwarder.ts similarity index 97% rename from libs/common/src/email-forwarders/fastmail-forwarder.ts rename to libs/common/src/tools/generator/username/email-forwarders/fastmail-forwarder.ts index dc24c623a3..3a0fa122e8 100644 --- a/libs/common/src/email-forwarders/fastmail-forwarder.ts +++ b/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"; diff --git a/libs/common/src/email-forwarders/firefox-relay-forwarder.ts b/libs/common/src/tools/generator/username/email-forwarders/firefox-relay-forwarder.ts similarity index 95% rename from libs/common/src/email-forwarders/firefox-relay-forwarder.ts rename to libs/common/src/tools/generator/username/email-forwarders/firefox-relay-forwarder.ts index f64dc4b06a..b15a912eab 100644 --- a/libs/common/src/email-forwarders/firefox-relay-forwarder.ts +++ b/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"; diff --git a/libs/common/src/email-forwarders/forwarder-options.ts b/libs/common/src/tools/generator/username/email-forwarders/forwarder-options.ts similarity index 100% rename from libs/common/src/email-forwarders/forwarder-options.ts rename to libs/common/src/tools/generator/username/email-forwarders/forwarder-options.ts diff --git a/libs/common/src/email-forwarders/forwarder.ts b/libs/common/src/tools/generator/username/email-forwarders/forwarder.ts similarity index 71% rename from libs/common/src/email-forwarders/forwarder.ts rename to libs/common/src/tools/generator/username/email-forwarders/forwarder.ts index da3d1bb485..e51fb35c3d 100644 --- a/libs/common/src/email-forwarders/forwarder.ts +++ b/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"; diff --git a/libs/common/src/tools/generator/username/email-forwarders/index.ts b/libs/common/src/tools/generator/username/email-forwarders/index.ts new file mode 100644 index 0000000000..a9a437225e --- /dev/null +++ b/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"; diff --git a/libs/common/src/email-forwarders/simple-login-forwarder.ts b/libs/common/src/tools/generator/username/email-forwarders/simple-login-forwarder.ts similarity index 95% rename from libs/common/src/email-forwarders/simple-login-forwarder.ts rename to libs/common/src/tools/generator/username/email-forwarders/simple-login-forwarder.ts index ef1eecb59b..bf3eea4232 100644 --- a/libs/common/src/email-forwarders/simple-login-forwarder.ts +++ b/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"; diff --git a/libs/common/src/tools/generator/username/index.ts b/libs/common/src/tools/generator/username/index.ts new file mode 100644 index 0000000000..b4f73a29ed --- /dev/null +++ b/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"; diff --git a/libs/common/src/abstractions/usernameGeneration.service.ts b/libs/common/src/tools/generator/username/username-generation.service.abstraction.ts similarity index 85% rename from libs/common/src/abstractions/usernameGeneration.service.ts rename to libs/common/src/tools/generator/username/username-generation.service.abstraction.ts index b5bef9fc41..52accf7d8c 100644 --- a/libs/common/src/abstractions/usernameGeneration.service.ts +++ b/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; generateWord: (options: any) => Promise; generateSubaddress: (options: any) => Promise; diff --git a/libs/common/src/services/usernameGeneration.service.ts b/libs/common/src/tools/generator/username/username-generation.service.ts similarity index 84% rename from libs/common/src/services/usernameGeneration.service.ts rename to libs/common/src/tools/generator/username/username-generation.service.ts index 7c9eb34e89..4ad305e8b2 100644 --- a/libs/common/src/services/usernameGeneration.service.ts +++ b/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,