|
1 | 1 | import { isUserLockedError } from '@clerk/shared/error'; |
2 | 2 | import { useClerk } from '@clerk/shared/react'; |
3 | 3 | import type { EmailCodeFactor, PhoneCodeFactor, ResetPasswordCodeFactor } from '@clerk/types'; |
4 | | -import React from 'react'; |
5 | 4 |
|
6 | 5 | import { clerkInvalidFAPIResponse } from '../../../core/errors'; |
7 | 6 | import { useCoreSignIn, useSignInContext } from '../../contexts'; |
8 | 7 | import type { VerificationCodeCardProps } from '../../elements'; |
9 | 8 | import { useCardState, VerificationCodeCard } from '../../elements'; |
| 9 | +import { useFetch } from '../../hooks'; |
10 | 10 | import { useSupportEmail } from '../../hooks/useSupportEmail'; |
11 | 11 | import type { LocalizationKey } from '../../localization'; |
12 | 12 | import { useRouter } from '../../router'; |
@@ -37,23 +37,40 @@ export const SignInFactorOneCodeForm = (props: SignInFactorOneCodeFormProps) => |
37 | 37 | const supportEmail = useSupportEmail(); |
38 | 38 | const clerk = useClerk(); |
39 | 39 |
|
| 40 | + const shouldAvoidPrepare = signIn.firstFactorVerification.status === 'verified' && props.factorAlreadyPrepared; |
| 41 | + |
40 | 42 | const goBack = () => { |
41 | 43 | return navigate('../'); |
42 | 44 | }; |
43 | 45 |
|
44 | | - React.useEffect(() => { |
45 | | - if (!props.factorAlreadyPrepared) { |
46 | | - prepare(); |
| 46 | + const prepare = () => { |
| 47 | + if (shouldAvoidPrepare) { |
| 48 | + return; |
47 | 49 | } |
48 | | - }, []); |
49 | 50 |
|
50 | | - const prepare = () => { |
51 | 51 | void signIn |
52 | 52 | .prepareFirstFactor(props.factor) |
53 | 53 | .then(() => props.onFactorPrepare()) |
54 | 54 | .catch(err => handleError(err, [], card.setError)); |
55 | 55 | }; |
56 | 56 |
|
| 57 | + useFetch( |
| 58 | + shouldAvoidPrepare |
| 59 | + ? undefined |
| 60 | + : () => |
| 61 | + signIn |
| 62 | + ?.prepareFirstFactor(props.factor) |
| 63 | + .then(() => props.onFactorPrepare()) |
| 64 | + .catch(err => handleError(err, [], card.setError)), |
| 65 | + { |
| 66 | + name: 'signIn.prepareFirstFactor', |
| 67 | + factor: props.factor, |
| 68 | + }, |
| 69 | + { |
| 70 | + staleTime: 100, |
| 71 | + }, |
| 72 | + ); |
| 73 | + |
57 | 74 | const action: VerificationCodeCardProps['onCodeEntryFinishedAction'] = (code, resolve, reject) => { |
58 | 75 | signIn |
59 | 76 | .attemptFirstFactor({ strategy: props.factor.strategy, code }) |
|
0 commit comments