From 12a265d1eb97114b3ec5a6a9d826ba92c5287a09 Mon Sep 17 00:00:00 2001 From: Steven Hsieh Date: Wed, 19 Feb 2020 10:51:36 -0800 Subject: [PATCH] optimize earlier timeout_skip to avoid unecessary record lookup --- lib/devise/hooks/timeoutable.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/devise/hooks/timeoutable.rb b/lib/devise/hooks/timeoutable.rb index 41b1fde8..772eb142 100644 --- a/lib/devise/hooks/timeoutable.rb +++ b/lib/devise/hooks/timeoutable.rb @@ -21,8 +21,8 @@ Warden::Manager.after_set_user do |record, warden, options| proxy = Devise::Hooks::Proxy.new(warden) - if record.timedout?(last_request_at) && - !env['devise.skip_timeout'] && + if !env['devise.skip_timeout'] && + record.timedout?(last_request_at) && !proxy.remember_me_is_active?(record) Devise.sign_out_all_scopes ? proxy.sign_out : proxy.sign_out(scope) throw :warden, scope: scope, message: :timeout