Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1225 - Use X-Airbrake-Token header when present #1227

Merged
merged 1 commit into from Sep 19, 2017
Merged

Fix #1225 - Use X-Airbrake-Token header when present #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/controllers/api/v3/notices_controller.rb
View file
Open in desktop
Expand Up @@ -12,8 +12,9 @@ def create
response.headers['Access-Control-Allow-Headers'] = 'origin, content-type, accept'
return render(status: 200, text: '') if request.method == 'OPTIONS'

report = AirbrakeApi::V3::NoticeParser.new(
params.merge(JSON.parse(request.raw_post) || {})).report
merged_params = params.merge(JSON.parse(request.raw_post) || {})
merged_params = merged_params.merge('key' => request.headers['X-Airbrake-Token']) if request.headers['X-Airbrake-Token']
report = AirbrakeApi::V3::NoticeParser.new(merged_params).report

return render text: UNKNOWN_API_KEY, status: 422 unless report.valid?
return render text: VERSION_TOO_OLD, status: 422 unless report.should_keep?
Expand Down
6 changes: 6 additions & 0 deletions spec/controllers/api/v3/notices_controller_spec.rb
View file
Open in desktop
Expand Up @@ -32,6 +32,12 @@
expect(response.status).to be(201)
end

it 'responds with 201 created on success with token in headers' do
request.headers['X-Airbrake-Token'] = project_id
post :create, legit_body, project_id: 123
expect(response.status).to be(201)
end

it 'responds with 400 when request attributes are not valid' do
allow_any_instance_of(AirbrakeApi::V3::NoticeParser).
to receive(:report).and_raise(AirbrakeApi::ParamsError)
Expand Down