Merge pull request #210 from itk-dev/feature/SUPP0RT-1165-honeypot-ajax

SUPP0RT-1165: Added patch fixing honeypot and ajax clash
itk-dev · Aug 14, 2023 · bb827c0 · bb827c0
2 parents 95b64b3 + 74c3cca
commit bb827c0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret.
 
 * Opdaterede til [Beskedfordeler drupal
   1.1.1](https://github.com/itk-dev/beskedfordeler-drupal/releases/tag/1.1.1)
+* Tilføjede patch for at undgå honeypot og ajax issues.
 
 ## [2.4.4]
 

diff --git a/composer.json b/composer.json
@@ -123,6 +123,9 @@
             "force-reset": true
         },
         "patches": {
+            "drupal/honeypot": {
+                "Fixes issue with clash between ajax and honeypot (https://www.drupal.org/project/honeypot/issues/2396193)": "patches/drupal/honeypot/honeypot-ajax.patch"
+            },
             "drupal/webform_migrate": {
                 "Set to support. Checkbox condition fixes": "https://raw.githubusercontent.com/OS2Forms/os2forms8/master/patches/setto-and-checkboxes-condition-fix-onlyD7.patch"
             },

diff --git a/composer.lock b/composer.lock
diff --git a/patches/drupal/honeypot/honeypot-ajax.patch b/patches/drupal/honeypot/honeypot-ajax.patch
@@ -0,0 +1,17 @@
+diff --git a/src/HoneypotService.php b/src/HoneypotService.php
+index 1eeb6df..9a6f3a3 100644
+--- a/src/HoneypotService.php
++++ b/src/HoneypotService.php
+@@ -329,6 +329,12 @@ class HoneypotService implements HoneypotServiceInterface {
+       return;
+     }
+
++    // If the triggering element is using ajax behaviour
++    // then skip time restriction validation.
++    if (isset($triggering_element['#ajax'])) {
++        return;
++    }
++
+     // Get the time value.
+     $identifier = $form_state->getValue('honeypot_time', FALSE);
+     $honeypot_time = $this->keyValue->get($identifier, 0);