merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GRN-80: Patch for fixing the added function in a production environment (#444)

Browse Source 
* Patch for fixing the added function in a production environment

* Rubocop!
v2
Jesus Federico 4 years ago committed by GitHub
parent 88f408c092
commit c07cfd0d93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      app/helpers/application_helper.rb
  2. 9
      app/views/shared/_header.html.erb

10
app/helpers/application_helper.rb
Unescape View File

@ -76,12 +76,16 @@ module ApplicationHelper
end
def allow_greenlight_accounts?
return true unless Rails.configuration.loadbalanced_configuration
return Rails.configuration.allow_user_signup unless Rails.configuration.loadbalanced_configuration
return false unless Rails.configuration.allow_user_signup
# No need to retrieve the provider info if the provider is whitelisted
return true if launcher_allow_user_signup_whitelisted?(@user_domain)
# Proceed with retrieving the provider info
provider_info = retrieve_provider_info(@user_domain, 'api2', 'getUserGreenlightCredentials')
provider_info['provider'] == 'greenlight'
begin
provider_info = retrieve_provider_info(@user_domain, 'api2', 'getUserGreenlightCredentials')
provider_info['provider'] == 'greenlight'
rescue
false
end
end
end

9
app/views/shared/_header.html.erb
Unescape View File

@ -55,21 +55,22 @@
<% end %>
</div>
</div>
<% else %>
<% else %>
<% allow_greenlight_accounts = allow_greenlight_accounts? %>
<% if Rails.configuration.omniauth_ldap %>
<%= link_to t("login"), omniauth_login_url(:ldap), :class => "btn btn-pill btn-outline-primary mx-2" %>
<% elsif allow_greenlight_accounts? %>
<% elsif allow_greenlight_accounts %>
<%= link_to t("login"), "#loginModal", :class => "btn btn-pill btn-outline-primary mx-2", "data-toggle": "modal" %>
<% else %>
<%= link_to t("login"), omniauth_login_url(:bn_launcher), :class => "btn btn-pill btn-outline-primary mx-2" %>
<% end %>
<% if allow_user_signup? && allow_greenlight_accounts? %>
<% if allow_user_signup? && allow_greenlight_accounts %>
<%= link_to t("signup.title"), signup_path, :class => "btn btn-pill btn-outline-primary mx-2" %>
<% end %>
<%= render "shared/modals/login_modal" %>
<% end %>
<% end %>
</div>
</div>
</div>