Improved time of setting session user.
This commit is contained in:
parent
88e827e686
commit
b8277bbd58
1 changed files with 19 additions and 6 deletions
|
@ -14,6 +14,10 @@ class SessionsController < ApplicationController
|
|||
return
|
||||
end
|
||||
|
||||
# set session user
|
||||
current_user_set(user)
|
||||
|
||||
# log new session
|
||||
user.activity_stream_log( 'session started', user.id )
|
||||
|
||||
# auto population of default collections
|
||||
|
@ -42,8 +46,6 @@ class SessionsController < ApplicationController
|
|||
# :user_id => user['id']
|
||||
# }
|
||||
# )
|
||||
else
|
||||
session[:user_id] = user['id']
|
||||
end
|
||||
|
||||
# return new session data
|
||||
|
@ -125,12 +127,15 @@ class SessionsController < ApplicationController
|
|||
authorization = Authorization.create_from_hash(auth, current_user)
|
||||
end
|
||||
|
||||
# set current session user
|
||||
current_user_set(authorization.user)
|
||||
|
||||
# log new session
|
||||
user.activity_stream_log( 'session started', authorization.user.id )
|
||||
|
||||
# remember last login date
|
||||
authorization.user.update_last_login
|
||||
|
||||
# Log the authorizing user in.
|
||||
session[:user_id] = authorization.user.id
|
||||
|
||||
# redirect to app
|
||||
redirect_to '/'
|
||||
end
|
||||
|
@ -140,7 +145,15 @@ class SessionsController < ApplicationController
|
|||
|
||||
# Log the authorizing user in.
|
||||
if user
|
||||
session[:user_id] = user.id
|
||||
|
||||
# set current session user
|
||||
current_user_set(user)
|
||||
|
||||
# log new session
|
||||
user.activity_stream_log( 'session started', user.id )
|
||||
|
||||
# remember last login date
|
||||
user.update_last_login
|
||||
end
|
||||
|
||||
# redirect to app
|
||||
|
|
Loading…
Reference in a new issue