|
|
@@ -60,11 +60,11 @@ module AuthenticationHelper
|
|
60
|
60
|
def logged_in?
|
|
61
|
61
|
# Case 1: User has an active session inside the cookie.
|
|
62
|
62
|
# We verify that the session hasn't expired yet.
|
|
63
|
|
- if session[:user_id] && session[:expires].to_time > DateTime.now
|
|
|
63
|
+ if session[:user_id] && session[:expires].to_time.future?
|
|
64
|
64
|
|
|
65
|
65
|
user_session
|
|
66
|
66
|
|
|
67
|
|
- return false if !@user_session.active || @user_session.expires < Time.now
|
|
|
67
|
+ return false if !@user_session.active || @user_session.expires.past?
|
|
68
|
68
|
|
|
69
|
69
|
true
|
|
70
|
70
|
|
|
|
@@ -80,7 +80,7 @@ module AuthenticationHelper
|
|
80
|
80
|
|
|
81
|
81
|
session_password = BCrypt::Password.new @user_session.remember_digest
|
|
82
|
82
|
|
|
83
|
|
- if @user_session.expires > DateTime.now &&
|
|
|
83
|
+ if @user_session.expires.future? &&
|
|
84
|
84
|
session_password == cookies.signed.permanent[:remember_token]
|
|
85
|
85
|
log_in @user_session.user, false, false
|
|
86
|
86
|
return true
|