Merge remote-tracking branch 'upstream/pull/5386'

[rails.git] / config / initializers / cors.rb

diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index 7992ecdce015631749f425209dd83802b54ede21..e7b813b73f788fb7bf4cac947007c2ff0154340d 100644 (file)
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -6,7 +6,7 @@
 module OpenStreetMap
   class Cors < Rack::Cors
     def call(env)
 module OpenStreetMap
   class Cors < Rack::Cors
     def call(env)

-      status, headers, body = super env
+      status, headers, body = super

       headers["Cache-Control"] = "no-cache" if headers["Access-Control-Allow-Origin"]
       [status, headers, body]
     end
       headers["Cache-Control"] = "no-cache" if headers["Access-Control-Allow-Origin"]
       [status, headers, body]
     end


@@ -22,9 +22,13 @@ Rails.application.config.middleware.insert_before 0, OpenStreetMap::Cors do
   allow do
     origins "*"
     resource "/oauth/*", :headers => :any, :methods => [:get, :post]
   allow do
     origins "*"
     resource "/oauth/*", :headers => :any, :methods => [:get, :post]

+    resource "/oauth2/token", :headers => :any, :methods => [:post]
+    resource "/oauth2/revoke", :headers => :any, :methods => [:post]
+    resource "/oauth2/introspect", :headers => :any, :methods => [:post]

     resource "/api/*", :headers => :any, :methods => [:get, :post, :put, :delete]
     resource "/diary/rss", :headers => :any, :methods => [:get]
     resource "/diary/*/rss", :headers => :any, :methods => [:get]
     resource "/api/*", :headers => :any, :methods => [:get, :post, :put, :delete]
     resource "/diary/rss", :headers => :any, :methods => [:get]
     resource "/diary/*/rss", :headers => :any, :methods => [:get]

+    resource "/trace/*/data", :headers => :any, :methods => [:get]

     resource "/user/*/diary/rss", :headers => :any, :methods => [:get]
   end
 end
     resource "/user/*/diary/rss", :headers => :any, :methods => [:get]
   end
 end