From 50d3ef9ba5b2e8333ee1aea25a7614de077b25e0 Mon Sep 17 00:00:00 2001
From: Tony Air <tony@twma.pro>
Date: Fri, 26 Apr 2024 15:29:29 +0200
Subject: [PATCH] IMPR: Better captcha settings

---
 .env.dist                   | 4 ++--
 app/_config/api-captcha.yml | 6 +++---
 composer.json               | 1 -
 env-dist                    | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.env.dist b/.env.dist
index b0ec2f3..c5c9d6c 100755
--- a/.env.dist
+++ b/.env.dist
@@ -12,8 +12,8 @@ SS_ENVIRONMENT_TYPE='dev'
 NOCAPTCHA_SITE_KEY=''
 NOCAPTCHA_SECRET_KEY=''
 
-TURNSTILE_SITE_KEY=''
-TURNSTILE_SECRET_KEY=''
+SS_TURNSTILE_SITE_KEY=''
+SS_TURNSTILE_SECRET_KEY=''
 
 GOOGLEMAPS_API_KEY=''
 MAPBOX_API_KEY=''
diff --git a/app/_config/api-captcha.yml b/app/_config/api-captcha.yml
index 1750856..9cf4ce4 100644
--- a/app/_config/api-captcha.yml
+++ b/app/_config/api-captcha.yml
@@ -19,12 +19,12 @@ UndefinedOffset\NoCaptcha\Forms\NocaptchaField:
   proxy_auth: '' #Your proxy server authentication information (optional)
 
 SilverStripe\SpamProtection\Extension\FormSpamProtectionExtension:
-  default_spam_protector: WebbuildersGroup\Turnstile\Forms\TurnstileProtector  #Set the default spam protector
+  default_spam_protector: WebbuildersGroup\Turnstile\Forms\TurnstileProtector
   #default_spam_protector: UndefinedOffset\NoCaptcha\Forms\NocaptchaProtector
 
 WebbuildersGroup\Turnstile\Forms\TurnstileField:
-  site_key: '`TURNSTILE_SITE_KEY`' #Your site key (required)
-  secret_key: '`TURNSTILE_SECRET_KEY`' #Your secret key (required)
+  site_key: '`SS_TURNSTILE_SITE_KEY`' #Your site key (required)
+  secret_key: '`SS_TURNSTILE_SECRET_KEY`' #Your secret key (required)
   verify_ssl: true #Allows you to disable php-curl's SSL peer verification by setting this to false (optional, defaults to true)
   default_theme: "light" #Default theme color (optional, light, dark or auto, defaults to light)
   js_onload_callback: null #Onload callback to be called when the JS for Turnstile is loaded
diff --git a/composer.json b/composer.json
index 6e2e47c..73227e5 100755
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,6 @@
     "axllent/silverstripe-version-truncator": "*",
     "axllent/silverstripe-bootstrap-forms": "*",
     "silverstripe/redirectedurls": "*",
-    "undefinedoffset/silverstripe-nocaptcha": "*",
     "stevie-mayhew/silverstripe-svg": "*",
     "innoweb/silverstripe-sitemap": "*",
     "silverstripe/multiuser-editing-alert": "*",
diff --git a/env-dist b/env-dist
index b410570..c737768 100644
--- a/env-dist
+++ b/env-dist
@@ -11,8 +11,8 @@ SS_ENVIRONMENT_TYPE='dev'
 NOCAPTCHA_SITE_KEY=''
 NOCAPTCHA_SECRET_KEY=''
 
-TURNSTILE_SITE_KEY=''
-TURNSTILE_SECRET_KEY=''
+SS_TURNSTILE_SITE_KEY=''
+SS_TURNSTILE_SECRET_KEY=''
 
 GOOGLEMAPS_API_KEY=''
 MAPBOX_API_KEY=''