From f9a4ee4e998f5f113565a93802c041108e9a180d Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Wed, 2 Apr 2014 14:53:10 -0400 Subject: now ran generate without ger --- app/helpers/remote_usernames_helper.rb | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 app/helpers/remote_usernames_helper.rb (limited to 'app/helpers') diff --git a/app/helpers/remote_usernames_helper.rb b/app/helpers/remote_usernames_helper.rb new file mode 100644 index 0000000..3240c4f --- /dev/null +++ b/app/helpers/remote_usernames_helper.rb @@ -0,0 +1,2 @@ +module RemoteUsernamesHelper +end -- cgit v1.2.3-2-g168b From c0b705f1397ce442427638f92b185d630db73ec5 Mon Sep 17 00:00:00 2001 From: shumakl Date: Thu, 3 Apr 2014 12:12:04 -0400 Subject: normalize to tab indent --- app/helpers/sessions_helper.rb | 70 +++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index 046ca6f..5a238a0 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -7,67 +7,67 @@ module SessionsHelper cookies.permanent[:remember_token] = remember_token #save the hashed token to the database user.update_attribute(:remember_token, - User.hash(remember_token)) + User.hash(remember_token)) #set the current user to be the given user self.current_user = user end -# The curret_user=(user) is the conversion of self.current_user = user + # The curret_user=(user) is the conversion of self.current_user = user def current_user=(user) @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 + # 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? end - def sign_out - current_user.update_attribute(:remember_token, User.hash(User.new_remember_token)) - cookies.delete(:remember_token) - self.current_user = nil - end + def sign_out + current_user.update_attribute(:remember_token, User.hash(User.new_remember_token)) + cookies.delete(:remember_token) + self.current_user = nil + end -=begin + =begin -This is for anyone that cares about how long a user is signed -in: + This is for anyone that cares about how long a user is signed + in: -Currently I have a user to be signed in forever unless they -log out (cookies.permanent....). + Currently I have a user to be signed in forever unless they + log out (cookies.permanent....). -If you want to change that, change line 7 to this: + If you want to change that, change line 7 to this: -cookies[:remember_token] = { value: remember_token, - expires: 20.years.from_now.utc } + cookies[:remember_token] = { value: remember_token, + expires: 20.years.from_now.utc } -which will expire the cookie in 20 years from its date of -creation. + which will expire the cookie in 20 years from its date of + creation. -Oddly enough, this line above is equivalent to the: + Oddly enough, this line above is equivalent to the: -cookies.permanent + cookies.permanent -This is just a short cut for this line since most people -create permanent cookies these days. + This is just a short cut for this line since most people + create permanent cookies these days. -Other times are: + Other times are: -10.weeks.from_now + 10.weeks.from_now -5.days.ago + 5.days.ago -etc... + etc... -=end + =end -end + end -- cgit v1.2.3-2-g168b From afaeb054e6ac35c186af9c563f85f8ac58076b81 Mon Sep 17 00:00:00 2001 From: shumakl Date: Thu, 3 Apr 2014 12:43:31 -0400 Subject: fix auto-indent mess up --- app/helpers/sessions_helper.rb | 67 +++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 36 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index 5a238a0..9be3abc 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -6,8 +6,8 @@ module SessionsHelper #place token inside of the browser cookies.permanent[:remember_token] = remember_token #save the hashed token to the database - user.update_attribute(:remember_token, - User.hash(remember_token)) + user.update_attribute(:remember_token, + User.hash(remember_token)) #set the current user to be the given user self.current_user = user end @@ -37,37 +37,32 @@ module SessionsHelper self.current_user = nil end - =begin - - This is for anyone that cares about how long a user is signed - in: - - Currently I have a user to be signed in forever unless they - log out (cookies.permanent....). - - If you want to change that, change line 7 to this: - - cookies[:remember_token] = { value: remember_token, - expires: 20.years.from_now.utc } - - which will expire the cookie in 20 years from its date of - creation. - - Oddly enough, this line above is equivalent to the: - - cookies.permanent - - This is just a short cut for this line since most people - create permanent cookies these days. - - Other times are: - - 10.weeks.from_now - - 5.days.ago - - etc... - - =end - - end + # This is for anyone that cares about how long a user is signed + # in: + # + # Currently I have a user to be signed in forever unless they + # log out (cookies.permanent....). + # + # If you want to change that, change line 7 to this: + # + # cookies[:remember_token] = { value: remember_token, + # expires: 20.years.from_now.utc } + # + # which will expire the cookie in 20 years from its date of + # creation. + # + # Oddly enough, this line above is equivalent to the: + # + # cookies.permanent + # + # This is just a short cut for this line since most people + # create permanent cookies these days. + # + # Other times are: + # + # 10.weeks.from_now + # + # 5.days.ago + # + # etc... +end -- cgit v1.2.3-2-g168b From 9f19d0e16d7920e07255c0fbe596c518d1aa415f Mon Sep 17 00:00:00 2001 From: shumakl Date: Thu, 3 Apr 2014 15:04:42 -0400 Subject: fix login with tokens belonging to sessions --- app/helpers/sessions_helper.rb | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index 9be3abc..54e4b0d 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -1,19 +1,13 @@ module SessionsHelper - def sign_in(user) - #create a new remember token - remember_token = User.new_remember_token - #place token inside of the browser - cookies.permanent[:remember_token] = remember_token - #save the hashed token to the database - user.update_attribute(:remember_token, - User.hash(remember_token)) - #set the current user to be the given user - self.current_user = user - end + @session = Session.new(user: user) + raw_token = @session.create_token + @session.save # FIXME: error handling - # The curret_user=(user) is the conversion of self.current_user = user - def current_user=(user) + @token = Session.hash_token(raw_token) + cookies.permanent[:remember_token] = raw_token + + #set the current user to be the given user @current_user = user end @@ -22,8 +16,9 @@ module SessionsHelper # 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) + @token ||= Session.hash_token(cookies[:remember_token]) + @session ||= Session.find_by(token: @token) + @current_user ||= (@session.nil? ? nil : @session.user) end # checks if someone is currently signed in @@ -32,9 +27,11 @@ module SessionsHelper end def sign_out - current_user.update_attribute(:remember_token, User.hash(User.new_remember_token)) + if signed_in? + @session.destroy + end + @current_user = nil cookies.delete(:remember_token) - self.current_user = nil end # This is for anyone that cares about how long a user is signed -- cgit v1.2.3-2-g168b