#1225 use X-Airbrake-Token header when present (#1227)

errbit · Sep 19, 2017 · 24b824d · 24b824d
1 parent 7d7c81f
commit 24b824d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/controllers/api/v3/notices_controller.rb b/app/controllers/api/v3/notices_controller.rb
@@ -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?

diff --git a/spec/controllers/api/v3/notices_controller_spec.rb b/spec/controllers/api/v3/notices_controller_spec.rb
@@ -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)