From ac326d2d74599fd819005870eab19a19a3ee1334 Mon Sep 17 00:00:00 2001
From: James Collins <james.collins@outlook.com.au>
Date: Wed, 26 Apr 2023 20:25:38 +1000
Subject: [PATCH] disable recaptcha

---
 app/Http/Requests/ContactSendRequest.php        |  2 +-
 app/Http/Requests/SubscriptionRequest.php       |  4 ++--
 app/Http/Requests/UserForgotPasswordRequest.php |  2 +-
 app/Http/Requests/UserForgotUsernameRequest.php |  2 +-
 .../Requests/UserResendVerifyEmailRequest.php   |  2 +-
 app/Http/Requests/UserResetPasswordRequest.php  |  2 +-
 app/Http/Requests/UserVerifyEmailRequest.php    |  2 +-
 package-lock.json                               | 17 -----------------
 package.json                                    |  1 -
 resources/js/main.js                            | 14 +++++++-------
 resources/js/views/EmailVerify.vue              | 10 +++++-----
 resources/js/views/ForgotPassword.vue           | 10 +++++-----
 resources/js/views/ForgotUsername.vue           | 10 +++++-----
 resources/js/views/Register.vue                 | 10 +++++-----
 resources/js/views/ResendEmailVerify.vue        | 10 +++++-----
 resources/js/views/ResetPassword.vue            | 10 +++++-----
 16 files changed, 45 insertions(+), 63 deletions(-)

diff --git a/app/Http/Requests/ContactSendRequest.php b/app/Http/Requests/ContactSendRequest.php
index 31e50a7..5e24452 100644
--- a/app/Http/Requests/ContactSendRequest.php
+++ b/app/Http/Requests/ContactSendRequest.php
@@ -18,7 +18,7 @@ class ContactSendRequest extends FormRequest
             'name' => 'required|max:255',
             'email' => 'required|email|max:255',
             'content' => 'required|max:2000',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }
diff --git a/app/Http/Requests/SubscriptionRequest.php b/app/Http/Requests/SubscriptionRequest.php
index fbfafff..8a02433 100644
--- a/app/Http/Requests/SubscriptionRequest.php
+++ b/app/Http/Requests/SubscriptionRequest.php
@@ -15,7 +15,7 @@ class SubscriptionRequest extends BaseRequest
     {
         return [
             'email' => 'required|email|unique:subscriptions',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 
@@ -28,7 +28,7 @@ class SubscriptionRequest extends BaseRequest
     {
         return [
             'email' => 'required|email',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 
diff --git a/app/Http/Requests/UserForgotPasswordRequest.php b/app/Http/Requests/UserForgotPasswordRequest.php
index 93e86b7..42ebbca 100644
--- a/app/Http/Requests/UserForgotPasswordRequest.php
+++ b/app/Http/Requests/UserForgotPasswordRequest.php
@@ -16,7 +16,7 @@ class UserForgotPasswordRequest extends FormRequest
     {
         return [
             'username' => 'required|exists:users,username',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }
diff --git a/app/Http/Requests/UserForgotUsernameRequest.php b/app/Http/Requests/UserForgotUsernameRequest.php
index a125ae2..6ffa2b9 100644
--- a/app/Http/Requests/UserForgotUsernameRequest.php
+++ b/app/Http/Requests/UserForgotUsernameRequest.php
@@ -16,7 +16,7 @@ class UserForgotUsernameRequest extends FormRequest
     {
         return [
             'email' => 'required|email|max:255',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }
diff --git a/app/Http/Requests/UserResendVerifyEmailRequest.php b/app/Http/Requests/UserResendVerifyEmailRequest.php
index 825c159..1bf2579 100644
--- a/app/Http/Requests/UserResendVerifyEmailRequest.php
+++ b/app/Http/Requests/UserResendVerifyEmailRequest.php
@@ -16,7 +16,7 @@ class UserResendVerifyEmailRequest extends FormRequest
     {
         return [
             'username' => 'required|exists:users,username',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }
diff --git a/app/Http/Requests/UserResetPasswordRequest.php b/app/Http/Requests/UserResetPasswordRequest.php
index 35cfdbf..99ed434 100644
--- a/app/Http/Requests/UserResetPasswordRequest.php
+++ b/app/Http/Requests/UserResetPasswordRequest.php
@@ -17,7 +17,7 @@ class UserResetPasswordRequest extends FormRequest
         return [
             'code' => 'required|digits:6',
             'password' => 'required|string|min:8',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }
diff --git a/app/Http/Requests/UserVerifyEmailRequest.php b/app/Http/Requests/UserVerifyEmailRequest.php
index d2a6bc9..e2473e7 100644
--- a/app/Http/Requests/UserVerifyEmailRequest.php
+++ b/app/Http/Requests/UserVerifyEmailRequest.php
@@ -16,7 +16,7 @@ class UserVerifyEmailRequest extends FormRequest
     {
         return [
             'code' => 'required|digits:6',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }
diff --git a/package-lock.json b/package-lock.json
index 0c4c38c..40f3da0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,6 @@
                 "vue-dompurify-html": "^3.1.2",
                 "vue-final-modal": "^3.4.11",
                 "vue-loader": "^17.0.1",
-                "vue-recaptcha-v3": "^2.0.1",
                 "vue-router": "^4.1.6",
                 "vue3-easy-data-table": "^1.5.24"
             },
@@ -3427,11 +3426,6 @@
                 "node": ">=8.10.0"
             }
         },
-        "node_modules/recaptcha-v3": {
-            "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/recaptcha-v3/-/recaptcha-v3-1.10.0.tgz",
-            "integrity": "sha512-aGTxYSk3FFNKnXeKDbLpgRDRyIHRZNBF5HyaXXAN1Aj4TSyyZvmoAn9CylvpqLV3pYpIQavwc+2rzhNFn5SsLQ=="
-        },
         "node_modules/resolve-from": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -4453,17 +4447,6 @@
                 }
             }
         },
-        "node_modules/vue-recaptcha-v3": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/vue-recaptcha-v3/-/vue-recaptcha-v3-2.0.1.tgz",
-            "integrity": "sha512-isEDtOfHU4wWRrZZuxciAELtQmPOeEEdicPNa0f1AOyLPy3sCcBEcpFt+FOcO3RQv5unJ3Yn5NlsWtXv9rXqjg==",
-            "dependencies": {
-                "recaptcha-v3": "^1.8.0"
-            },
-            "peerDependencies": {
-                "vue": "^3.0.11"
-            }
-        },
         "node_modules/vue-router": {
             "version": "4.1.6",
             "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.6.tgz",
diff --git a/package.json b/package.json
index 2346330..e957ff9 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,6 @@
         "vue-dompurify-html": "^3.1.2",
         "vue-final-modal": "^3.4.11",
         "vue-loader": "^17.0.1",
-        "vue-recaptcha-v3": "^2.0.1",
         "vue-router": "^4.1.6",
         "vue3-easy-data-table": "^1.5.24"
     }
diff --git a/resources/js/main.js b/resources/js/main.js
index f3b2872..845050f 100644
--- a/resources/js/main.js
+++ b/resources/js/main.js
@@ -3,7 +3,7 @@ import "normalize.css";
 import { createPinia } from "pinia";
 import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
 import { createApp } from "vue";
-import { VueReCaptcha } from "vue-recaptcha-v3";
+// import { VueReCaptcha } from "vue-recaptcha-v3";
 import "../css/app.scss";
 import "./bootstrap";
 import SMColumn from "./components/SMColumn.vue";
@@ -19,12 +19,12 @@ pinia.use(piniaPluginPersistedstate);
 createApp(App)
     .use(pinia)
     .use(Router)
-    .use(VueReCaptcha, {
-        siteKey: import.meta.env.GOOGLE_RECAPTCHA_SITE_KEY,
-        loaderOptions: {
-            autoHideBadge: true,
-        },
-    })
+    // .use(VueReCaptcha, {
+    //     siteKey: import.meta.env.GOOGLE_RECAPTCHA_SITE_KEY,
+    //     loaderOptions: {
+    //         autoHideBadge: true,
+    //     },
+    // })
     .component("SMContainer", SMContainer)
     .component("SMRow", SMRow)
     .component("SMColumn", SMColumn)
diff --git a/resources/js/views/EmailVerify.vue b/resources/js/views/EmailVerify.vue
index 8642272..1f52fa8 100644
--- a/resources/js/views/EmailVerify.vue
+++ b/resources/js/views/EmailVerify.vue
@@ -41,7 +41,7 @@
 
 <script setup lang="ts">
 import { reactive, ref } from "vue";
-import { useReCaptcha } from "vue-recaptcha-v3";
+// import { useReCaptcha } from "vue-recaptcha-v3";
 import { useRoute } from "vue-router";
 import SMButton from "../components/SMButton.vue";
 import SMFormCard from "../components/SMFormCard.vue";
@@ -52,7 +52,7 @@ import { api } from "../helpers/api";
 import { Form, FormControl } from "../helpers/form";
 import { And, Max, Min, Required } from "../helpers/validate";
 
-const { executeRecaptcha, recaptchaLoaded } = useReCaptcha();
+// const { executeRecaptcha, recaptchaLoaded } = useReCaptcha();
 const formDone = ref(false);
 let form = reactive(
     Form({
@@ -64,14 +64,14 @@ const handleSubmit = async () => {
     form.loading(true);
 
     try {
-        await recaptchaLoaded();
-        const captcha = await executeRecaptcha("submit");
+        // await recaptchaLoaded();
+        // const captcha = await executeRecaptcha("submit");
 
         await api.post({
             url: "/users/verifyEmail",
             body: {
                 code: form.controls.code.value,
-                captcha_token: captcha,
+                // captcha_token: captcha,
             },
         });
 
diff --git a/resources/js/views/ForgotPassword.vue b/resources/js/views/ForgotPassword.vue
index 293c548..5cb2dc7 100644
--- a/resources/js/views/ForgotPassword.vue
+++ b/resources/js/views/ForgotPassword.vue
@@ -48,7 +48,7 @@
 
 <script setup lang="ts">
 import { reactive, ref } from "vue";
-import { useReCaptcha } from "vue-recaptcha-v3";
+// import { useReCaptcha } from "vue-recaptcha-v3";
 import SMButton from "../components/SMButton.vue";
 import SMFormCard from "../components/SMFormCard.vue";
 import SMForm from "../components/SMForm.vue";
@@ -58,7 +58,7 @@ import { api } from "../helpers/api";
 import { Form, FormControl } from "../helpers/form";
 import { And, Min, Required } from "../helpers/validate";
 
-const { executeRecaptcha, recaptchaLoaded } = useReCaptcha();
+// const { executeRecaptcha, recaptchaLoaded } = useReCaptcha();
 const formDone = ref(false);
 let form = reactive(
     Form({
@@ -70,14 +70,14 @@ const handleSubmit = async () => {
     form.loading(true);
 
     try {
-        await recaptchaLoaded();
-        const captcha = await executeRecaptcha("submit");
+        // await recaptchaLoaded();
+        // const captcha = await executeRecaptcha("submit");
 
         await api.post({
             url: "/users/forgotPassword",
             body: {
                 username: form.controls.username.value,
-                captcha_token: captcha,
+                // captcha_token: captcha,
             },
         });
 
diff --git a/resources/js/views/ForgotUsername.vue b/resources/js/views/ForgotUsername.vue
index 781324c..73a8d25 100644
--- a/resources/js/views/ForgotUsername.vue
+++ b/resources/js/views/ForgotUsername.vue
@@ -47,7 +47,7 @@
 
 <script setup lang="ts">
 import { reactive, ref } from "vue";
-import { useReCaptcha } from "vue-recaptcha-v3";
+// import { useReCaptcha } from "vue-recaptcha-v3";
 import SMButton from "../components/SMButton.vue";
 import SMFormCard from "../components/SMFormCard.vue";
 import SMForm from "../components/SMForm.vue";
@@ -57,7 +57,7 @@ import { api } from "../helpers/api";
 import { Form, FormControl } from "../helpers/form";
 import { And, Email, Required } from "../helpers/validate";
 
-const { executeRecaptcha, recaptchaLoaded } = useReCaptcha();
+// const { executeRecaptcha, recaptchaLoaded } = useReCaptcha();
 const formDone = ref(false);
 let form = reactive(
     Form({
@@ -69,14 +69,14 @@ const handleSubmit = async () => {
     form.loading(true);
 
     try {
-        await recaptchaLoaded();
-        const captcha = await executeRecaptcha("submit");
+        // await recaptchaLoaded();
+        // const captcha = await executeRecaptcha("submit");
 
         await api.post({
             url: "/users/forgotUsername",
             body: {
                 email: form.controls.email.value,
-                captcha_token: captcha,
+                // captcha_token: captcha,
             },
         });
 
diff --git a/resources/js/views/Register.vue b/resources/js/views/Register.vue
index 08c770c..dd2e748 100644
--- a/resources/js/views/Register.vue
+++ b/resources/js/views/Register.vue
@@ -67,7 +67,7 @@
 
 <script setup lang="ts">
 import { reactive, ref } from "vue";
-import { useReCaptcha } from "vue-recaptcha-v3";
+// import { useReCaptcha } from "vue-recaptcha-v3";
 import SMButton from "../components/SMButton.vue";
 import SMFormCard from "../components/SMFormCard.vue";
 import SMForm from "../components/SMForm.vue";
@@ -84,7 +84,7 @@ import {
     Required,
 } from "../helpers/validate";
 
-const { executeRecaptcha, recaptchaLoaded } = useReCaptcha();
+// const { executeRecaptcha, recaptchaLoaded } = useReCaptcha();
 let abortController: AbortController | null = null;
 
 const checkUsername = async (value: string): Promise<boolean | string> => {
@@ -133,8 +133,8 @@ const handleSubmit = async () => {
     form.loading(true);
 
     try {
-        await recaptchaLoaded();
-        const captcha = await executeRecaptcha("submit");
+        // await recaptchaLoaded();
+        // const captcha = await executeRecaptcha("submit");
 
         await api.post({
             url: "/register",
@@ -146,7 +146,7 @@ const handleSubmit = async () => {
                 username: form.controls.username.value,
                 password: form.controls.password.value,
                 display_name: form.controls.username.value,
-                captcha_token: captcha,
+                // captcha_token: captcha,
             },
         });
 
diff --git a/resources/js/views/ResendEmailVerify.vue b/resources/js/views/ResendEmailVerify.vue
index 9dccd6d..b91d76c 100644
--- a/resources/js/views/ResendEmailVerify.vue
+++ b/resources/js/views/ResendEmailVerify.vue
@@ -44,7 +44,7 @@
 
 <script setup lang="ts">
 import { reactive, ref } from "vue";
-import { useReCaptcha } from "vue-recaptcha-v3";
+// import { useReCaptcha } from "vue-recaptcha-v3";
 import SMButton from "../components/SMButton.vue";
 import SMFormCard from "../components/SMFormCard.vue";
 import SMForm from "../components/SMForm.vue";
@@ -54,7 +54,7 @@ import { api } from "../helpers/api";
 import { Form, FormControl } from "../helpers/form";
 import { Required } from "../helpers/validate";
 
-const { executeRecaptcha, recaptchaLoaded } = useReCaptcha();
+// const { executeRecaptcha, recaptchaLoaded } = useReCaptcha();
 const formDone = ref(false);
 let form = reactive(
     Form({
@@ -66,14 +66,14 @@ const handleSubmit = async () => {
     form.loading(true);
 
     try {
-        await recaptchaLoaded();
-        const captcha = await executeRecaptcha("submit");
+        // await recaptchaLoaded();
+        // const captcha = await executeRecaptcha("submit");
 
         await api.post({
             url: "/users/resendVerifyEmailCode",
             body: {
                 username: form.controls.username.value,
-                captcha_token: captcha,
+                // captcha_token: captcha,
             },
         });
 
diff --git a/resources/js/views/ResetPassword.vue b/resources/js/views/ResetPassword.vue
index 32b3d8b..61b9064 100644
--- a/resources/js/views/ResetPassword.vue
+++ b/resources/js/views/ResetPassword.vue
@@ -43,7 +43,7 @@
 
 <script setup lang="ts">
 import { reactive, ref } from "vue";
-import { useReCaptcha } from "vue-recaptcha-v3";
+// import { useReCaptcha } from "vue-recaptcha-v3";
 import { useRoute } from "vue-router";
 import SMButton from "../components/SMButton.vue";
 import SMFormCard from "../components/SMFormCard.vue";
@@ -54,7 +54,7 @@ import { api } from "../helpers/api";
 import { Form, FormControl } from "../helpers/form";
 import { And, Max, Min, Password, Required } from "../helpers/validate";
 
-const { executeRecaptcha, recaptchaLoaded } = useReCaptcha();
+// const { executeRecaptcha, recaptchaLoaded } = useReCaptcha();
 const formDone = ref(false);
 let form = reactive(
     Form({
@@ -76,15 +76,15 @@ const handleSubmit = async () => {
     form.loading(true);
 
     try {
-        await recaptchaLoaded();
-        const captcha = await executeRecaptcha("submit");
+        // await recaptchaLoaded();
+        // const captcha = await executeRecaptcha("submit");
 
         await api.post({
             url: "/users/resetPassword",
             body: {
                 code: form.controls.code.value,
                 password: form.controls.password.value,
-                captcha_token: captcha,
+                // captcha_token: captcha,
             },
         });