From e05ec67d32ec45a4b5a283e23dfc347fba1a30a8 Mon Sep 17 00:00:00 2001
From: Igor Fedoronchuk <fedoronchuk@gmail.com>
Date: Tue, 2 Jun 2026 13:55:25 +0200
Subject: [PATCH 1/3] Restore submit_tag for AA 3.x login button styling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The add-AA-v4-support change (commit 15e89a0) flipped both view branches from submit_tag inside form_tag to button_to. That works for the AA v4 branch (Tailwind classes do the styling), but on AA v3 the formtastic theme styles `#login input[type="submit"]` — a <button> element doesn't match the selector, so the SSO button regressed from the themed blue to an unstyled dark default.

Keep button_to in the AA v4 branch; revert the AA v3 (else) branch to form_tag + submit_tag so the formtastic-themed look is back. The wrapping form picks up the .formtastic class so AA's stylesheet applies.
---
 app/views/active_admin/devise/sessions/new.html.erb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/active_admin/devise/sessions/new.html.erb b/app/views/active_admin/devise/sessions/new.html.erb
index 7c49318..efe7aa0 100644
--- a/app/views/active_admin/devise/sessions/new.html.erb
+++ b/app/views/active_admin/devise/sessions/new.html.erb
@@ -15,10 +15,12 @@
   <div id="login">
     <h2><%= active_admin_application.site_title(self) %></h2>
 
-    <%= button_to ActiveAdmin::Oidc.config.login_button_label,
-                  "/admin/auth/oidc",
-                  method: :post,
-                  class: "activeadmin-oidc-login-button",
-                  data: { turbo: false } %>
+    <%= form_tag "/admin/auth/oidc",
+                 method: :post,
+                 class: "activeadmin-oidc-login-form formtastic",
+                 data: { turbo: false } do %>
+      <%= submit_tag ActiveAdmin::Oidc.config.login_button_label,
+                     class: "activeadmin-oidc-login-button" %>
+    <% end %>
   </div>
 <% end %>

From 9d40c6812a0675e0a9295c3cac028719c9c7d3f2 Mon Sep 17 00:00:00 2001
From: Igor Fedoronchuk <fedoronchuk@gmail.com>
Date: Tue, 2 Jun 2026 14:00:12 +0200
Subject: [PATCH 2/3] Lock AA v3 login button to <input type=submit> via spec

Regression test for the styling fix: AA v3's formtastic stylesheet targets #login input[type="submit"], and a <button> doesn't match the selector. The spec asserts the rendered login page uses input[type=submit] on AA v3 (skipped on AA v4 where button_to + Tailwind is intentional) so future view edits can't silently regress the themed blue button back to a dark default.
---
 spec/requests/login_page_spec.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/spec/requests/login_page_spec.rb b/spec/requests/login_page_spec.rb
index fb34d07..fa01c7a 100644
--- a/spec/requests/login_page_spec.rb
+++ b/spec/requests/login_page_spec.rb
@@ -37,4 +37,18 @@
 
     expect(response.body).to include(ActiveAdmin::Oidc::Configuration::DEFAULT_LOGIN_BUTTON_LABEL)
   end
+
+  # Regression: AA v3's formtastic stylesheet targets
+  # `#login input[type="submit"]`, so a <button type="submit"> stays
+  # unstyled (defaults to the dark browser/AA button). Switching to
+  # button_to in the AA v3 branch silently regresses the themed blue
+  # SSO button to a dark default. Lock the v3 view to submit_tag.
+  it "renders the SSO button as an <input type=submit> on AA v3" do
+    skip "AA v4+ branch uses button_to with Tailwind classes" if ActiveAdmin::Oidc.aa_v4?
+
+    get "/admin/login"
+
+    expect(response.body).to match(/<input[^>]+type="submit"[^>]+value="[^"]*SSO[^"]*"/)
+    expect(response.body).not_to match(/<button[^>]+type="submit"/)
+  end
 end

From c77a23bb619f6e1212192a05344c265f943994b5 Mon Sep 17 00:00:00 2001
From: Igor Fedoronchuk <fedoronchuk@gmail.com>
Date: Tue, 2 Jun 2026 14:10:06 +0200
Subject: [PATCH 3/3] Apply the same v3 view fix to the install-generator
 template

The install generator (`rails generate active_admin:oidc:install`) copies templates/sessions_new.html.erb to the host app for AA v3. That template carried the same button_to-based markup the gem-side view did, so host apps that ran the installer (and ones that do so after this fix lands) would still see the dark unstyled SSO button until they hand-edited their own override.
---
 .../oidc/install/templates/sessions_new.html.erb     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/generators/active_admin/oidc/install/templates/sessions_new.html.erb b/lib/generators/active_admin/oidc/install/templates/sessions_new.html.erb
index e880bb6..0cd8d78 100644
--- a/lib/generators/active_admin/oidc/install/templates/sessions_new.html.erb
+++ b/lib/generators/active_admin/oidc/install/templates/sessions_new.html.erb
@@ -1,9 +1,11 @@
 <div id="login">
   <h2><%%= active_admin_application.site_title(self) %></h2>
 
-  <%%= button_to ActiveAdmin::Oidc.config.login_button_label,
-                "/admin/auth/oidc",
-                method: :post,
-                class: "activeadmin-oidc-login-button",
-                data: { turbo: false } %>
+  <%%= form_tag "/admin/auth/oidc",
+               method: :post,
+               class: "activeadmin-oidc-login-form formtastic",
+               data: { turbo: false } do %>
+    <%%= submit_tag ActiveAdmin::Oidc.config.login_button_label,
+                   class: "activeadmin-oidc-login-button" %>
+  <%% end %>
 </div>