From 57c49ca8f47ebb0e5d609ad406968597be9eb350 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Wed, 1 May 2019 16:29:53 -0400
Subject: [PATCH 1/2] Fixed #486: Allow users to sign in if
 ALLOW_GREENLIGHT_ACCOUNTS=false (#480)

* Allow local users to sign in when sign up is turned off

* Update _header.html.erb
---
 app/views/shared/_header.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb
index 2aac493e..ba28cf57 100755
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
@@ -62,8 +62,10 @@
             <%= link_to t("login"), omniauth_login_url(:ldap), :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button" %>
           <% elsif allow_greenlight_accounts %>
             <%= link_to t("login"), "#loginModal", :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button", "data-toggle": "modal" %>
-          <% else %>
+          <% elsif Rails.configuration.loadbalanced_configuration %>
             <%= link_to t("login"), omniauth_login_url(:bn_launcher), :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button" %>
+          <% else %>
+            <%= link_to t("login"), "#loginModal", :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button", "data-toggle": "modal" %>
           <% end %>
 
           <% if allow_user_signup? && allow_greenlight_accounts %>

From 4896133d58ecb36850ce46a732f832d07057d853 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Wed, 1 May 2019 16:53:47 -0400
Subject: [PATCH 2/2] Added signup_url to list of urls not to redirect to
 (#481)

---
 app/helpers/sessions_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
index 510933d2..011742ad 100644
--- a/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
@@ -33,7 +33,7 @@ module SessionsHelper
   def check_email_verified(user)
     if user.activated?
       # Get the url to redirect the user to
-      url = if cookies[:return_to] && cookies[:return_to] != root_url
+      url = if cookies[:return_to] && ![root_url, signup_url].include?(cookies[:return_to])
         cookies[:return_to]
       else
         user.main_room