Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed debug infos.

Browse source
This commit is contained in:
Martin Edenhofer 2013-06-25 13:54:13 +02:00
parent 55d0672e9a
commit 7ada8cbec4
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/application_controller.rb
View file

@ -74,12 +74,12 @@ class ApplicationController < ActionController::Base
end end
def authentication_check_only def authentication_check_only
puts '----'
puts 'authentication_check' puts 'authentication_check'
#puts params.inspect #puts params.inspect
puts session.inspect #puts session.inspect
puts cookies.inspect #puts cookies.inspect
puts '----'
# check http basic auth # check http basic auth
authenticate_with_http_basic do |username, password| authenticate_with_http_basic do |username, password|
puts 'http basic auth check' puts 'http basic auth check'

13
app/controllers/sessions_controller.rb
View file

@ -21,19 +21,18 @@ class SessionsController < ApplicationController
default_collection = SessionHelper::default_collections(user) default_collection = SessionHelper::default_collections(user)
# remember me - set session cookie to expire later # remember me - set session cookie to expire later
puts "RACK " + request.env['rack.session.options'].inspect
if params[:remember_me] if params[:remember_me]
request.env['rack.session.options'][:expire_after] = 1.year request.env['rack.session.options'][:expire_after] = 1.year
else else
request.env['rack.session.options'][:expire_after] = nil request.env['rack.session.options'][:expire_after] = nil
end end
# reset_session # both not needed to set :expire_after works fine
puts "RACK2 " + request.env['rack.session.options'].inspect # request.env['rack.session.options'][:renew] = true
# reset_session
# set session user_id # set session user_id
user = User.find_fulldata(user.id) user = User.find_fulldata(user.id)
puts "..."
puts session.inspect
# check logon session # check logon session
logon_session_key = nil logon_session_key = nil
if params['logon_session'] if params['logon_session']
@ -48,10 +47,6 @@ puts "RACK2 " + request.env['rack.session.options'].inspect
session[:user_id] = user['id'] session[:user_id] = user['id']
end end
puts ".222.."
puts session.inspect
puts cookies.inspect
# return new session data # return new session data
render :json => { render :json => {
:session => user, :session => user,