X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0a98d08885bff899ed9e8fe2008ba26b7b13469a..2f66877696957886b9c75026c9133c1d5430d772:/app/views/application/_auth_providers.html.erb
diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb
index 89de3b4ff..895a42eb0 100644
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@ -1,11 +1,4 @@
-<% prefered_auth_button_available = false %>
-<% %w[google facebook microsoft github wikipedia].each do |provider| %>
- <% if Settings.key?("#{provider}_auth_id".to_sym) -%>
- <% if @preferred_auth_provider == provider %>
- <% prefered_auth_button_available = true %>
- <% end %>
- <% end -%>
-<% end -%>
+<% prefered_auth_button_available = @preferred_auth_provider != "openid" && Auth.providers.value?(@preferred_auth_provider) %>
<%= tag.div :id => "login_auth_buttons",
@@ -13,31 +6,23 @@
<% if prefered_auth_button_available %>
- <% %w[google facebook microsoft github wikipedia].each do |provider| %>
- <% if Settings.key?("#{provider}_auth_id".to_sym) -%>
- <% if @preferred_auth_provider == provider %>
- <%= auth_button_preferred provider %>
- <% end %>
- <% end -%>
- <% end -%>
+ <%= auth_button_preferred @preferred_auth_provider %>
<% end %>
- <%= button_tag image_tag("openid.svg",
- :alt => t(".openid.alt"),
- :size => "36"),
- :type => "button",
- :id => "openid_open_url",
- :title => t(".openid.title"),
- :class => "btn btn-light p-2" %>
-
- <% %w[google facebook microsoft github wikipedia].each do |provider| %>
- <% unless @preferred_auth_provider == provider %>
- <% if Settings.key?("#{provider}_auth_id".to_sym) -%>
- <%= auth_button provider %>
- <% end -%>
- <% end %>
+ <% Auth.providers.each_value do |provider| %>
+ <% if provider == "openid" %>
+ <%= button_tag image_tag("openid.svg",
+ :alt => t(".openid.alt"),
+ :size => "36"),
+ :type => "button",
+ :id => "openid_open_url",
+ :title => t(".openid.title"),
+ :class => "btn btn-light p-2" %>
+ <% elsif provider != @preferred_auth_provider %>
+ <%= auth_button provider %>
+ <% end -%>
<% end -%>
<% end %>