fix recaptcha loading

enjin · Apr 19, 2024 · 16acc0f · 16acc0f
1 parent 92e4068
commit 16acc0f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/resources/js/components/pages/auth/Login.vue b/resources/js/components/pages/auth/Login.vue
@@ -56,7 +56,9 @@
                                 Forgot your password?
                             </RouterLink>
                         </div>
-                        <Btn is-submit primary :loading="isLoading" class="w-full"> Sign in </Btn>
+                        <Btn is-submit primary :disabled="!isCaptchaBadgeVisible" :loading="isLoading" class="w-full">
+                            Sign in
+                        </Btn>
                     </div>
                 </Form>
             </div>
@@ -112,6 +114,8 @@ const onCaptchaExpired = () => {
 
 const loadCaptchaScript = async () => {
     if (!hasCaptcha) {
+        isCaptchaBadgeVisible.value = true;
+
         return;
     }
     if (!document.getElementById('recaptcha-script')) {
@@ -214,6 +218,8 @@ const resendVerification = async () => {
     checkVerified();
     if (appStore.loggedIn) {
         redirectToCollections();
+    } else {
+        loadCaptchaScript();
     }
 })();
 

diff --git a/resources/js/components/pages/auth/Register.vue b/resources/js/components/pages/auth/Register.vue
@@ -50,7 +50,9 @@
                                 </RouterLink>
                             </div>
                         </div>
-                        <Btn is-submit primary :loading="isLoading" class="w-full"> Register </Btn>
+                        <Btn is-submit primary :disabled="!isCaptchaBadgeVisible" :loading="isLoading" class="w-full">
+                            Register
+                        </Btn>
                     </div>
                 </Form>
             </div>
@@ -114,7 +116,11 @@ const onCaptchaExpired = () => {
 };
 
 const loadCaptchaScript = async () => {
-    if (!hasCaptcha) return;
+    if (!hasCaptcha) {
+        isCaptchaBadgeVisible.value = true;
+
+        return;
+    }
 
     if (!document.getElementById('recaptcha-script')) {
         const script = document.createElement('script');
@@ -165,6 +171,8 @@ const register = async (recaptcha?: string) => {
 (async () => {
     if (appStore.loggedIn) {
         redirectToLogin();
+    } else {
+        loadCaptchaScript();
     }
 })();
 </script>
diff --git a/resources/js/components/pages/auth/RequestResetPassword.vue b/resources/js/components/pages/auth/RequestResetPassword.vue
@@ -42,7 +42,9 @@
                                 </RouterLink>
                             </div>
                         </div>
-                        <Btn is-submit primary :loading="isLoading" class="w-full"> Reset Password </Btn>
+                        <Btn is-submit primary :disabled="!isCaptchaBadgeVisible" :loading="isLoading" class="w-full">
+                            Reset Password
+                        </Btn>
                     </div>
                 </Form>
             </div>
@@ -94,6 +96,8 @@ const onCaptchaExpired = () => {
 
 const loadCaptchaScript = async () => {
     if (!hasCaptcha) {
+        isCaptchaBadgeVisible.value = true;
+
         return;
     }
     if (!document.getElementById('recaptcha-script')) {
@@ -136,6 +140,8 @@ const requestReset = async (recaptcha?: string) => {
 (async () => {
     if (appStore.loggedIn) {
         redirectToCollections();
+    } else {
+        loadCaptchaScript();
     }
 })();
 </script>