X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/af13c423221bec074e8f17bf0cc77ecc9e0c98c6..399ade116adb8250bbf92efa8dfeb3ca1090c7e4:/lib/session_persistence.rb?ds=inline diff --git a/lib/session_persistence.rb b/lib/session_persistence.rb index 7d45d1fc4..6bd05f5ce 100644 --- a/lib/session_persistence.rb +++ b/lib/session_persistence.rb @@ -20,13 +20,17 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. module SessionPersistence - private + class << self + private - # Install filter when we are included - def self.included(controller) - controller.after_filter :persist_session + # Install filter when we are included + def included(controller) + controller.after_action :persist_session + end end + private + # Override this method if you don't want to use session[:_remember_for]. def session_persistence_key :_remember_for @@ -37,7 +41,7 @@ module SessionPersistence # session_expires_after 1.hour # session_expires_after 2.weeks def session_expires_after(seconds) - session[session_persistence_key] = seconds + session[session_persistence_key] = seconds.to_i end # Expire the session. @@ -48,8 +52,8 @@ module SessionPersistence # Filter callback def persist_session - if session[session_persistence_key] - request.session_options[:expire_after] = session[session_persistence_key] - end + request.session_options[:expire_after] = session[session_persistence_key] if session[session_persistence_key] + rescue StandardError + reset_session end end