Skip to content

fix(clerk-js): Avoid triggering email code verification twice on React strict mode #5095

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
merged 3 commits into from
Feb 7, 2025
Merged

fix(clerk-js): Avoid triggering email code verification twice on React strict mode #5095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
732df87
Apply caching for executing prepare on mount
LauraBeatris Feb 6, 2025
4c9858e
Update cache key to serialize factor object
LauraBeatris Feb 7, 2025
c35b8ee
Rollback `console.log`
LauraBeatris Feb 7, 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
5 changes: 5 additions & 0 deletions .changeset/witty-cougars-tickle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Avoid triggering email code verification twice on React strict mode
29 changes: 23 additions & 6 deletions packages/clerk-js/src/ui/components/SignIn/SignInFactorOneCodeForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { isUserLockedError } from '@clerk/shared/error';
import { useClerk } from '@clerk/shared/react';
import type { EmailCodeFactor, PhoneCodeFactor, ResetPasswordCodeFactor } from '@clerk/types';
import React from 'react';

import { clerkInvalidFAPIResponse } from '../../../core/errors';
import { useCoreSignIn, useSignInContext } from '../../contexts';
import type { VerificationCodeCardProps } from '../../elements';
import { useCardState, VerificationCodeCard } from '../../elements';
import { useFetch } from '../../hooks';
import { useSupportEmail } from '../../hooks/useSupportEmail';
import type { LocalizationKey } from '../../localization';
import { useRouter } from '../../router';
Expand Down Expand Up @@ -37,23 +37,40 @@ export const SignInFactorOneCodeForm = (props: SignInFactorOneCodeFormProps) =>
const supportEmail = useSupportEmail();
const clerk = useClerk();

const shouldAvoidPrepare = signIn.firstFactorVerification.status === 'verified' && props.factorAlreadyPrepared;

const goBack = () => {
return navigate('../');
};

React.useEffect(() => {
if (!props.factorAlreadyPrepared) {
prepare();
const prepare = () => {
if (shouldAvoidPrepare) {
return;
}
}, []);

const prepare = () => {
void signIn
.prepareFirstFactor(props.factor)
.then(() => props.onFactorPrepare())
.catch(err => handleError(err, [], card.setError));
};

useFetch(
shouldAvoidPrepare
? undefined
: () =>
signIn
?.prepareFirstFactor(props.factor)
.then(() => props.onFactorPrepare())
.catch(err => handleError(err, [], card.setError)),
{
name: 'signIn.prepareFirstFactor',
factor: props.factor,
},
{
staleTime: 100,
},
);

const action: VerificationCodeCardProps['onCodeEntryFinishedAction'] = (code, resolve, reject) => {
signIn
.attemptFirstFactor({ strategy: props.factor.strategy, code })
Expand Down