diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-03 19:00:25 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-03 19:00:25 -0500 |
| commit | fb8aedbf8f39c627e6537c567f030b389cfb3cfb (patch) | |
| tree | 714e1a5294f839c4a5c22195e5f4685af847f6a8 /app/helpers | |
| parent | 38c41dc461244832d739b755e073989c61dacf47 (diff) | |
| parent | cd69a777235e96266d4ed101ef22de7ed1308dd5 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/sessions_helper.rb | 14 | ||||
| -rw-r--r-- | app/helpers/users_helper.rb | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index 29a5c90..046ca6f 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -12,12 +12,20 @@ module SessionsHelper self.current_user = user end -#method creating for self.current_user +# The curret_user=(user) is the conversion of self.current_user = user def current_user=(user) - remember_token = User.hash(cookies[:remember_token]) - @current_user ||= User.find_by(remember_token: remember_token) + @current_user = user end +# sets the @current_user instance virable to the user corresponding +# to the remember token, but only if @current_user is undefined +# since the remember token is hashed, we need to hash the cookie +# to find match the remember token + def current_user + remember_token = User.hash(cookies[:remember_token]) + @current_user ||= User.find_by(remember_token: remember_token) + end + # checks if someone is currently signed in def signed_in? !current_user.nil? diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000..2310a24 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end |