mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-22 23:20:44 +01:00
Fix sessions being replaced needlessly (#4292)
This commit is contained in:
parent
3817704806
commit
8d6c3cd48a
1 changed files with 6 additions and 2 deletions
|
@ -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,
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue