|
|
|
@ -299,9 +299,11 @@ class ApplicationController < ActionController::Base
|
|
|
|
|
# and starts a session if needed
|
|
|
|
|
def find_current_user
|
|
|
|
|
uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
|
|
|
|
|
if session[:user_id]
|
|
|
|
|
uid_logger("0000000000000user setup start: session[:user_id] is #{session[:"#{default_yun_session}"]}")
|
|
|
|
|
current_domain_session = session[:"#{default_yun_session}"]
|
|
|
|
|
if current_domain_session
|
|
|
|
|
# existing session
|
|
|
|
|
(User.active.find(session[:user_id]) rescue nil)
|
|
|
|
|
(User.active.find(current_domain_session) rescue nil)
|
|
|
|
|
elsif autologin_user = try_to_autologin
|
|
|
|
|
autologin_user
|
|
|
|
|
elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
|
|
|
|
@ -313,10 +315,10 @@ class ApplicationController < ActionController::Base
|
|
|
|
|
def try_to_autologin
|
|
|
|
|
if cookies[autologin_cookie_name]
|
|
|
|
|
# auto-login feature starts a new session
|
|
|
|
|
user = User.try_to_autologin(cookies[autologin_cookie_name])
|
|
|
|
|
if user
|
|
|
|
|
start_user_session(user)
|
|
|
|
|
end
|
|
|
|
|
user = nil
|
|
|
|
|
Rails.logger.info("111111111111111111#{default_yun_session}, session is #{session[:"#{default_yun_session}"]} ")
|
|
|
|
|
user = User.try_to_autologin(cookies[autologin_cookie_name]) if session[:"#{default_yun_session}"]
|
|
|
|
|
start_user_session(user) if user
|
|
|
|
|
user
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|