diff --git a/src/FormsServiceProvider.php b/src/FormsServiceProvider.php
index de20dc8..92e5574 100644
--- a/src/FormsServiceProvider.php
+++ b/src/FormsServiceProvider.php
@@ -6,6 +6,7 @@
use Fuelviews\Forms\Contracts\FormsHandlerService;
use Fuelviews\Forms\Http\Controllers\FormsSubmitController;
use Fuelviews\Forms\Livewire\FormsModal;
+use Fuelviews\Forms\Middleware\HandleFbclid;
use Fuelviews\Forms\Middleware\HandleGclid;
use Fuelviews\Forms\Middleware\HandleUtm;
use Fuelviews\Forms\Services\FormsSubmitService;
@@ -44,11 +45,15 @@ public function packageBooted(): void
Livewire::component('forms-modal', FormsModal::class);
}
+ // Merge Turnstile configuration to services.turnstile for compatibility with ryangjchandler/laravel-cloudflare-turnstile
+ $this->mergeTurnstileConfig();
+
$this->app->extend(Application::class, function (Application $app) {
if (method_exists($app, 'configureMiddleware')) {
$app->configureMiddleware(function (Middleware $middleware) {
$middleware->appendToGroup('web', [
HandleGclid::class,
+ HandleFbclid::class,
HandleUtm::class,
]);
});
@@ -58,6 +63,7 @@ public function packageBooted(): void
foreach ([
HandleGclid::class,
+ HandleFbclid::class,
HandleUtm::class,
] as $middleware) {
$kernel->appendMiddlewareToGroup('web', $middleware);
@@ -87,4 +93,21 @@ private function providerIsLoaded($app, $providerClass): bool
{
return collect($app->getLoadedProviders())->has($providerClass);
}
+
+ private function mergeTurnstileConfig(): void
+ {
+ // Merge Turnstile configuration from forms.turnstile to services.turnstile
+ // This ensures compatibility with the ryangjchandler/laravel-cloudflare-turnstile package
+
+ // Use the TURNSTILE_SITE_KEY and TURNSTILE_SECRET_KEY env vars directly
+ // with fallback to the test keys if not set
+ $siteKey = env('TURNSTILE_SITE_KEY', '1x00000000000000000000AA');
+ $secretKey = env('TURNSTILE_SECRET_KEY', '1x0000000000000000000000000000000AA');
+
+ // Set the services.turnstile config that the Turnstile package expects
+ config([
+ 'services.turnstile.key' => $siteKey,
+ 'services.turnstile.secret' => $secretKey,
+ ]);
+ }
}
diff --git a/src/Http/Controllers/FormsSubmitController.php b/src/Http/Controllers/FormsSubmitController.php
index 318b1f7..ca0e332 100644
--- a/src/Http/Controllers/FormsSubmitController.php
+++ b/src/Http/Controllers/FormsSubmitController.php
@@ -33,6 +33,16 @@ public function __construct(
public function handleSubmit(Request $request)
{
+ // Validate Turnstile if it's enabled
+ if (config('forms.turnstile.enabled') && config('forms.turnstile.site_key')) {
+ $request->validate([
+ 'cf-turnstile-response' => ['required', 'turnstile'],
+ ], [
+ 'cf-turnstile-response.required' => 'Please complete the security challenge.',
+ 'cf-turnstile-response.turnstile' => 'Security challenge validation failed. Please try again.',
+ ]);
+ }
+
$formKey = request()->input('form_key', 'default');
$rules = FormsValidationRuleService::getRulesForDefault($formKey);
$result = $this->formProcessingService->processForm($request, $request->validate($rules));
diff --git a/src/Livewire/FormsModal.php b/src/Livewire/FormsModal.php
index 467ef43..29dba93 100644
--- a/src/Livewire/FormsModal.php
+++ b/src/Livewire/FormsModal.php
@@ -36,6 +36,7 @@
public $submitClicked;
public $gclid;
+ public $fbclid;
public $utmCampaign;
@@ -61,6 +62,8 @@
public $location;
+ public $turnstileToken = '';
+
public function boot(FormsHandlerService $formHandler, FormsProcessingService $formProcessingService, FormsValidationRuleService $validationRuleService)
{
$this->formHandler = $formHandler;
@@ -72,6 +75,7 @@ public function mount()
{
$this->loadInitialData([
'gclid',
+ 'fbclid',
'utmSource' => 'utm_source',
'utmMedium' => 'utm_medium',
'utmCampaign' => 'utm_campaign',
@@ -92,11 +96,25 @@ public function openModal()
*/
public function nextStep()
{
+ // Validate Turnstile on step 2 if enabled
+ if ($this->step === 2 && config('forms.turnstile.enabled') && config('forms.turnstile.site_key')) {
+ $this->validate([
+ 'turnstileToken' => ['required', 'turnstile'],
+ ], [
+ 'turnstileToken.required' => 'Please complete the security challenge.',
+ 'turnstileToken.turnstile' => 'Security challenge validation failed. Please try again.',
+ ]);
+ }
+
if ($this->isLastStep($this->step)) {
$this->isLoading = true;
}
$validatedData = $this->validateStepData();
+
+ // Remove turnstileToken from validated data so it's not stored
+ unset($validatedData['turnstileToken']);
+
$this->formData = array_merge($validatedData, $this->formData);
if ($this->step < $this->totalSteps) {
diff --git a/src/Middleware/HandleFbclid.php b/src/Middleware/HandleFbclid.php
new file mode 100644
index 0000000..e34130e
--- /dev/null
+++ b/src/Middleware/HandleFbclid.php
@@ -0,0 +1,24 @@
+query('fbclid')) {
+ $cookie = Cookie::make('fbclid', $fbclid, 60 * 24 * 30); // 30 days
+ $response->cookie($cookie);
+
+ $request->session()->put('fbclid', $fbclid);
+ }
+
+ return $response;
+ }
+}
diff --git a/src/Services/FormsValidationRuleService.php b/src/Services/FormsValidationRuleService.php
index 2b6df0e..80782ad 100644
--- a/src/Services/FormsValidationRuleService.php
+++ b/src/Services/FormsValidationRuleService.php
@@ -18,6 +18,7 @@ public static function getRulesForDefault($formKey): array
'gotcha' => 'nullable|string',
'submitClicked' => 'nullable',
'gclid' => 'nullable|string',
+ 'fbclid' => 'nullable|string',
'utmSource' => 'nullable|string',
'utmMedium' => 'nullable|string',
'utmCampaign' => 'nullable|string',
@@ -42,6 +43,7 @@ public function getRulesForStep($step): array
'gotcha' => 'nullable|string',
'submitClicked' => 'nullable',
'gclid' => 'nullable',
+ 'fbclid' => 'nullable',
'utmSource' => 'nullable|string',
'utmMedium' => 'nullable|string',
'utmCampaign' => 'nullable|string',