Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #3632 - Monitoring endpoint complains about Failed to run SessionTimeoutJob.perform_now after 10 tries #<NoMethodError: undefined method id' for nil:NilClass`.

Browse source
This commit is contained in:
Rolf Schmidt 2021-06-24 15:37:59 +00:00 committed by Thorsten Eckel
parent 0d5655cedd
commit 548ab91398
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/jobs/session_timeout_job.rb
View file

@ -28,7 +28,7 @@ class SessionTimeoutJob < ApplicationJob
@active_session ||= {}
return @active_session[user.id] if @active_session[user.id].present?
@active_session[user.id] = sessions.detect { |session| session.active? && session.user.id == user.id }
@active_session[user.id] = sessions.detect { |session| session.active? && session.user? && session.user.id == user.id }
end
def sessions

2
spec/factories/active_record/session_store/session.rb
View file

@ -9,7 +9,7 @@ FactoryBot.define do
session_id { SecureRandom.hex(16) }
data do
{
'user_id' => user.id,
'user_id' => user&.id,
'ping' => Time.zone.now,
'user_agent' => 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.128 Safari/537.36',
'_csrf_token' => 'Yq3XiEgXxWPCURa/FvpXmptZCjgWhyPpGGIvZj9Eea0='

14
spec/jobs/session_timeout_job_spec.rb
View file

@ -183,4 +183,18 @@ RSpec.describe SessionTimeoutJob, type: :job do
expect(PushMessages).not_to have_received(:send_to).with(user.id, { event: 'session_timeout' })
end
end
context 'without user in session' do
let(:user) { create(:admin) }
before do
Setting.set('session_timeout', { admin: 30.minutes.to_s })
create(:active_session, user: nil)
end
it 'does not crash' do
travel_to 1.hour.from_now
expect { described_class.perform_now }.not_to raise_error
end
end
end