Skip to content

PER-9982 hitting enter submit 2fa code #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crisnicandrei merged 5 commits into from
Feb 17, 2025
Merged

PER-9982 hitting enter submit 2fa code #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
91bbfa4
PER-9982 hitting enter submit 2fa code
crisnicandrei Feb 11, 2025
47ff982
remove unused code
crisnicandrei Feb 11, 2025
a576c87
Use 2 forms instead of a method
crisnicandrei Feb 11, 2025
052413f
prettier
crisnicandrei Feb 11, 2025
eef846d
remove not needed tests
crisnicandrei Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/app/core/components/two-factor-auth/two-factor-auth.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@
<option [disabled]="hasMethod('email')" value="email">Email</option>
<option [disabled]="hasMethod('sms')" value="sms">SMS</option>
</select>
<form *ngIf="method" [formGroup]="form" (submit)="submitData(form.value)">
<form
class="send-code-form"
*ngIf="method"
[formGroup]="form"
(submit)="sendCode(form.value)"
>
<p *ngIf="!selectedMethodToDelete">
2. Enter your contact information for the preferred method below and click
the button to send a one-time use code.
Expand Down Expand Up @@ -85,15 +90,17 @@
</div>
<div class="send-code-button button-container">
<button
type="submit"
role="button"
[disabled]="!form.value.contactInfo || form.get('contactInfo').errors"
(click)="sendCode($event)"
class="btn btn-primary"
>
Send Code
</button>
</div>
<div class="code-container" *ngIf="codeSent">
</form>
<div class="code-container" *ngIf="codeSent">
<form (submit)="submitData(form.value)">
<p>3. Enter the four digit code below</p>
<div class="input-group-vertical">
<pr-form-input
Expand All @@ -105,14 +112,16 @@
</div>
<div class="button-container button-group">
<button
type="submit"
[disabled]="!form.value.code"
class="btn btn-primary"
type="submit"
>
{{ selectedMethodToDelete ? 'Delete' : 'Enable' }}
</button>
<button class="btn btn-secondary" (click)="cancel()">Cancel</button>
<button type="button" class="btn btn-secondary" (click)="cancel()">
Cancel
</button>
</div>
</div>
</form>
</form>
</div>
</div>
4 changes: 2 additions & 2 deletions src/app/core/components/two-factor-auth/two-factor-auth.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ export class TwoFactorAuthComponent implements OnInit {
this.formatPhoneNumber(value);
}
});

this.form.get('code').valueChanges.subscribe(() => {});
}

async ngOnInit() {
Expand Down Expand Up @@ -108,8 +110,6 @@ export class TwoFactorAuthComponent implements OnInit {
}

async sendCode(e) {
e.preventDefault();

try {
if (this.selectedMethodToDelete) {
await this.api.idpuser.sendDisableCode(
Expand Down