lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed small issue with sign in to prevent error pages from appearing (#868)

This commit is contained in:
Ahmad Farhat 2019-11-15 10:49:52 -05:00 committed by Richard Alam
parent c92c8ad1ca
commit d35a554199
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/sessions_controller.rb
View File

@ -65,13 +65,13 @@ class SessionsController < ApplicationController
user = User.include_deleted.find_by(email: session_params[:email]) user = User.include_deleted.find_by(email: session_params[:email])
# Check user with that email exists is_super_admin = user&.has_role? :super_admin
return redirect_to(signin_path, alert: I18n.t("invalid_credentials")) unless user
is_super_admin = user.has_role? :super_admin
# Scope user to domain if the user is not a 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 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 # Check correct password was entered
return redirect_to(signin_path, alert: I18n.t("invalid_credentials")) unless user.try(:authenticate, return redirect_to(signin_path, alert: I18n.t("invalid_credentials")) unless user.try(:authenticate,
session_params[:password]) session_params[:password])