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

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

diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index ee0b0d98fe236f74f9ce1e1a6fdba5fc528a31e6..7421bd3346868dc96b580ad14e6fe1dee61b701e 100644 (file)
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -1,4 +1,4 @@
-require "rack/cors"
+# Be sure to restart your server when you modify this file.

 
 # Mark CORS responses as uncacheable as we don't want a browser to
 # try and reuse a response that had a different origin, even with
 
 # Mark CORS responses as uncacheable as we don't want a browser to
 # try and reuse a response that had a different origin, even with


@@ -7,9 +7,7 @@ module OpenStreetMap
   class Cors < Rack::Cors
     def call(env)
       status, headers, body = super env
   class Cors < Rack::Cors
     def call(env)
       status, headers, body = super env

-      if headers["Access-Control-Allow-Origin"]
-        headers["Cache-Control"] = "no-cache"
-      end
+      headers["Cache-Control"] = "no-cache" if headers["Access-Control-Allow-Origin"]

       [status, headers, body]
     end
   end
       [status, headers, body]
     end
   end


@@ -20,13 +18,17 @@ end
 # so browser-requests should be similarly permitted. (Though the API does not
 # require any custom headers, Ajax frameworks may automatically add headers
 # such as X-Requested-By to requests.)
 # so browser-requests should be similarly permitted. (Though the API does not
 # require any custom headers, Ajax frameworks may automatically add headers
 # such as X-Requested-By to requests.)

-Rails.configuration.middleware.use OpenStreetMap::Cors do
+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