diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a9e5a5b2d..ef04abf9c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -74,12 +74,12 @@ class ApplicationController < ActionController::Base end def authentication_check_only - puts '----' + puts 'authentication_check' #puts params.inspect - puts session.inspect - puts cookies.inspect - puts '----' + #puts session.inspect + #puts cookies.inspect + # check http basic auth authenticate_with_http_basic do |username, password| puts 'http basic auth check' diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 0a5e0ffe1..9ddb62075 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -21,19 +21,18 @@ class SessionsController < ApplicationController default_collection = SessionHelper::default_collections(user) # remember me - set session cookie to expire later -puts "RACK " + request.env['rack.session.options'].inspect if params[:remember_me] request.env['rack.session.options'][:expire_after] = 1.year else request.env['rack.session.options'][:expire_after] = nil end -# reset_session -puts "RACK2 " + request.env['rack.session.options'].inspect + # both not needed to set :expire_after works fine + # request.env['rack.session.options'][:renew] = true + # reset_session # set session user_id user = User.find_fulldata(user.id) - puts "..." - puts session.inspect + # check logon session logon_session_key = nil if params['logon_session'] @@ -48,10 +47,6 @@ puts "RACK2 " + request.env['rack.session.options'].inspect session[:user_id] = user['id'] end - puts ".222.." - puts session.inspect - puts cookies.inspect - # return new session data render :json => { :session => user,