Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/controllers/api_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ class ::ParameterError < StandardError; end

private

def append_info_to_payload(payload)
super

origin = request.origin
payload[:origin] = origin if origin.present?
end

def bad_request(exception)
render_error_as_json(exception, :bad_request)
end
Expand Down
28 changes: 28 additions & 0 deletions spec/requests/api_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,34 @@ def index
Rails.application.reload_routes!
end

describe 'request logging' do
def completed_request_payload(headers: {})
payload = nil

callback = lambda do |event|
payload = event.payload
end

ActiveSupport::Notifications.subscribed(callback, 'process_action.action_controller') do
get '/test', headers:
end

payload
end

it 'includes the request origin in the completed request payload' do
payload = completed_request_payload(headers: { 'Origin' => 'https://editor.raspberrypi.org' })

expect(payload).to include(origin: 'https://editor.raspberrypi.org')
end

it 'omits the origin when the request does not include one' do
payload = completed_request_payload

expect(payload).not_to have_key(:origin)
end
end

context 'when ActionController::ParameterMissing is raised' do
before do
test_controller.error = ActionController::ParameterMissing.new('foo')
Expand Down
Loading