@@ -6,7 +6,7 @@ module Authlogic module Session def self.included(klass) klass.after_save :update_session, :if => :persisting? - klass.after_destroy :reset_session, :if => :persisting? + klass.after_destroy :update_session, :if => :persisting? klass.after_find :update_session, :if => :persisting? # to continue persisting the session after an http_auth request end @@ -36,16 +36,9 @@ module Authlogic [controller.session[session_key], controller.session["#{session_key}_id"]].compact end - def reset_session - controller.session[session_key] = nil - controller.session["#{session_key}_id"] = nil - end - def update_session - if record - controller.session[session_key] = record.send(persistence_token_field) - controller.session["#{session_key}_id"] = record.send(record.class.primary_key) - end + controller.session[session_key] = record && record.send(persistence_token_field) + controller.session["#{session_key}_id"] = record && record.send(record.class.primary_key) end end end lib/authlogic/session/session.rb @@ -40,8 +40,12 @@ module SessionTests set_session_for(ben) session = UserSession.find assert !session.stale? - session.record.last_request_at = 3.years.ago + + ben.update_attribute(:last_request_at, 3.years.ago) + session = UserSession.find assert session.stale? + assert_nil @controller.session["user_credentials"] + assert_nil @controller.session["user_credentials_id"] UserSession.logout_on_timeout = false end @@ -55,6 +59,7 @@ module SessionTests assert session.stale? ben.update_attribute(:last_request_at, Time.now) + set_session_for(ben) session = UserSession.find assert !session.stale? end test/session_tests/timeout_test.rb 61ce15d1123e89ac1261b9e98a86f0aabfdc4678 binarylogic bjohnson@binarylogic.com http://github.com/binarylogic/authlogic/commit/febb7c170046fa6693bf0647fd6edb488045a20d febb7c170046fa6693bf0647fd6edb488045a20d 2009-02-11T13:44:54-08:00 2009-02-11T13:44:54-08:00 Fixed logout on stale bug c500e6254d20156341c5295cb2aea3be7388d5d1 binarylogic bjohnson@binarylogic.com