Merge pull request #1 from eliasfellner/patch-1

fix: generate recaptcha token on every click
passioneight · Feb 22, 2022 · 22dacc7 · 22dacc7
2 parents c3e4583 + 040590d
commit 22dacc7
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/src/Resources/public/js/recaptcha.js b/src/Resources/public/js/recaptcha.js
@@ -23,24 +23,19 @@ googleRecaptchaScript.addEventListener('load', function() {
                     var submitButtons = form.querySelectorAll('[type="submit"]');
                     submitButtons = submitButtons ? submitButtons : [];
 
-                    var hasRecaptchaTokenMap = {};
-
                     for (var submitButton of submitButtons) {
                         submitButton.addEventListener('click', function(e){
-                            if(!hasRecaptchaTokenMap.submitButtonHash) {
-                                e.preventDefault();
+                            e.preventDefault();
 
-                                grecaptcha.execute(_config.googleRecaptcha.publicKey, {action: action}).then(function (token) {
-                                    if (_config.googleRecaptcha.debug) {
-                                        console.debug("Received response for action:", action, token);
-                                    }
+                            grecaptcha.execute(_config.googleRecaptcha.publicKey, {action: action}).then(function (token) {
+                                if (_config.googleRecaptcha.debug) {
+                                    console.debug("Received response for action:", action, token);
+                                }
 
-                                    element.value = token;
-                                    hasRecaptchaTokenMap.submitButtonHash = true;
+                                element.value = token;
 
-                                    submitButton.click();
-                                });
-                            }
+                                form.dispatchEvent(new Event('submit'));
+                            });
                         });
                     }
                 }
@@ -49,4 +44,4 @@ googleRecaptchaScript.addEventListener('load', function() {
             console.debug("Could not find Google Recaptcha elements for query selector '" + _config.googleRecaptcha.querySelector + "'");
         }
     });
-});
+});