From aaf1adafc010ce1ef7491b18bac8eb5691b4f3cf Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Mon, 1 Jul 2024 09:29:03 +0200
Subject: [PATCH] Fix disclaimer modal for sso [SCI-10828]

---
 app/assets/javascripts/users/login_disclaimer.js     |  2 ++
 app/assets/stylesheets/themes/scinote.scss           | 10 ----------
 app/views/users/shared/_azure_sign_in_links.html.erb |  2 +-
 app/views/users/shared/_links.html.erb               | 10 +++++-----
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/users/login_disclaimer.js b/app/assets/javascripts/users/login_disclaimer.js
index 5de3648c7..2d1bef8ba 100644
--- a/app/assets/javascripts/users/login_disclaimer.js
+++ b/app/assets/javascripts/users/login_disclaimer.js
@@ -14,6 +14,8 @@
   initDisclaimer('.log-in-button', '#new_user');
   initDisclaimer('.btn-okta', '#oktaForm');
   initDisclaimer('.btn-azure-ad', '.azureAdForm');
+  initDisclaimer('.btn-openid-connect', '#openidConnectForm');
+  initDisclaimer('.btn-saml', '#samlForm');
   initDisclaimer('.sign-up-button', '#sign-up-form');
   initDisclaimer('.forgot-password-submit', '#forgot-password-form');
   initDisclaimer('.invitation-submit', '#invitation-form');
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index 2af25c1d2..711677980 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -385,21 +385,11 @@ mark,.mark {
 .azure-sign-in-actions {
   margin-bottom: 10px;
   margin-top: 10px;
-
-  .btn-azure-ad {
-    background-color: $office-ms-word;
-    color: $color-white;
-  }
 }
 
 .okta-sign-in-actions {
   margin-bottom: 10px;
   margin-top: 10px;
-
-  .btn-okta {
-    background-color: #00297a;
-    color: $color-white;
-  }
 }
 
 .navbar-secondary {
diff --git a/app/views/users/shared/_azure_sign_in_links.html.erb b/app/views/users/shared/_azure_sign_in_links.html.erb
index d1d28c392..255bcfe0b 100644
--- a/app/views/users/shared/_azure_sign_in_links.html.erb
+++ b/app/views/users/shared/_azure_sign_in_links.html.erb
@@ -1,7 +1,7 @@
 <% ApplicationSettings.instance.values['azure_ad_apps'].select { |v| v['enable_sign_in'] }.each do |config| %>
   <div class="form-group">
     <%= form_tag user_customazureactivedirectory_omniauth_authorize_path(provider: config['provider_name']), method: :post, class: "azureAdForm" do %>
-      <%= submit_tag config['sign_in_label'] || t('devise.sessions.new.azure_ad_submit'), class: 'btn btn-primary' %>
+      <%= submit_tag config['sign_in_label'] || t('devise.sessions.new.azure_ad_submit'), class: 'btn btn-primary btn-azure-ad' %>
     <% end %>
   </div>
 <% end %>
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index 3ad61a52b..8864e5a2a 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -31,7 +31,7 @@
     <%- if sso_enabled? && okta_enabled? %>
       <div class="okta-sign-in-actions">
         <%= form_tag user_okta_omniauth_authorize_path, method: :post, id: 'oktaForm' do %>
-          <%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-primary' %>
+          <%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-primary btn-okta' %>
         <% end %>
       </div>
     <% end %>
@@ -50,16 +50,16 @@
 
     <%- if sso_enabled? && openid_connect_enabled? %>
       <div class="azure-sign-in-actions">
-        <%= form_tag user_openid_connect_omniauth_authorize_path, method: :post do %>
-          <%= submit_tag t('devise.sessions.new.openid_connect_submit'), class: 'btn btn-primary' %>
+        <%= form_tag user_openid_connect_omniauth_authorize_path, method: :post, id: 'openidConnectForm' do %>
+          <%= submit_tag t('devise.sessions.new.openid_connect_submit'), class: 'btn btn-primary btn-openid-connect' %>
         <% end %>
       </div>
     <% end %>
 
     <% if sso_enabled? && saml_enabled? %>
       <div class="azure-sign-in-actions">
-        <%= form_tag user_saml_omniauth_authorize_path, method: :post do %>
-          <%= submit_tag t('devise.sessions.new.saml_submit'), class: 'btn btn-primary' %>
+        <%= form_tag user_saml_omniauth_authorize_path, method: :post, id: 'samlForm' do %>
+          <%= submit_tag t('devise.sessions.new.saml_submit'), class: 'btn btn-primary btn-saml' %>
         <% end %>
       </div>
     <% end %>