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

GRN2-xx: General bug fixes and performance upgrades (#734)

Browse Source 
* General bug fixes and performance upgrades

* Removed unused lines
This commit is contained in:
farhatahmad
2019-08-14 09:59:34 -04:00
committed by Jesus Federico
parent 4d69d06ba1
commit 98405c7d86
14 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/sessions_controller.rb
View File

@ -36,7 +36,7 @@ class SessionsController < ApplicationController
user = admin
else
user = User.find_by(email: session_params[:email], provider: @user_domain)
redirect_to(signin_path, alert: I18n.t("invalid_user")) && return unless user
redirect_to(signin_path, alert: I18n.t("invalid_credentials")) && return unless user
redirect_to(root_path, alert: I18n.t("invalid_login_method")) && return unless user.greenlight_account?
redirect_to(account_activation_path(email: user.email)) && return unless user.activated?
end