From 32f95d7ae46d291e3d3c92609152f1e23287a608 Mon Sep 17 00:00:00 2001
From: Jonathan Rosenbaum <bike@bikelover.org>
Date: Sat, 31 Jan 2026 17:30:03 +0000
Subject: [PATCH] Remove duplication of recaptcha code, which caused issues,
 and improved script tag logic to check for errors.

---
 app/helpers/application_helper.rb       | 40 ++++++++++++++++---------
 app/views/layouts/application.html.haml |  4 +--
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3c1ae26..1802e0c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -30,19 +30,31 @@ module ApplicationHelper
     }
   end
 
-  def recaptcha_execute(action)
-    id = "recaptcha_token_#{SecureRandom.hex(10)}"
-
-    raw %Q{
-      <input name="recaptcha_token" type="hidden" id="#{id}"/>
-      <script>
-        grecaptcha.ready(function() {
-          grecaptcha.execute('#{RECAPTCHA_SITE_KEY}', {action: '#{action}'}).then(function(token) {
-            document.getElementById("#{id}").value = token;
-          });
-        });
-      </script>
-    }
-  end
+  def recaptcha_execute(action)
+    id = "recaptcha_token_#{SecureRandom.hex(10)}"
+
+    raw %Q{
+      <input name="recaptcha_token" type="hidden" id="#{id}"/>
+      <script>
+        if (typeof grecaptcha !== 'undefined') {
+          grecaptcha.ready(function() {
+            grecaptcha.execute('#{RECAPTCHA_SITE_KEY}', {action: '#{action}'}).then(function(token) {
+              document.getElementById("#{id}").value = token;
+            }).catch(function(error) {
+              console.error('reCAPTCHA execution error:', error);
+            });
+          });
+        } else {
+          document.addEventListener('grecaptcha-ready', function() {
+            grecaptcha.execute('#{RECAPTCHA_SITE_KEY}', {action: '#{action}'}).then(function(token) {
+              document.getElementById("#{id}").value = token;
+            }).catch(function(error) {
+              console.error('reCAPTCHA execution error:', error);
+            });
+          });
+        }
+      </script>
+    }
+  end
 
 end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index c991fba..88ed7a8 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -69,9 +69,7 @@
             .dlg-inner
               .message=''
               %button.close=_'modals.done_button'
-      - if @login_dlg.present?
-        = content_for :recaptcha_js do
-          = include_recaptcha_js        
+      - if @login_dlg.present?     
         .dlg#login-dlg
           .dlg-content
             %h2.title=_'forms.actions.generic.login'