1
0
mirror of https://github.com/bitwarden/browser synced 2026-02-16 16:59:30 +00:00

Updates to export logic modal user secret prompt

This commit is contained in:
CarleyDiaz-Bitwarden
2022-06-20 12:50:56 -04:00
parent 8f06a8cf35
commit f5c78590db
15 changed files with 264 additions and 65 deletions

View File

@@ -0,0 +1,60 @@
import { Directive } from "@angular/core";
import { FormBuilder, FormControl, FormGroup } from "@angular/forms";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { ImportService } from "@bitwarden/common/abstractions/import.service";
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service";
import { ModalConfig } from "../services/modal.service";
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 {
showPassword = false;
organizationId = "";
confirmDescription = "";
confirmButtonText = "";
modalTitle = "";
myGroup = this.formBuilder.group({
secret: new FormControl(),
});
constructor(
private modalRef: ModalRef,
private cryptoService: CryptoService,
private platformUtilsService: PlatformUtilsService,
private i18nService: I18nService,
private importService: ImportService,
protected config: ModalConfig,
protected userVerificationService: UserVerificationService,
private formBuilder: FormBuilder
) {
this.confirmDescription = config.data.confirmDescription;
this.confirmButtonText = config.data.confirmButtonText;
this.modalTitle = config.data.modalTitle;
}
togglePassword() {
this.showPassword = !this.showPassword;
}
async submit() {
const secret = this.myGroup.get("secret").value;
try {
await this.userVerificationService.verifyUser(secret);
} catch (e) {
this.modalRef.close(false);
return;
}
this.modalRef.close(true);
}
}

View File

@@ -8,10 +8,12 @@ import {
} from "@angular/core";
import { FormBuilder } from "@angular/forms";
import { ModalConfig, ModalService } from "@bitwarden/angular/services/modal.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";
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";
@@ -21,8 +23,6 @@ import { UserVerificationService } from "@bitwarden/common/abstractions/userVeri
import { EventType } from "@bitwarden/common/enums/eventType";
import { PolicyType } from "@bitwarden/common/enums/policyType";
import { ModalService } from "../services/modal.service";
@Directive()
export class ExportComponent implements OnInit {
@Output() onSaved = new EventEmitter();
@@ -63,7 +63,9 @@ export class ExportComponent implements OnInit {
private formBuilder: FormBuilder,
protected modalService: ModalService,
protected apiService: ApiService,
protected stateService: StateService
protected stateService: StateService,
protected exportFilePasswordPromptService: ExportFilePasswordPromptService,
protected modalConfig: ModalConfig
) {}
async ngOnInit() {

View File

@@ -0,0 +1,54 @@
import { Injectable } from "@angular/core";
import { ExportFilePasswordPromptService as ExportFilePasswordPromptServiceAbstraction } from "@bitwarden/common/abstractions/exportFilePasswordPrompt.service";
import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
import { ExportFilePasswordPromptComponent } from "../components/export-file-password-prompt.component";
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;
constructor(
private modalService: ModalService,
private keyConnectorService: KeyConnectorService
) {}
protectedFields() {
return ["TOTP", "Password", "H_Field", "Card Number", "Security Code"];
}
async showPasswordPrompt(
confirmDescription: string,
confirmButtonText: string,
modalTitle: string
) {
if (!(await this.enabled())) {
return true;
}
const ref = await this.modalService.open(this.component, {
allowMultipleModals: true,
data: {
confirmDescription: confirmDescription,
confirmButtonText: confirmButtonText,
modalTitle: modalTitle,
},
});
if (ref == null) {
return false;
}
return (await ref.onClosedPromise()) === true;
}
async enabled() {
return !(await this.keyConnectorService.getUsesKeyConnector());
}
}