diff --git a/apps/web/src/app/components/export-file-password-prompt.component.ts b/apps/web/src/app/components/export-file-password-prompt.component.ts deleted file mode 100644 index 504c606c4bb..00000000000 --- a/apps/web/src/app/components/export-file-password-prompt.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from "@angular/core"; - -import { ExportFilePasswordPromptComponent as BaseExportFilePasswordPrompt } from "@bitwarden/angular/components/export-file-password-prompt.component"; - -@Component({ - templateUrl: "export-file-password-prompt.component.html", -}) -export class ExportFilePasswordPromptComponent extends BaseExportFilePasswordPrompt {} diff --git a/apps/web/src/app/components/export-file-password-prompt.component.html b/apps/web/src/app/components/user-secret-prompt.component.html similarity index 100% rename from apps/web/src/app/components/export-file-password-prompt.component.html rename to apps/web/src/app/components/user-secret-prompt.component.html diff --git a/apps/web/src/app/components/user-secret-prompt.component.ts b/apps/web/src/app/components/user-secret-prompt.component.ts new file mode 100644 index 00000000000..2dfc34c59e5 --- /dev/null +++ b/apps/web/src/app/components/user-secret-prompt.component.ts @@ -0,0 +1,8 @@ +import { Component } from "@angular/core"; + +import { UserSecretPromptComponent as BaseUserSecretPrompt } from "@bitwarden/angular/components/user-secret-prompt.component"; + +@Component({ + templateUrl: "user-secret-prompt.component.html", +}) +export class UserSecretPromptComponent extends BaseUserSecretPrompt {} diff --git a/apps/web/src/app/modules/loose-components.module.ts b/apps/web/src/app/modules/loose-components.module.ts index 66de29888aa..8bcd7125a3c 100644 --- a/apps/web/src/app/modules/loose-components.module.ts +++ b/apps/web/src/app/modules/loose-components.module.ts @@ -19,13 +19,13 @@ import { UpdatePasswordComponent } from "../accounts/update-password.component"; import { UpdateTempPasswordComponent } from "../accounts/update-temp-password.component"; import { VerifyEmailTokenComponent } from "../accounts/verify-email-token.component"; import { VerifyRecoverDeleteComponent } from "../accounts/verify-recover-delete.component"; -import { ExportFilePasswordPromptComponent } from "../components/export-file-password-prompt.component"; import { FilePasswordPromptComponent } from "../components/file-password-prompt.component"; import { NestedCheckboxComponent } from "../components/nested-checkbox.component"; import { OrganizationSwitcherComponent } from "../components/organization-switcher.component"; import { PasswordRepromptComponent } from "../components/password-reprompt.component"; import { PasswordStrengthComponent } from "../components/password-strength.component"; import { PremiumBadgeComponent } from "../components/premium-badge.component"; +import { UserSecretPromptComponent } from "../components/user-secret-prompt.component"; import { FooterComponent } from "../layouts/footer.component"; import { FrontendLayoutComponent } from "../layouts/frontend-layout.component"; import { NavbarComponent } from "../layouts/navbar.component"; @@ -272,7 +272,7 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga PasswordGeneratorPolicyComponent, PasswordRepromptComponent, FilePasswordPromptComponent, - ExportFilePasswordPromptComponent, + UserSecretPromptComponent, PasswordStrengthComponent, PaymentComponent, PaymentMethodComponent, diff --git a/apps/web/src/app/organizations/tools/export.component.ts b/apps/web/src/app/organizations/tools/export.component.ts index d56fa061119..a666df8db14 100644 --- a/apps/web/src/app/organizations/tools/export.component.ts +++ b/apps/web/src/app/organizations/tools/export.component.ts @@ -2,8 +2,8 @@ import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { ActivatedRoute } from "@angular/router"; -import { ExportFilePasswordPromptService } from "@bitwarden/angular/services/exportFilePasswordPrompt.service"; import { ModalConfig, ModalService } from "@bitwarden/angular/services/modal.service"; +import { UserSecretPromptService } from "@bitwarden/angular/services/userSecretPrompt.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EventService } from "@bitwarden/common/abstractions/event.service"; @@ -36,7 +36,7 @@ export class ExportComponent extends BaseExportComponent { modalService: ModalService, apiService: ApiService, stateService: StateService, - exportFilePasswordPromptService: ExportFilePasswordPromptService, + userSecretPromptService: UserSecretPromptService, modalConfig: ModalConfig ) { super( @@ -52,7 +52,7 @@ export class ExportComponent extends BaseExportComponent { modalService, apiService, stateService, - exportFilePasswordPromptService, + userSecretPromptService, modalConfig ); this.confirmDescription = modalConfig.data.confirmDescription; diff --git a/apps/web/src/app/services/services.module.ts b/apps/web/src/app/services/services.module.ts index f055bb66b87..51ec7dcae19 100644 --- a/apps/web/src/app/services/services.module.ts +++ b/apps/web/src/app/services/services.module.ts @@ -9,14 +9,17 @@ import { LOCALES_DIRECTORY, SYSTEM_LANGUAGE, } from "@bitwarden/angular/services/jslib-services.module"; -import { ModalService as ModalServiceAbstraction , ModalConfig as ModalConfigAbstraction , ModalConfig } from "@bitwarden/angular/services/modal.service"; +import { + ModalService as ModalServiceAbstraction, + ModalConfig as ModalConfigAbstraction, + ModalConfig, +} from "@bitwarden/angular/services/modal.service"; import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service"; import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/abstractions/cipher.service"; import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/abstractions/collection.service"; import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service"; import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/abstractions/cryptoFunction.service"; import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abstractions/export.service"; -import { ExportFilePasswordPromptService as ExportFilePasswordPromptServiceAbstraction } from "@bitwarden/common/abstractions/exportFilePasswordPrompt.service"; import { FilePasswordPromptService as FilePasswordPromptServiceAbstraction } from "@bitwarden/common/abstractions/filePasswordPrompt.service"; import { FolderService as FolderServiceAbstraction } from "@bitwarden/common/abstractions/folder.service"; import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; @@ -28,6 +31,7 @@ import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwar import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service"; import { StorageService as StorageServiceAbstraction } from "@bitwarden/common/abstractions/storage.service"; +import { UserSecretPromptService as UserSecretPromptServiceAbstraction } from "@bitwarden/common/abstractions/userSecretPrompt.service"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { ExportService } from "@bitwarden/common/services/export.service"; import { ImportService } from "@bitwarden/common/services/import.service"; @@ -36,7 +40,6 @@ import { StateService as StateServiceAbstraction } from "../../abstractions/stat import { Account } from "../../models/account"; import { GlobalState } from "../../models/globalState"; import { BroadcasterMessagingService } from "../../services/broadcasterMessaging.service"; -import { ExportFilePasswordPromptService } from "../../services/exportFilePasswordPrompt.service"; import { FilePasswordPromptService } from "../../services/filePasswordPrompt.service"; import { HtmlStorageService } from "../../services/htmlStorage.service"; import { I18nService } from "../../services/i18n.service"; @@ -44,6 +47,7 @@ import { MemoryStorageService } from "../../services/memoryStorage.service"; import { PasswordRepromptService } from "../../services/passwordReprompt.service"; import { StateService } from "../../services/state.service"; import { StateMigrationService } from "../../services/stateMigration.service"; +import { UserSecretPromptService } from "../../services/userSecretPrompt.service"; import { WebPlatformUtilsService } from "../../services/webPlatformUtils.service"; import { HomeGuard } from "../guards/home.guard"; import { PermissionsGuard as OrgPermissionsGuard } from "../organizations/guards/permissions.guard"; @@ -152,8 +156,8 @@ import { RouterService } from "./router.service"; useClass: FilePasswordPromptService, }, { - provide: ExportFilePasswordPromptServiceAbstraction, - useClass: ExportFilePasswordPromptService, + provide: UserSecretPromptServiceAbstraction, + useClass: UserSecretPromptService, }, HomeGuard, ], diff --git a/apps/web/src/app/tools/export.component.ts b/apps/web/src/app/tools/export.component.ts index 555b8883145..d3db6496bf1 100644 --- a/apps/web/src/app/tools/export.component.ts +++ b/apps/web/src/app/tools/export.component.ts @@ -7,12 +7,12 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EventService } from "@bitwarden/common/abstractions/event.service"; import { ExportService } from "@bitwarden/common/abstractions/export.service"; -import { ExportFilePasswordPromptService } from "@bitwarden/common/abstractions/exportFilePasswordPrompt.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { UserSecretPromptService } from "@bitwarden/common/abstractions/userSecretPrompt.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; @Component({ @@ -47,7 +47,7 @@ export class ExportComponent extends BaseExportComponent { modalService: ModalService, apiService: ApiService, stateService: StateService, - exportFilePasswordPromptService: ExportFilePasswordPromptService, + userSecretPromptService: UserSecretPromptService, modalConfig: ModalConfig ) { super( @@ -64,7 +64,7 @@ export class ExportComponent extends BaseExportComponent { modalService, apiService, stateService, - exportFilePasswordPromptService, + userSecretPromptService, modalConfig ); } @@ -85,7 +85,7 @@ export class ExportComponent extends BaseExportComponent { const entityId = await this.stateService.getUserId(); try { if ( - await this.exportFilePasswordPromptService.showPasswordPrompt( + await this.userSecretPromptService.showPasswordPrompt( confirmDescription, confirmButtonText, modalTitle diff --git a/apps/web/src/services/exportFilePasswordPrompt.service.ts b/apps/web/src/services/exportFilePasswordPrompt.service.ts deleted file mode 100644 index c18f20f0e9e..00000000000 --- a/apps/web/src/services/exportFilePasswordPrompt.service.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Injectable } from "@angular/core"; - -import { ExportFilePasswordPromptService as BaseExportFilePasswordPrompt } from "@bitwarden/angular/services/exportFilePasswordPrompt.service"; - -import { ExportFilePasswordPromptComponent } from "../app/components/export-file-password-prompt.component"; - -@Injectable() -export class ExportFilePasswordPromptService extends BaseExportFilePasswordPrompt { - component = ExportFilePasswordPromptComponent; -} diff --git a/apps/web/src/services/userSecretPrompt.service.ts b/apps/web/src/services/userSecretPrompt.service.ts new file mode 100644 index 00000000000..dfbd61bbeb5 --- /dev/null +++ b/apps/web/src/services/userSecretPrompt.service.ts @@ -0,0 +1,10 @@ +import { Injectable } from "@angular/core"; + +import { UserSecretPromptService as BaseUserSecretPrompt } from "@bitwarden/angular/services/userSecretPrompt.service"; + +import { UserSecretPromptComponent } from "../app/components/user-secret-prompt.component"; + +@Injectable() +export class UserSecretPromptService extends BaseUserSecretPrompt { + component = UserSecretPromptComponent; +} diff --git a/libs/angular/src/components/export.component.ts b/libs/angular/src/components/export.component.ts index ce5916e13cd..a05e3ac3cbd 100644 --- a/libs/angular/src/components/export.component.ts +++ b/libs/angular/src/components/export.component.ts @@ -13,12 +13,12 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EventService } from "@bitwarden/common/abstractions/event.service"; import { ExportService } from "@bitwarden/common/abstractions/export.service"; -import { ExportFilePasswordPromptService } from "@bitwarden/common/abstractions/exportFilePasswordPrompt.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { UserSecretPromptService } from "@bitwarden/common/abstractions/userSecretPrompt.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; import { EventType } from "@bitwarden/common/enums/eventType"; import { PolicyType } from "@bitwarden/common/enums/policyType"; @@ -64,7 +64,7 @@ export class ExportComponent implements OnInit { protected modalService: ModalService, protected apiService: ApiService, protected stateService: StateService, - protected exportFilePasswordPromptService: ExportFilePasswordPromptService, + protected userSecretPromptService: UserSecretPromptService, protected modalConfig: ModalConfig ) {} diff --git a/libs/angular/src/components/export-file-password-prompt.component.ts b/libs/angular/src/components/user-secret-prompt.component.ts similarity index 97% rename from libs/angular/src/components/export-file-password-prompt.component.ts rename to libs/angular/src/components/user-secret-prompt.component.ts index 4f7ae35caef..9e174672c58 100644 --- a/libs/angular/src/components/export-file-password-prompt.component.ts +++ b/libs/angular/src/components/user-secret-prompt.component.ts @@ -15,7 +15,7 @@ import { ModalRef } from "./modal/modal.ref"; * Used to verify the user's secret, you can customize all of the text in the modal. */ @Directive() -export class ExportFilePasswordPromptComponent { +export class UserSecretPromptComponent { showPassword = false; organizationId = ""; confirmDescription = ""; diff --git a/libs/angular/src/services/exportFilePasswordPrompt.service.ts b/libs/angular/src/services/userSecretPrompt.service.ts similarity index 73% rename from libs/angular/src/services/exportFilePasswordPrompt.service.ts rename to libs/angular/src/services/userSecretPrompt.service.ts index 6645c12b47e..af1b61ec262 100644 --- a/libs/angular/src/services/exportFilePasswordPrompt.service.ts +++ b/libs/angular/src/services/userSecretPrompt.service.ts @@ -1,9 +1,9 @@ import { Injectable } from "@angular/core"; -import { ExportFilePasswordPromptService as ExportFilePasswordPromptServiceAbstraction } from "@bitwarden/common/abstractions/exportFilePasswordPrompt.service"; import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; +import { UserSecretPromptService as UserSecretPromptServiceAbstraction } from "@bitwarden/common/abstractions/userSecretPrompt.service"; -import { ExportFilePasswordPromptComponent } from "../components/export-file-password-prompt.component"; +import { UserSecretPromptComponent } from "../components/user-secret-prompt.component"; import { ModalService } from "./modal.service"; @@ -11,8 +11,8 @@ import { ModalService } from "./modal.service"; * Used to verify the user's File Password for the "Import passwords using File Password" feature only. */ @Injectable() -export class ExportFilePasswordPromptService implements ExportFilePasswordPromptServiceAbstraction { - protected component = ExportFilePasswordPromptComponent; +export class UserSecretPromptService implements UserSecretPromptServiceAbstraction { + protected component = UserSecretPromptComponent; constructor( private modalService: ModalService, diff --git a/libs/common/src/abstractions/exportFilePasswordPrompt.service.ts b/libs/common/src/abstractions/userSecretPrompt.service.ts similarity index 78% rename from libs/common/src/abstractions/exportFilePasswordPrompt.service.ts rename to libs/common/src/abstractions/userSecretPrompt.service.ts index ca17d4191e8..523b46a2f00 100644 --- a/libs/common/src/abstractions/exportFilePasswordPrompt.service.ts +++ b/libs/common/src/abstractions/userSecretPrompt.service.ts @@ -1,4 +1,4 @@ -export abstract class ExportFilePasswordPromptService { +export abstract class UserSecretPromptService { protectedFields: () => string[]; showPasswordPrompt: ( confirmDescription: string,