Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: add request data to the before_session_destroy event (#16905)

This commit is contained in:
Jean 2022-05-31 18:18:56 -04:00 committed by GitHub
parent 41fa278c00
commit 9ac85d6163
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/session_controller.rb
View File

@ -566,7 +566,7 @@ class SessionController < ApplicationController
redirect_url ||= path("/") redirect_url ||= path("/")
event_data = { redirect_url: redirect_url, user: current_user } event_data = { redirect_url: redirect_url, user: current_user, client_ip: request&.ip, user_agent: request&.user_agent }
DiscourseEvent.trigger(:before_session_destroy, event_data) DiscourseEvent.trigger(:before_session_destroy, event_data)
redirect_url = event_data[:redirect_url] redirect_url = event_data[:redirect_url]

16
spec/requests/session_controller_spec.rb
View File

@ -2291,6 +2291,22 @@ describe SessionController do
ensure ensure
DiscourseEvent.off(:before_session_destroy, &callback) DiscourseEvent.off(:before_session_destroy, &callback)
end end
it 'includes ip and user agent in the before_session_destroy event params' do
callback_params = {}
callback = -> (data) { callback_params = data }
DiscourseEvent.on(:before_session_destroy, &callback)
user = sign_in(Fabricate(:user))
delete "/session/#{user.username}.json", xhr: true, headers: { HTTP_USER_AGENT: 'AwesomeBrowser' }
expect(callback_params[:user_agent]).to eq('AwesomeBrowser')
expect(callback_params[:client_ip]).to eq('127.0.0.1')
ensure
DiscourseEvent.off(:before_session_destroy, &callback)
end
end end
describe '#one_time_password' do describe '#one_time_password' do