From d35a554199ee693f1806132cc756fbb5d45230bc Mon Sep 17 00:00:00 2001 From: Ahmad Farhat Date: Fri, 15 Nov 2019 10:49:52 -0500 Subject: [PATCH] Fixed small issue with sign in to prevent error pages from appearing (#868) --- app/controllers/sessions_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 813433e3..3a45c165 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -65,13 +65,13 @@ class SessionsController < ApplicationController user = User.include_deleted.find_by(email: session_params[:email]) - # Check user with that email exists - return redirect_to(signin_path, alert: I18n.t("invalid_credentials")) unless user - - is_super_admin = user.has_role? :super_admin + is_super_admin = user&.has_role? :super_admin # Scope user to domain if the user is not a super admin user = User.include_deleted.find_by(email: session_params[:email], provider: @user_domain) unless is_super_admin + + # Check user with that email exists + return redirect_to(signin_path, alert: I18n.t("invalid_credentials")) unless user # Check correct password was entered return redirect_to(signin_path, alert: I18n.t("invalid_credentials")) unless user.try(:authenticate, session_params[:password])