bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 16:53:34 +00:00
Code Issues Releases Wiki Activity

[PM-2135] feat: allow user verification to show invalid password error

Browse Source
This commit is contained in:
Andreas Coroiu
2023-05-05 14:30:41 +02:00
parent 1b6722feee
commit f69b42a622
6 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/angular/src/auth/components/user-verification-prompt.component.ts
View File

@@ -22,6 +22,8 @@ export class UserVerificationPromptComponent {
secret: this.formBuilder.control<Verification | null>(null),
});
protected invalidSecret = false;
constructor(
private modalRef: ModalRef,
protected config: ModalConfig,
@@ -45,7 +47,9 @@ export class UserVerificationPromptComponent {
try {
//Incorrect secret will throw an invalid password error.
await this.userVerificationService.verifyUser(this.secret.value);
this.invalidSecret = false;
} catch (e) {
this.invalidSecret = true;
this.platformUtilsService.showToast(
"error",
this.i18nService.t("error"),

33
libs/angular/src/auth/components/user-verification.component.ts
View File

@@ -1,6 +1,7 @@
import { Directive, OnInit } from "@angular/core";
import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
import { ControlValueAccessor, FormControl, Validators } from "@angular/forms";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
@@ -18,17 +19,39 @@ import { Verification } from "@bitwarden/common/types/verification";
})
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
export class UserVerificationComponent implements ControlValueAccessor, OnInit {
private _invalidSecret = false;
@Input()
get invalidSecret() {
return this._invalidSecret;
}
set invalidSecret(value: boolean) {
this._invalidSecret = value;
this.invalidSecretChange.emit(value);
this.secret.updateValueAndValidity({ emitEvent: false });
}
@Output() invalidSecretChange = new EventEmitter<boolean>();
usesKeyConnector = false;
disableRequestOTP = false;
sentCode = false;
secret = new FormControl("", [Validators.required]);
secret = new FormControl("", [
Validators.required,
() => {
if (this.invalidSecret) {
return {
invalidSecret: { message: this.i18nService.t("incorrectPassword") },
};
}
},
]);
private onChange: (value: Verification) => void;
constructor(
private keyConnectorService: KeyConnectorService,
private userVerificationService: UserVerificationService
private userVerificationService: UserVerificationService,
private i18nService: I18nService
) {}
async ngOnInit() {
@@ -72,7 +95,9 @@ export class UserVerificationComponent implements ControlValueAccessor, OnInit {
}
}
private processChanges(secret: string) {
protected processChanges(secret: string) {
this.invalidSecret = false;
if (this.onChange == null) {
return;
}