Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk

Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic@capeannenterprises.com>

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 649aa2b0df2a8a72941d399dbd3b5728c3f349db..c94ce89395840452398e8d2b7944cbaf64df3b71 100644 (file)
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -402,7 +402,7 @@ class ApplicationController < ActionController::Base
   def set_cors_headers
     response.headers['Access-Control-Allow-Origin'] = '*'
     response.headers['Access-Control-Allow-Methods'] = 'GET, HEAD, PUT, POST, DELETE'
-    response.headers['Access-Control-Allow-Headers'] = 'Authorization'
+    response.headers['Access-Control-Allow-Headers'] = 'Authorization, Content-Type'
     response.headers['Access-Control-Max-Age'] = '86486400'
   end
 

diff --git a/services/api/test/integration/cross_origin_test.rb b/services/api/test/integration/cross_origin_test.rb
index 0dd8146bddbbd14b7d55583dec44e340557c8a23..ee2f699339f8a66fbc2efc6bd457b33b8c41411f 100644 (file)
--- a/services/api/test/integration/cross_origin_test.rb
+++ b/services/api/test/integration/cross_origin_test.rb
@@ -69,7 +69,7 @@ class CrossOriginTest < ActionDispatch::IntegrationTest
     %w(GET HEAD POST PUT DELETE).each do |m|
       assert_includes allowed, m, "A-C-A-Methods should include #{m}"
     end
-    assert_equal 'Authorization', response.headers['Access-Control-Allow-Headers']
+    assert_equal 'Authorization, Content-Type', response.headers['Access-Control-Allow-Headers']
   end
 
   def assert_no_cors_headers