Modified authentication with user_signed_in? and current_user
This commit is contained in:
@@ -3,10 +3,24 @@ class ApplicationController < ActionController::Base
|
||||
before_action :authenticate
|
||||
|
||||
private
|
||||
def current_user
|
||||
Current.user || authenticate_user_from_session
|
||||
end
|
||||
helper_method :current_user
|
||||
|
||||
def authenticate_user_from_session
|
||||
session_record = Session.find_by_id(cookies.signed[:session_token])
|
||||
Current.session = session_record
|
||||
Current.user
|
||||
end
|
||||
|
||||
def user_signed_in?
|
||||
current_user.present?
|
||||
end
|
||||
helper_method :user_signed_in?
|
||||
|
||||
def authenticate
|
||||
if session_record = Session.find_by_id(cookies.signed[:session_token])
|
||||
Current.session = session_record
|
||||
else
|
||||
unless user_signed_in?
|
||||
redirect_to sign_in_path
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user