Skip to content

Don't submit add device form through the browser if validation fails #37743

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
bl-nero merged 1 commit into from
Feb 6, 2024
Merged

Don't submit add device form through the browser if validation fails #37743

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions web/packages/teleport/src/Account/ManageDevices/AddDevice/AddDevice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import Dialog, {
} from 'design/Dialog';
import { Danger } from 'design/Alert';
import FieldInput from 'shared/components/FieldInput';
import Validation from 'shared/components/Validation';
import Validation, { Validator } from 'shared/components/Validation';
import {
requiredToken,
requiredField,
Expand Down Expand Up @@ -100,9 +100,16 @@ export function AddDevice({
setMfaOption(option);
}

function onSubmit(e: React.MouseEvent<HTMLButtonElement>) {
function onSubmit(
validator: Validator,
e: React.MouseEvent<HTMLButtonElement>
) {
// Call preventDefault() before validate() to make sure the form doesn't get
// submitted by the browser if validation fails.
e.preventDefault();

if (!validator.validate()) return;

if (mfaOption.value === 'webauthn') {
addWebauthnDevice(deviceName, resolvedDeviceUsage);
}
Expand Down Expand Up @@ -264,7 +271,7 @@ export function AddDevice({
size="large"
width="45%"
type="submit"
onClick={e => validator.validate() && onSubmit(e)}
onClick={e => onSubmit(validator, e)}
disabled={addDeviceAttempt.status === 'processing'}
mr={3}
>
Expand Down