scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4667 from rekonder/fix_session_end

Browse source 
Fix session end for remember me [SCI-7502
This commit is contained in:
Alex Kriuchykhin 2022-11-30 12:12:45 +01:00 committed by GitHub
parent 8ba9e93cc8 a2dbf79716
commit 25e6a51be8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/users/sessions_controller.rb
View file

@ -36,10 +36,11 @@ class Users::SessionsController < Devise::SessionsController
end
def expire_in
if current_user.remember_created_at.nil?
if current_user.remember_created_at.nil? || (current_user.remember_created_at + Devise.remember_for).past?
render plain: (Devise.timeout_in.to_i - (Time.now.to_i - user_session['last_request_at']).round) * 1000
else
render plain: (Devise.remember_for - (Time.now.to_i - current_user.remember_created_at.to_i).round) * 1000
render plain: [(Devise.remember_for - (Time.now.to_i - current_user.remember_created_at.to_i).round) * 1000,
(Devise.timeout_in.to_i - (Time.now.to_i - user_session['last_request_at']).round) * 1000].max
end
end