Do not redirect from home page when login is disabled (#2235)

fixes #2188

Author: carolyncole

app/controllers/application_controller.rb

@@ -127,12 +127,12 @@ def return_to_self
       current_user.sysadmin = false
     end
 
-    def downtime_check
+    def downtime_check(with_redirect: true)
       if Flipflop.disable_login?
         if current_user&.eligible_sysadmin?
           flash[:notice] = I18n.t(:only_sysadmin_users)
         else
-          redirect_to root_path
+          redirect_to root_path if with_redirect
           flash[:notice] = I18n.t(:no_login_currently)
         end
       end

app/controllers/welcome_controller.rb

@@ -7,6 +7,9 @@ class WelcomeController < ApplicationController
   def index
     if current_user.blank?
       render layout: "welcome"
+    elsif Flipflop.disable_login?
+      downtime_check(with_redirect: false)
+      redirect_to dashboard_path if current_user&.eligible_sysadmin?
     else
       redirect_to dashboard_path
     end

spec/controllers/dashboard_controller_spec.rb

@@ -112,6 +112,29 @@
       sign_in user
     end
 
+    it "does not show the admin tab" do
+      get :index
+      expect(response.body).not_to include("Administration")
+    end
+
+    context "disable_login is true" do
+      before do
+        test_strategy = Flipflop::FeatureSet.current.test!
+        test_strategy.switch!(:disable_login, true)
+      end
+
+      after do
+        test_strategy = Flipflop::FeatureSet.current.test!
+        test_strategy.switch!(:disable_login, false)
+      end
+
+      it "redirects to the home page" do
+        get :index
+        expect(response).to redirect_to root_path
+        expect(flash.notice).to eq("You can not be signed in at this time.")
+      end
+    end
+
     context "and the user is a sysadmin" do
       let(:user) { FactoryBot.create :sysadmin, mediaflux_session: SystemUser.mediaflux_session }
       render_views

spec/controllers/welcome_controller_spec.rb

@@ -23,16 +23,57 @@
       sign_in user
     end
 
-    it "renders the index page" do
+    it "redirects to the user dashboard" do
       get :index
       expect(response).to redirect_to(dashboard_path)
     end
+
+    context "disable_login is true" do
+      before do
+        test_strategy = Flipflop::FeatureSet.current.test!
+        test_strategy.switch!(:disable_login, true)
+      end
+
+      after do
+        test_strategy = Flipflop::FeatureSet.current.test!
+        test_strategy.switch!(:disable_login, false)
+      end
+
+      it "displays a flash message" do
+        get :index
+        expect(response).to render_template("index")
+        expect(flash.notice).to eq("You can not be signed in at this time.")
+      end
+    end
   end
 
-  context "when a user is logged in", connect_to_mediaflux: true do
-    let(:user) { FactoryBot.create :user, mediaflux_session: SystemUser.mediaflux_session }
+  context "when a sysadmin user is logged in", connect_to_mediaflux: true do
+    let(:user) { FactoryBot.create :sysadmin, mediaflux_session: SystemUser.mediaflux_session }
     before do
       sign_in user
     end
+
+    it "redirects to the user dashboard" do
+      get :index
+      expect(response).to redirect_to(dashboard_path)
+    end
+
+    context "disable_login is true" do
+      before do
+        test_strategy = Flipflop::FeatureSet.current.test!
+        test_strategy.switch!(:disable_login, true)
+      end
+
+      after do
+        test_strategy = Flipflop::FeatureSet.current.test!
+        test_strategy.switch!(:disable_login, false)
+      end
+
+      it "displays a flash message and redirects to the user dashboard" do
+        get :index
+        expect(response).to redirect_to(dashboard_path)
+        expect(flash.notice).to eq("System is only enabled for administrators currently")
+      end
+    end
   end
 end