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

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

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index 812e6610d9e67a46b1df270cd5a201cf41d3dff4..b0b993e90da722048e1856962386b86bdfe56a6f 100644 (file)
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -1,8 +1,4 @@
-require "oauth/controllers/provider_controller"

 require "oauth/helper"
 require "oauth/helper"

-require "oauth/rack/oauth_filter"
-
-Rails.configuration.middleware.use OAuth::Rack::OAuthFilter

 
 module OAuth
   module Helper
 
 module OAuth
   module Helper


@@ -20,71 +16,4 @@ module OAuth
       end.force_encoding(Encoding::UTF_8)
     end
   end
       end.force_encoding(Encoding::UTF_8)
     end
   end

-
-  module RequestProxy
-    class RackRequest
-      def method
-        request.request_method
-      end
-    end
-  end

 end
 end

-
-module OpenStreetMap
-  module ProviderController
-    def self.prepended(mod)
-      super
-      mod.singleton_class.prepend(OpenStreetMap::ProviderController::ClassMethods)
-    end
-
-    def render(options = {})
-      text = options.delete(:text)
-      if text
-        super(options.merge(:plain => text))
-      elsif options.delete(:nothing)
-        status = options.delete(:status) || :ok
-        head status, options
-      else
-        super
-      end
-    end
-
-    module ClassMethods
-      def included(controller)
-        controller.class_eval do
-          def self.before_filter(...)
-            before_action(...)
-          end
-
-          def self.skip_before_filter(...)
-            skip_before_action(...)
-          end
-        end
-
-        super
-      end
-    end
-  end
-
-  module OAuthFilter
-    def oauth1_verify(request, options = {}, &block)
-      signature = OAuth::Signature.build(request, options, &block)
-      return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp)
-
-      value = signature.verify
-      if request.ssl? && !value
-        http_request = request.dup
-        http_request.define_singleton_method(:scheme) { "http" }
-        http_request.define_singleton_method(:port) { 80 }
-        signature = OAuth::Signature.build(http_request, options, &block)
-        value = signature.verify
-      end
-      value
-    rescue OAuth::Signature::UnknownSignatureMethod
-      false
-    end
-  end
-end
-
-OAuth::Controllers::ProviderController.prepend(OpenStreetMap::ProviderController)
-OAuth::Rack::OAuthFilter.prepend(OpenStreetMap::OAuthFilter)