1
0
mirror of https://github.com/funamitech/mastodon synced 2024-11-27 14:29:03 +09:00

Fix sessions being replaced needlessly (#4292)

This commit is contained in:
Eugen Rochko 2017-07-22 01:09:10 +02:00 committed by GitHub
parent 3817704806
commit 8d6c3cd48a

View File

@ -1,8 +1,12 @@
Warden::Manager.after_set_user except: :fetch do |user, warden|
SessionActivation.deactivate warden.cookies.signed['_session_id']
if user.session_active?(warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'])
session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']
else
session_id = user.activate_session(warden.request)
end
warden.cookies.signed['_session_id'] = {
value: user.activate_session(warden.request),
value: session_id,
expires: 1.year.from_now,
httponly: true,
}