diff --git a/apps/browser/src/tools/popup/settings/export.component.html b/apps/browser/src/tools/popup/settings/export.component.html
index 1b2ea1eb1d..ef031b7979 100644
--- a/apps/browser/src/tools/popup/settings/export.component.html
+++ b/apps/browser/src/tools/popup/settings/export.component.html
@@ -29,11 +29,6 @@
-
-
-
-
diff --git a/apps/browser/src/tools/popup/settings/export.component.ts b/apps/browser/src/tools/popup/settings/export.component.ts
index b62ed4c517..9f3f054d2a 100644
--- a/apps/browser/src/tools/popup/settings/export.component.ts
+++ b/apps/browser/src/tools/popup/settings/export.component.ts
@@ -5,7 +5,6 @@ import { Router } from "@angular/router";
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -27,7 +26,6 @@ export class ExportComponent extends BaseExportComponent {
policyService: PolicyService,
private router: Router,
logService: LogService,
- userVerificationService: UserVerificationService,
formBuilder: UntypedFormBuilder,
fileDownloadService: FileDownloadService,
dialogService: DialogService,
@@ -40,7 +38,6 @@ export class ExportComponent extends BaseExportComponent {
eventCollectionService,
policyService,
logService,
- userVerificationService,
formBuilder,
fileDownloadService,
dialogService,
diff --git a/apps/desktop/src/app/tools/export/export.component.html b/apps/desktop/src/app/tools/export/export.component.html
index 0058a0925c..3792713e61 100644
--- a/apps/desktop/src/app/tools/export/export.component.html
+++ b/apps/desktop/src/app/tools/export/export.component.html
@@ -21,11 +21,6 @@
-
-
-
-
diff --git a/apps/desktop/src/app/tools/export/export.component.ts b/apps/desktop/src/app/tools/export/export.component.ts
index 80ae3c80f9..6cf5760a1c 100644
--- a/apps/desktop/src/app/tools/export/export.component.ts
+++ b/apps/desktop/src/app/tools/export/export.component.ts
@@ -4,7 +4,6 @@ import { UntypedFormBuilder } from "@angular/forms";
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -24,7 +23,6 @@ export class ExportComponent extends BaseExportComponent implements OnInit {
exportService: VaultExportServiceAbstraction,
eventCollectionService: EventCollectionService,
policyService: PolicyService,
- userVerificationService: UserVerificationService,
formBuilder: UntypedFormBuilder,
logService: LogService,
fileDownloadService: FileDownloadService,
@@ -38,7 +36,6 @@ export class ExportComponent extends BaseExportComponent implements OnInit {
eventCollectionService,
policyService,
logService,
- userVerificationService,
formBuilder,
fileDownloadService,
dialogService,
diff --git a/apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.component.ts b/apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.component.ts
index 7a2a67b69c..e3d19f5487 100644
--- a/apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.component.ts
+++ b/apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.component.ts
@@ -5,7 +5,6 @@ import { ActivatedRoute } from "@angular/router";
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
import { EventType } from "@bitwarden/common/enums";
import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -30,7 +29,6 @@ export class OrganizationVaultExportComponent extends ExportComponent {
private route: ActivatedRoute,
policyService: PolicyService,
logService: LogService,
- userVerificationService: UserVerificationService,
formBuilder: UntypedFormBuilder,
fileDownloadService: FileDownloadService,
dialogService: DialogService,
@@ -43,7 +41,6 @@ export class OrganizationVaultExportComponent extends ExportComponent {
eventCollectionService,
policyService,
logService,
- userVerificationService,
formBuilder,
fileDownloadService,
dialogService,
diff --git a/apps/web/src/app/tools/vault-export/export.component.ts b/apps/web/src/app/tools/vault-export/export.component.ts
index 4fdd3ff9e0..7902d2818d 100644
--- a/apps/web/src/app/tools/vault-export/export.component.ts
+++ b/apps/web/src/app/tools/vault-export/export.component.ts
@@ -1,11 +1,9 @@
import { Component } from "@angular/core";
import { UntypedFormBuilder } from "@angular/forms";
-import { UserVerificationDialogComponent } from "@bitwarden/auth/angular";
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -26,7 +24,6 @@ export class ExportComponent extends BaseExportComponent {
eventCollectionService: EventCollectionService,
policyService: PolicyService,
logService: LogService,
- userVerificationService: UserVerificationService,
formBuilder: UntypedFormBuilder,
fileDownloadService: FileDownloadService,
dialogService: DialogService,
@@ -39,84 +36,10 @@ export class ExportComponent extends BaseExportComponent {
eventCollectionService,
policyService,
logService,
- userVerificationService,
formBuilder,
fileDownloadService,
dialogService,
organizationService,
);
}
-
- submit = async () => {
- if (this.isFileEncryptedExport && this.filePassword != this.confirmFilePassword) {
- this.platformUtilsService.showToast(
- "error",
- this.i18nService.t("errorOccurred"),
- this.i18nService.t("filePasswordAndConfirmFilePasswordDoNotMatch"),
- );
- return;
- }
-
- this.exportForm.markAllAsTouched();
- if (this.exportForm.invalid) {
- return;
- }
-
- if (this.disabledByPolicy) {
- this.platformUtilsService.showToast(
- "error",
- null,
- this.i18nService.t("personalVaultExportPolicyInEffect"),
- );
- return;
- }
-
- const userVerified = await this.verifyUser();
- if (!userVerified) {
- return;
- }
-
- // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
- // eslint-disable-next-line @typescript-eslint/no-floating-promises
- this.doExport();
- };
-
- protected saved() {
- super.saved();
- this.platformUtilsService.showToast("success", null, this.i18nService.t("exportSuccess"));
- }
-
- private async verifyUser(): Promise {
- let confirmDescription = "exportWarningDesc";
- if (this.isFileEncryptedExport) {
- confirmDescription = "fileEncryptedExportWarningDesc";
- } else if (this.isAccountEncryptedExport) {
- confirmDescription = "encExportKeyWarningDesc";
- }
-
- const result = await UserVerificationDialogComponent.open(this.dialogService, {
- title: "confirmVaultExport",
- bodyText: confirmDescription,
- confirmButtonOptions: {
- text: "exportVault",
- type: "primary",
- },
- });
-
- // Handle the result of the dialog based on user action and verification success
- if (result.userAction === "cancel") {
- // User cancelled the dialog
- return false;
- }
-
- // User confirmed the dialog so check verification success
- if (!result.verificationSuccess) {
- if (result.noAvailableClientVerificationMethods) {
- // No client-side verification methods are available
- // Could send user to configure a verification method like PIN or biometrics
- }
- return false;
- }
- return true;
- }
}
diff --git a/libs/tools/export/vault-export/vault-export-ui/package.json b/libs/tools/export/vault-export/vault-export-ui/package.json
index e27140f365..3be54c4e19 100644
--- a/libs/tools/export/vault-export/vault-export-ui/package.json
+++ b/libs/tools/export/vault-export/vault-export-ui/package.json
@@ -20,6 +20,7 @@
"dependencies": {
"@bitwarden/common": "file:../../../../common",
"@bitwarden/angular": "file:../../../../angular",
+ "@bitwarden/auth": "file:../../../../auth",
"@bitwarden/vault-export-core": "file:../vault-export-core"
}
}
diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
index ce478db19a..3e091a2417 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
@@ -3,12 +3,12 @@ import { UntypedFormBuilder, Validators } from "@angular/forms";
import { map, merge, Observable, startWith, Subject, takeUntil } from "rxjs";
import { PasswordStrengthComponent } from "@bitwarden/angular/tools/password-strength/password-strength.component";
+import { UserVerificationDialogComponent } from "@bitwarden/auth/angular";
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { PolicyType } from "@bitwarden/common/admin-console/enums";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
import { EventType } from "@bitwarden/common/enums";
import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -67,7 +67,6 @@ export class ExportComponent implements OnInit, OnDestroy {
protected eventCollectionService: EventCollectionService,
private policyService: PolicyService,
private logService: LogService,
- private userVerificationService: UserVerificationService,
private formBuilder: UntypedFormBuilder,
protected fileDownloadService: FileDownloadService,
protected dialogService: DialogService,
@@ -154,7 +153,21 @@ export class ExportComponent implements OnInit, OnDestroy {
}
}
- async submit() {
+ submit = async () => {
+ if (this.isFileEncryptedExport && this.filePassword != this.confirmFilePassword) {
+ this.platformUtilsService.showToast(
+ "error",
+ this.i18nService.t("errorOccurred"),
+ this.i18nService.t("filePasswordAndConfirmFilePasswordDoNotMatch"),
+ );
+ return;
+ }
+
+ this.exportForm.markAllAsTouched();
+ if (this.exportForm.invalid) {
+ return;
+ }
+
if (this.disabledByPolicy) {
this.platformUtilsService.showToast(
"error",
@@ -164,49 +177,52 @@ export class ExportComponent implements OnInit, OnDestroy {
return;
}
- const acceptedWarning = await this.warningDialog();
- if (!acceptedWarning) {
- return;
- }
- const secret = this.exportForm.get("secret").value;
-
- try {
- await this.userVerificationService.verifyUser(secret);
- } catch (e) {
- this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), e.message);
+ const userVerified = await this.verifyUser();
+ if (!userVerified) {
return;
}
- // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
- // eslint-disable-next-line @typescript-eslint/no-floating-promises
- this.doExport();
- }
-
- async warningDialog() {
- if (this.encryptedFormat) {
- return await this.dialogService.openSimpleDialog({
- title: { key: "confirmVaultExport" },
- content:
- this.i18nService.t("encExportKeyWarningDesc") +
- " " +
- this.i18nService.t("encExportAccountWarningDesc"),
- acceptButtonText: { key: "exportVault" },
- type: "warning",
- });
- } else {
- return await this.dialogService.openSimpleDialog({
- title: { key: "confirmVaultExport" },
- content: { key: "exportWarningDesc" },
- acceptButtonText: { key: "exportVault" },
- type: "warning",
- });
- }
- }
+ await this.doExport();
+ };
protected saved() {
this.onSaved.emit();
}
+ private async verifyUser(): Promise {
+ let confirmDescription = "exportWarningDesc";
+ if (this.isFileEncryptedExport) {
+ confirmDescription = "fileEncryptedExportWarningDesc";
+ } else if (this.isAccountEncryptedExport) {
+ confirmDescription = "encExportKeyWarningDesc";
+ }
+
+ const result = await UserVerificationDialogComponent.open(this.dialogService, {
+ title: "confirmVaultExport",
+ bodyText: confirmDescription,
+ confirmButtonOptions: {
+ text: "exportVault",
+ type: "primary",
+ },
+ });
+
+ // Handle the result of the dialog based on user action and verification success
+ if (result.userAction === "cancel") {
+ // User cancelled the dialog
+ return false;
+ }
+
+ // User confirmed the dialog so check verification success
+ if (!result.verificationSuccess) {
+ if (result.noAvailableClientVerificationMethods) {
+ // No client-side verification methods are available
+ // Could send user to configure a verification method like PIN or biometrics
+ }
+ return false;
+ }
+ return true;
+ }
+
protected async getExportData(): Promise {
return Utils.isNullOrWhitespace(this.organizationId)
? this.exportService.getExport(this.format, this.filePassword)