From 222863ce018ca58f7b913734d013af21d34286a8 Mon Sep 17 00:00:00 2001
From: Ryan Wold <ryan.wold@gsa.gov>
Date: Wed, 2 Apr 2025 17:56:39 -0700
Subject: [PATCH] explicitly render turnstile

---
 app/views/admin/submissions/show.html.erb   |  8 ++++++++
 app/views/components/forms/_custom.html.erb | 12 ++++++------
 app/views/components/widget/_fba.js.erb     | 14 +++++++++++++-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/submissions/show.html.erb b/app/views/admin/submissions/show.html.erb
index a0130dd7e..e60b11248 100644
--- a/app/views/admin/submissions/show.html.erb
+++ b/app/views/admin/submissions/show.html.erb
@@ -184,6 +184,14 @@
               <%= h(@submission.referer) %>
             </td>
           </tr>
+          <tr>
+            <td>
+              Spam prevention mechanism
+            </td>
+            <td>
+              <%= h(@submission.spam_prevention_mechanism) %>
+            </td>
+          </tr>
           <tr>
             <td>
               Language
diff --git a/app/views/components/forms/_custom.html.erb b/app/views/components/forms/_custom.html.erb
index e1214be26..5d876ef15 100644
--- a/app/views/components/forms/_custom.html.erb
+++ b/app/views/components/forms/_custom.html.erb
@@ -107,13 +107,13 @@
             <% end %>
           </div>
         <% end %>
-        <% if form.enable_turnstile? %>
-        <div class="margin-top-2">
-          <div class="cf-turnstile" data-sitekey="<%= ENV.fetch("TURNSTILE_SITE_KEY", nil) %>"></div>
-          <%= hidden_field_tag "cf-turnstile-response", nil %>
-        </div>
-        <% end %>
         <%- if section == form.form_sections.last && !form.suppress_submit_button %>
+          <%- if form.enable_turnstile? %>
+          <div class="margin-top-2">
+            <div id="turnstile-container"></div>
+            <%= hidden_field_tag "cf-turnstile-response", nil %>
+          </div>
+          <% end %>
           <button type="submit" class="usa-button submit_form_button"><%= t 'form.submit' %></button>
         <% end %>
       </div>
diff --git a/app/views/components/widget/_fba.js.erb b/app/views/components/widget/_fba.js.erb
index 8c9f2dde5..90eb47a2d 100644
--- a/app/views/components/widget/_fba.js.erb
+++ b/app/views/components/widget/_fba.js.erb
@@ -656,7 +656,19 @@ function FBAform(d, N) {
 			script.src = "https://challenges.cloudflare.com/turnstile/v0/api.js";
 			script.async = true;
 			script.defer = true;
-			document.head.appendChild(script);
+			script.onload = this.initTurnstile
+			if (!window.turnstile) {
+				document.head.appendChild(script);
+			}
+		},
+		initTurnstile: function() {
+			turnstile.remove("#turnstile-container");
+			turnstile.render("#turnstile-container", {
+				sitekey: "<%= ENV['TURNSTILE_SITE_KEY'] %>",
+				callback: function (token) {
+					document.querySelector("input[name='cf-turnstile-response']").value = token;
+				}
+			});
 		},
 		<% end %>
 		enableLocalStorage: function() {