refactor based upon PR feedback

Author: anarchivist

app/assets/stylesheets/includes/main.scss

@@ -97,7 +97,7 @@ header {
     }
 
     ul {
-      a, button.calnet_login {
+      a, form.calnet_auth > button {
         color: black;
 
         &:hover {
@@ -257,24 +257,15 @@ section {
   }
 
   &.restricted {
-    form.auth {
+    div.access_methods {
       margin-right: auto;
       margin-bottom: 0.25rem;
 
-      div.access_methods {
-        button.calnet_login {
-          box-shadow: inset 0 -4px 0 $color-anchor-highlight;
-
-          &:hover {
-            background: $color-anchor-highlight;
-          }
-        }
-        a {
-          box-shadow: inset 0 -4px 0 $color-anchor-highlight;
+      a, form.calnet_auth > button {
+        box-shadow: inset 0 -4px 0 $color-anchor-highlight;
 
-          &:hover {
-            background: $color-anchor-highlight;
-          }
+        &:hover {
+          background: $color-anchor-highlight;
         }
       }
     }
@@ -410,11 +401,13 @@ span {
   // sass-lint:enable class-name-format
 }
 
-button.calnet_login {
-  background: inherit;
-  margin: inherit;
-  padding: inherit;
-  border: inherit;
-  font: inherit;
+form.calnet_auth {
   display: inline;
+  button {
+    background: inherit;
+    margin: inherit;
+    padding: inherit;
+    border: inherit;
+    font: inherit;
+  }
 }

app/helpers/application_helper.rb

@@ -1,20 +1,20 @@
 module ApplicationHelper
   def calnet_link
-    authenticated? ? logout_link : login_link
+    authenticated? ? logout_link : login_button
   end
 
   def logout_link(text = 'CalNet Logout')
     link_to(text, logout_path)
   end
 
-  def login_link(text = 'CalNet Login')
-    form_tag('/auth/calnet', url: request.original_url, method: 'post', data: { turbo: false }) do
-      login_button text
-    end
+  def calnet_omniauth_authorize_path
+    '/auth/calnet'
   end
 
-  def login_button(text = 'CalNet Login')
-    button_tag text, class: 'calnet_login', role: 'link'
+  def login_button(text = 'CalNet Login', form_class: 'calnet_auth')
+    button_to(text, calnet_omniauth_authorize_path,
+              params: { url: request.original_url },
+              form_class:, data: { turbo: false })
   end
 
   def vpn_link

app/views/player/access_restricted.erb

@@ -2,21 +2,19 @@
 <%
   calnet_only = record&.calnet_only?
   access_methods = [].tap do |mm|
-    mm << login_button('log in with CalNet') unless authenticated?
+    mm << login_button('log in with CalNet', form_class: 'calnet_auth restricted') unless authenticated?
     mm << vpn_link unless calnet_only || ucb_request?
   end
 %>
 <section class="record restricted">
   <h1>Access to this record is restricted</h1>
 
-  <%= form_tag('/auth/calnet', url: request.original_url, method: 'post', data: { turbo: false }, class: 'auth') do %>
   <div class="access_methods">
     The specified record is available to UC Berkeley users only.
     <% unless access_methods.empty? # should never happen %>
       For full access, <%= access_methods.join(', or ').html_safe %>.
     <% end %>
   </div>
-  <% end %>
 
   <table>
     <thead>

spec/support/authz_shared_examples.rb

@@ -27,8 +27,7 @@
     expect(page).to have_content(collection)
     expect(page).to have_content(record_id)
 
-    # show_url = player_url(collection:, record_id:)
-    expect(page).to have_css('button.calnet_login')
+    expect(page).to have_selector("div.access_methods > form[action='/auth/calnet']")
   end
 end