Merge pull request #495 from jvlcek/bz_1599259_CORS

Add subcollection options support for CORS prefilghted requests

(cherry picked from commit 3502e51)

https://bugzilla.redhat.com/show_bug.cgi?id=1599259

app/controllers/api/base_controller.rb

@@ -103,7 +103,11 @@ def destroy
     end
 
     def options
-      render_options(@req.collection)
+      if params.key?(:subcollection)
+        render :json => ""
+      else
+        render_options(@req.collection)
+      end
     end
 
     def settings

config/routes.rb

@@ -53,6 +53,9 @@
         end
 
         Array(collection.subcollections).each do |subcollection_name|
+          # OPTIONS action for each subcollection
+          match "/:c_id/#{subcollection_name}", :controller => collection_name, :action => :options, :via => :options, :as => nil, :subcollection => true
+
           if subcollection_name == :settings
             match(
               "/:c_id/settings",

spec/requests/tenant_quotas_spec.rb

@@ -131,6 +131,12 @@
       expect(response).to have_http_status(:no_content)
     end
 
+    it "supports OPTIONS requests on a subcollection without authorization" do
+      options api_tenant_quotas_url(nil, tenant)
+      expect(response).to have_http_status(:ok)
+      expect(response.body).to be_empty
+    end
+
     it "can delete multiple quotas from a tenant with POST" do
       api_basic_authorize action_identifier(:quotas, :delete, :subcollection_actions, :post)