refactored login process, added remember option for login
This commit is contained in:
28
app/logical/session_creator.rb
Normal file
28
app/logical/session_creator.rb
Normal file
@@ -0,0 +1,28 @@
|
||||
class SessionCreator
|
||||
attr_reader :session, :cookies, :name, :password, :remember
|
||||
|
||||
def initialize(session, cookies, name, password, remember)
|
||||
@session = session
|
||||
@cookies = cookies
|
||||
@name = name
|
||||
@password = password
|
||||
@remember = remember
|
||||
end
|
||||
|
||||
def authenticate
|
||||
if User.authenticate(name, password)
|
||||
user = User.find_by_name(name)
|
||||
user.update_column(:last_logged_in_at, Time.now)
|
||||
|
||||
if remember.present?
|
||||
cookies[:user_name] = {:expires => 1.year.from_now, :value => user.name}
|
||||
cookies[:cookie_password_hash] = {:expires => 1.year.from_now, :value => user.cookie_password_hash}
|
||||
end
|
||||
|
||||
session[:user_id] = user.id
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
end
|
||||
51
app/logical/session_loader.rb
Normal file
51
app/logical/session_loader.rb
Normal file
@@ -0,0 +1,51 @@
|
||||
class SessionLoader
|
||||
attr_reader :session, :cookies, :request
|
||||
|
||||
def initialize(session, cookies, request)
|
||||
@session = session
|
||||
@cookies = cookies
|
||||
@request = request
|
||||
end
|
||||
|
||||
def load
|
||||
if session[:user_id]
|
||||
load_session_user
|
||||
elsif cookie_password_hash_valid?
|
||||
load_cookie_user
|
||||
end
|
||||
|
||||
if CurrentUser.user
|
||||
CurrentUser.user.unban! if ban_expired?
|
||||
else
|
||||
CurrentUser.user = AnonymousUser.new
|
||||
end
|
||||
|
||||
set_time_zone
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def load_session_user
|
||||
CurrentUser.user = User.find_by_id(session[:user_id])
|
||||
CurrentUser.ip_addr = request.remote_ip
|
||||
end
|
||||
|
||||
def load_cookie_user
|
||||
CurrentUser.user = User.find_by_name(cookies[:user_name])
|
||||
CurrentUser.ip_addr = request.remote_ip
|
||||
end
|
||||
|
||||
def ban_expired?
|
||||
CurrentUser.user.is_banned? && CurrentUser.user.ban && CurrentUser.user.ban.expired?
|
||||
end
|
||||
|
||||
def cookie_password_hash_valid?
|
||||
puts "cookie_password_hash=#{cookies[:cookie_password_hash]}"
|
||||
cookies[:cookie_password_hash] && User.authenticate_cookie_hash(cookies[:user_name], cookies[:cookie_password_hash])
|
||||
end
|
||||
|
||||
def set_time_zone
|
||||
Time.zone = CurrentUser.user.time_zone
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user