specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Fix sessions being replaced needlessly (#4292)

Browse source
This commit is contained in:
Eugen Rochko 2017-07-22 01:09:10 +02:00 committed by GitHub
parent 3817704806
commit 8d6c3cd48a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/initializers/devise.rb
View file

@ -1,8 +1,12 @@
Warden::Manager.after_set_user except: :fetch do |user, warden| 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'] = { warden.cookies.signed['_session_id'] = {
value: user.activate_session(warden.request), value: session_id,
expires: 1.year.from_now, expires: 1.year.from_now,
httponly: true, httponly: true,
} }