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

Revert "Redirecting the user to the referrer on login success/fail (#374)" (#389)

Browse Source 
This reverts commit 404134aa8d.
This commit is contained in:
Jesus Federico
2019-03-05 14:45:42 -05:00
committed by GitHub
parent 49779b2dd1
commit 37af17fae1
3 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/sessions_controller.rb
View File

@ -29,19 +29,13 @@ class SessionsController < ApplicationController
def create
user = User.find_by(email: session_params[:email])
if user && !user.greenlight_account?
if request.referrer.present?
redirect_to request.referrer, alert: I18n.t("invalid_login_method")
else
redirect_to root_path, alert: I18n.t("invalid_login_method")
end
redirect_to root_path, alert: I18n.t("invalid_login_method")
elsif user.try(:authenticate, session_params[:password])
if user.email_verified
login(user)
else
redirect_to(account_activation_path(email: user.email)) && return
end
elsif request.referrer.present?
redirect_to request.referrer, alert: I18n.t("invalid_credentials")
else
redirect_to root_path, alert: I18n.t("invalid_credentials")
end