Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-21 11:35:34 +01:00
Code Issues Projects Releases Wiki Activity

PM-8337 Add Invalid Secret Handling to Two Factor Verify Dialog (#9325)

Browse Source
This commit is contained in:
KiruthigaManivannan 2024-05-29 19:33:28 +05:30 committed by GitHub
parent 9d342f61cb
commit beb930902a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/src/app/auth/settings/two-factor-verify.component.html
View File

@ -7,8 +7,8 @@
<ng-container bitDialogContent> <ng-container bitDialogContent>
<app-user-verification-form-input <app-user-verification-form-input
formControlName="secret" formControlName="secret"
ngDefaultControl
name="secret" name="secret"
[(invalidSecret)]="invalidSecret"
></app-user-verification-form-input> ></app-user-verification-form-input>
</ng-container> </ng-container>
<ng-container bitDialogFooter> <ng-container bitDialogFooter>

41
apps/web/src/app/auth/settings/two-factor-verify.component.ts
View File

@ -10,6 +10,7 @@ import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request
import { AuthResponse } from "@bitwarden/common/auth/types/auth-response"; import { AuthResponse } from "@bitwarden/common/auth/types/auth-response";
import { TwoFactorResponse } from "@bitwarden/common/auth/types/two-factor-response"; import { TwoFactorResponse } from "@bitwarden/common/auth/types/two-factor-response";
import { Verification } from "@bitwarden/common/auth/types/verification"; import { Verification } from "@bitwarden/common/auth/types/verification";
import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { DialogService } from "@bitwarden/components"; import { DialogService } from "@bitwarden/components";
@ -32,6 +33,7 @@ export class TwoFactorVerifyComponent {
protected formGroup = new FormGroup({ protected formGroup = new FormGroup({
secret: new FormControl<Verification | null>(null), secret: new FormControl<Verification | null>(null),
}); });
invalidSecret: boolean = false;
constructor( constructor(
@Inject(DIALOG_DATA) protected data: TwoFactorVerifyDialogData, @Inject(DIALOG_DATA) protected data: TwoFactorVerifyDialogData,
@ -45,23 +47,30 @@ export class TwoFactorVerifyComponent {
} }
submit = async () => { submit = async () => {
let hashedSecret: string; try {
this.formPromise = this.userVerificationService let hashedSecret: string;
.buildRequest(this.formGroup.value.secret) this.formPromise = this.userVerificationService
.then((request) => { .buildRequest(this.formGroup.value.secret)
hashedSecret = .then((request) => {
this.formGroup.value.secret.type === VerificationType.MasterPassword hashedSecret =
? request.masterPasswordHash this.formGroup.value.secret.type === VerificationType.MasterPassword
: request.otp; ? request.masterPasswordHash
return this.apiCall(request); : request.otp;
}); return this.apiCall(request);
});
const response = await this.formPromise; const response = await this.formPromise;
this.dialogRef.close({ this.dialogRef.close({
response: response, response: response,
secret: hashedSecret, secret: hashedSecret,
verificationType: this.formGroup.value.secret.type, verificationType: this.formGroup.value.secret.type,
}); });
} catch (e) {
if (e instanceof ErrorResponse && e.statusCode === 400) {
this.invalidSecret = true;
}
throw e;
}
}; };
get dialogTitle(): string { get dialogTitle(): string {