From c07cfd0d93321a39a6b6acc4090f067fa8070f00 Mon Sep 17 00:00:00 2001
From: Jesus Federico <jesus@123it.ca>
Date: Tue, 9 Apr 2019 11:22:55 -0400
Subject: [PATCH] GRN-80: Patch for fixing the added function in a production
 environment (#444)

* Patch for fixing the added function in a production environment

* Rubocop!
---
 app/helpers/application_helper.rb | 10 +++++++---
 app/views/shared/_header.html.erb |  9 +++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f8b99126..1cbbdf72 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -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
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb
index ad779d40..1fbb3663 100755
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
@@ -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>