Skip to content

The Open Source DocuSign Alternative.

chore: use token input on enable 2fa

Ephraim Atta-Duncan918e9ddc0b1e
diff --git a/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx b/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx
index fa5d223d8..41a5ca573 100644
--- a/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx
+++ b/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx
@@ -130,6 +130,10 @@ export const EnableAuthenticatorAppDialog = ({
return enabled2fa;
} catch (_err) {
+ enableTwoFactorAuthenticationForm.setError('token', {
+ message: 'Unable to setup two-factor authentication',
+ });
+
toast({
title: 'Unable to setup two-factor authentication',
description:
@@ -251,40 +255,41 @@ export const EnableAuthenticatorAppDialog = ({
<PinInput
id="enable-2fa-pin-input"
state={state}
- onSubmit={({ code, input }) => {
- console.log(code);
-
+ onSubmit={async ({ code, input }) => {
if (code.length === 6) {
setState('loading');
-
- void onEnableTwoFactorAuthenticationFormSubmit({ token: code }).then(
- (success) => {
- if (success) {
- setState('success');
- return;
- }
-
- setState('error');
-
- setTimeout(() => {
- setState('input');
- input.value = '';
- input.dispatchEvent(new Event('input'));
- input.focus();
- }, 500);
- },
- );
+ enableTwoFactorAuthenticationForm.setValue('token', code);
+
+ await enableTwoFactorAuthenticationForm.handleSubmit(
+ onEnableTwoFactorAuthenticationFormSubmit,
+ )();
+
+ if (
+ enableTwoFactorAuthenticationForm.formState.isSubmitted &&
+ !enableTwoFactorAuthenticationForm.formState.errors.totpCode
+ ) {
+ setState('success');
+ return;
+ }
+
+ setState('error');
+
+ setTimeout(() => {
+ setState('input');
+ input.value = '';
+ input.dispatchEvent(new Event('input'));
+ input.focus();
+ }, 500);
}
}}
autoFocus
/>
</FormControl>
- <FormMessage />
</FormItem>
)}
/>
- {/* <DialogFooter>
+ <DialogFooter>
<Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>
Cancel
</Button>
@@ -292,7 +297,7 @@ export const EnableAuthenticatorAppDialog = ({
<Button type="submit" loading={isEnableTwoFactorAuthenticationSubmitting}>
Enable 2FA
</Button>
- </DialogFooter> */}
+ </DialogFooter>
</form>
</Form>
))