mirror of
https://github.com/bitwarden/clients.git
synced 2026-02-06 00:55:11 +08:00
* Rough draft of Export/Import changes w/ password encryption * fix for encrypted export changes * Create launch.json * Updates to export logic modal user secret prompt * Updates to error handling * renaming the component for checking the user secret to a name that is more clear about what it accomplishes * Fixing lint errors * Adding a comment * Suggested changes from CR * Suggested changes from CR * Making suggested changes * removing unnecessary properties * changes suggested * Fix * Updating error messages * Removing unecessary launch.json file commit * running lint, removing commented code * removing launch.json * Updates to remove the userVerificationPromptService * updates * Removing unused import, running npm prettier/lint * Changes to use Form Fields * Updates * updates requested by Matt * Update apps/web/src/app/tools/import-export/export.component.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * Suggested Changes from PR * Fix after merge from Master * changes to styling * Removing unused code and cleanup * Update libs/angular/src/components/user-verification-prompt.component.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * Update apps/web/src/locales/en/messages.json Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * Changes suggested by Thomas R * Merging master into branch * Revert "Merging master into branch" This reverts commiteb2cdffe49. * Requested changes and improvements * merging master into feature branch * Revert "merging master into feature branch" This reverts commite287715251. * Suggested Changes * changes * requested changes * Requested changes * removing comments, fixing code * reducing copied code * fixing bug * fixing bug * changes * WIP * Thomas's requested changes * adding back missing spaces * change needed after the merge from master into feature branch * prettier + lint * Updating the EncryptedExportType Import * Fixing build errors Co-authored-by: Thomas Rittson <eliykat@users.noreply.github.com> * Move FilePasswordPrompt to ImportExportModule Also remove base class Also remove duplicate service providers * Run prettier * Suggested Changes from Thomas * only require filePassword and confirmFilePassword if it's type is FileEncrypted * Update to only enable the field when submitting a file password encrypted file * Requested changes, moving logic to web * undoing change to bit button * Refactor to process file-encrypted imports in main import.component * Refactor confirm file password check * Remove UserVerificationPromptService * Address CodeScene feedback * Updates to disable the required file password field when needed * Subscribe to reactive form changes to adjust validators * style changes requested by suhkleen * Delete duplicate classes Co-authored-by: CarleyDiaz-Bitwarden <103955722+CarleyDiaz-Bitwarden@users.noreply.github.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Thomas Rittson <trittson@bitwarden.com> Co-authored-by: Thomas Rittson <eliykat@users.noreply.github.com>
229 lines
6.8 KiB
TypeScript
229 lines
6.8 KiB
TypeScript
import { Directive, EventEmitter, OnDestroy, OnInit, Output } from "@angular/core";
|
|
import { UntypedFormBuilder, Validators } from "@angular/forms";
|
|
import { merge, takeUntil, Subject, startWith } from "rxjs";
|
|
|
|
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 { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.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/policy.service.abstraction";
|
|
import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
|
|
import { EncryptedExportType } from "@bitwarden/common/enums/encryptedExportType";
|
|
import { EventType } from "@bitwarden/common/enums/eventType";
|
|
import { PolicyType } from "@bitwarden/common/enums/policyType";
|
|
|
|
@Directive()
|
|
export class ExportComponent implements OnInit, OnDestroy {
|
|
@Output() onSaved = new EventEmitter();
|
|
|
|
formPromise: Promise<string>;
|
|
disabledByPolicy = false;
|
|
showFilePassword: boolean;
|
|
showConfirmFilePassword: boolean;
|
|
|
|
exportForm = this.formBuilder.group({
|
|
format: ["json"],
|
|
secret: [""],
|
|
filePassword: ["", Validators.required],
|
|
confirmFilePassword: ["", Validators.required],
|
|
fileEncryptionType: [EncryptedExportType.AccountEncrypted],
|
|
});
|
|
|
|
formatOptions = [
|
|
{ name: ".json", value: "json" },
|
|
{ name: ".csv", value: "csv" },
|
|
{ name: ".json (Encrypted)", value: "encrypted_json" },
|
|
];
|
|
|
|
private destroy$ = new Subject<void>();
|
|
|
|
constructor(
|
|
protected cryptoService: CryptoService,
|
|
protected i18nService: I18nService,
|
|
protected platformUtilsService: PlatformUtilsService,
|
|
protected exportService: ExportService,
|
|
protected eventService: EventService,
|
|
private policyService: PolicyService,
|
|
protected win: Window,
|
|
private logService: LogService,
|
|
private userVerificationService: UserVerificationService,
|
|
private formBuilder: UntypedFormBuilder,
|
|
protected fileDownloadService: FileDownloadService
|
|
) {}
|
|
|
|
async ngOnInit() {
|
|
await this.checkExportDisabled();
|
|
|
|
merge(
|
|
this.exportForm.get("format").valueChanges,
|
|
this.exportForm.get("fileEncryptionType").valueChanges
|
|
)
|
|
.pipe(takeUntil(this.destroy$))
|
|
.pipe(startWith(0))
|
|
.subscribe(() => this.adjustValidators());
|
|
}
|
|
|
|
ngOnDestroy(): void {
|
|
this.destroy$.next();
|
|
}
|
|
|
|
async checkExportDisabled() {
|
|
this.disabledByPolicy = await this.policyService.policyAppliesToUser(
|
|
PolicyType.DisablePersonalVaultExport
|
|
);
|
|
if (this.disabledByPolicy) {
|
|
this.exportForm.disable();
|
|
}
|
|
}
|
|
|
|
get encryptedFormat() {
|
|
return this.format === "encrypted_json";
|
|
}
|
|
|
|
protected async doExport() {
|
|
try {
|
|
this.formPromise = this.getExportData();
|
|
const data = await this.formPromise;
|
|
this.downloadFile(data);
|
|
this.saved();
|
|
await this.collectEvent();
|
|
this.exportForm.get("secret").setValue("");
|
|
this.exportForm.clearValidators();
|
|
} catch (e) {
|
|
this.logService.error(e);
|
|
}
|
|
}
|
|
|
|
async submit() {
|
|
if (this.disabledByPolicy) {
|
|
this.platformUtilsService.showToast(
|
|
"error",
|
|
null,
|
|
this.i18nService.t("personalVaultExportPolicyInEffect")
|
|
);
|
|
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);
|
|
}
|
|
|
|
this.doExport();
|
|
}
|
|
|
|
async warningDialog() {
|
|
if (this.encryptedFormat) {
|
|
return await this.platformUtilsService.showDialog(
|
|
"<p>" +
|
|
this.i18nService.t("encExportKeyWarningDesc") +
|
|
"<p>" +
|
|
this.i18nService.t("encExportAccountWarningDesc"),
|
|
this.i18nService.t("confirmVaultExport"),
|
|
this.i18nService.t("exportVault"),
|
|
this.i18nService.t("cancel"),
|
|
"warning",
|
|
true
|
|
);
|
|
} else {
|
|
return await this.platformUtilsService.showDialog(
|
|
this.i18nService.t("exportWarningDesc"),
|
|
this.i18nService.t("confirmVaultExport"),
|
|
this.i18nService.t("exportVault"),
|
|
this.i18nService.t("cancel"),
|
|
"warning"
|
|
);
|
|
}
|
|
}
|
|
|
|
protected saved() {
|
|
this.onSaved.emit();
|
|
}
|
|
|
|
protected getExportData() {
|
|
if (
|
|
this.format === "encrypted_json" &&
|
|
this.fileEncryptionType === EncryptedExportType.FileEncrypted
|
|
) {
|
|
return this.exportService.getPasswordProtectedExport(this.filePassword);
|
|
} else {
|
|
return this.exportService.getExport(this.format, null);
|
|
}
|
|
}
|
|
|
|
protected getFileName(prefix?: string) {
|
|
let extension = this.format;
|
|
if (this.format === "encrypted_json") {
|
|
if (prefix == null) {
|
|
prefix = "encrypted";
|
|
} else {
|
|
prefix = "encrypted_" + prefix;
|
|
}
|
|
extension = "json";
|
|
}
|
|
return this.exportService.getFileName(prefix, extension);
|
|
}
|
|
|
|
protected async collectEvent(): Promise<void> {
|
|
await this.eventService.collect(EventType.User_ClientExportedVault);
|
|
}
|
|
|
|
get format() {
|
|
return this.exportForm.get("format").value;
|
|
}
|
|
|
|
get filePassword() {
|
|
return this.exportForm.get("filePassword").value;
|
|
}
|
|
|
|
get confirmFilePassword() {
|
|
return this.exportForm.get("confirmFilePassword").value;
|
|
}
|
|
|
|
get fileEncryptionType() {
|
|
return this.exportForm.get("fileEncryptionType").value;
|
|
}
|
|
|
|
toggleFilePassword() {
|
|
this.showFilePassword = !this.showFilePassword;
|
|
document.getElementById("filePassword").focus();
|
|
}
|
|
|
|
toggleConfirmFilePassword() {
|
|
this.showConfirmFilePassword = !this.showConfirmFilePassword;
|
|
document.getElementById("confirmFilePassword").focus();
|
|
}
|
|
|
|
adjustValidators() {
|
|
this.exportForm.get("confirmFilePassword").reset();
|
|
this.exportForm.get("filePassword").reset();
|
|
|
|
if (this.encryptedFormat && this.fileEncryptionType == EncryptedExportType.FileEncrypted) {
|
|
this.exportForm.controls.filePassword.enable();
|
|
this.exportForm.controls.confirmFilePassword.enable();
|
|
} else {
|
|
this.exportForm.controls.filePassword.disable();
|
|
this.exportForm.controls.confirmFilePassword.disable();
|
|
}
|
|
}
|
|
|
|
private downloadFile(csv: string): void {
|
|
const fileName = this.getFileName();
|
|
this.fileDownloadService.download({
|
|
fileName: fileName,
|
|
blobData: csv,
|
|
blobOptions: { type: "text/plain" },
|
|
});
|
|
}
|
|
}
|