fix: judge isLoaded first

compsci-adl · Jan 17, 2024 · deb3adf · deb3adf
1 parent fe9194b
commit deb3adf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/src/app/(account)/forgot-password/page.tsx b/src/app/(account)/forgot-password/page.tsx
@@ -34,7 +34,7 @@ const STEP_INSTRUCTIONS = [
 
 export default function ForgotPasswordPage() {
     const [step, setStep] = useState(1);
-    const { signIn, setActive } = useSignIn();
+    const { isLoaded, signIn, setActive } = useSignIn();
 
     const sendCodeForm = useForm<z.infer<typeof sendCodeSchema>>({
         defaultValues: { email: '' },
@@ -46,8 +46,9 @@ export default function ForgotPasswordPage() {
     });
 
     const handleSendCode = sendCodeForm.handleSubmit(async ({ email }) => {
+        if (!isLoaded) return;
         try {
-            const result = await signIn?.create({
+            const result = await signIn.create({
                 strategy: 'reset_password_email_code',
                 identifier: email,
             });
@@ -72,17 +73,15 @@ export default function ForgotPasswordPage() {
     });
 
     const handleResetPassword = resetPasswordForm.handleSubmit(async ({ code, password }) => {
+        if (!isLoaded) return;
         try {
-            const resetResult = await signIn?.attemptFirstFactor({
+            const resetResult = await signIn.attemptFirstFactor({
                 strategy: 'reset_password_email_code',
                 code,
                 password,
             });
-
-            if (resetResult?.status === 'complete') {
-                if (setActive) {
-                    setActive({ session: resetResult.createdSessionId });
-                }
+            if (resetResult.status === 'complete') {
+                setActive({ session: resetResult.createdSessionId });
                 setStep(3);
             }
         } catch (error) {

diff --git a/src/app/(account)/sign-in/page.tsx b/src/app/(account)/sign-in/page.tsx
@@ -62,14 +62,13 @@ export default function SignInForm() {
     });
 
     const handleGoogleSignIn = async () => {
+        if (!isLoaded) return;
         try {
-            if (signIn) {
-                await signIn.authenticateWithRedirect({
-                    strategy: 'oauth_google',
-                    redirectUrl: '/sso-callback',
-                    redirectUrlComplete: '/',
-                });
-            }
+            await signIn.authenticateWithRedirect({
+                strategy: 'oauth_google',
+                redirectUrl: '/sso-callback',
+                redirectUrlComplete: '/',
+            });
         } catch (error) {
             // Handle any errors that might occur during the sign-in process
             console.error('Google Sign-In Error:', error);