fix: captcha issues

Author: prplwtf

apps/frontend/src/components/ui/app/user/Profile.vue

@@ -137,6 +137,7 @@ const updateProfile = async () => {
   if (accountForm.value.email != user.value?.email) {
     const result = await turnstileModal.show()
     if (!result.confirmed) {
+      turnstileRef.value?.turnstile.reset()
       loading.value = false
       return
     }
@@ -154,8 +155,9 @@ const updateProfile = async () => {
       console.error(error)
       //@ts-expect-error
       errors.value.account = error
-      turnstileRef.value?.turnstile.reset()
     }
+
+    turnstileRef.value?.turnstile.reset()
   }
 
   try {

apps/frontend/src/pages/auth/forgot.vue

@@ -81,7 +81,6 @@ const success = ref(false)
 const fieldValidation = ref<Record<string, boolean>>({})
 const form = ref({
   email: '',
-  captcha: '',
 })
 
 const handleFieldValidation = (field: string, isValid: boolean) => {
@@ -95,22 +94,27 @@ const handleForgot = async () => {
 
   const result = await turnstileModal.show()
   if (!result.confirmed) {
+    turnstileRef.value?.turnstile.reset()
     loading.value = false
     return
   }
 
   try {
     await $fetch('/api/auth/password/forgot', {
       method: 'POST',
-      body: form.value,
+      body: {
+        email: form.value.email,
+        captcha: turnstileModal.captchaValue.value,
+      },
     })
     error.value = false
     success.value = true
   } catch {
     error.value = true
     success.value = false
-    turnstileRef.value?.turnstile.reset()
   }
+
+  turnstileRef.value?.turnstile.reset()
   loading.value = false
 }
 </script>

apps/frontend/src/pages/auth/index.vue

@@ -176,6 +176,7 @@ const handleLogin = async () => {
 
   const result = await turnstileModal.show()
   if (!result.confirmed) {
+    turnstileRef.value?.turnstile.reset()
     loading.value = false
     return
   }
@@ -190,9 +191,10 @@ const handleLogin = async () => {
   } catch (error) {
     console.error(error)
     errors.value = error
-    turnstileRef.value?.turnstile.reset()
   } finally {
     loading.value = false
   }
+
+  turnstileRef.value?.turnstile.reset()
 }
 </script>

apps/frontend/src/pages/auth/register.vue

@@ -142,6 +142,7 @@ const handleRegister = async () => {
 
   const result = await turnstileModal.show()
   if (!result.confirmed) {
+    turnstileRef.value?.turnstile.reset()
     loading.value = false
     return
   }
@@ -156,9 +157,10 @@ const handleRegister = async () => {
   } catch (error) {
     console.error(error)
     errors.value = error
-    turnstileRef.value?.turnstile.reset()
   } finally {
     loading.value = false
   }
+
+  turnstileRef.value?.turnstile.reset()
 }
 </script>

apps/frontend/src/pages/auth/verify.vue

@@ -128,6 +128,7 @@ const handleResend = async () => {
 
   const result = await turnstileModal.show()
   if (!result.confirmed) {
+    turnstileRef.value?.turnstile.reset()
     loading.value = false
     return
   }
@@ -144,9 +145,10 @@ const handleResend = async () => {
     console.error(error)
     errors.value.resendError = true
     loading.value = false
-    turnstileRef.value?.turnstile.reset()
   } finally {
     loading.value = false
   }
+
+  turnstileRef.value?.turnstile.reset()
 }
 </script>