X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aa1fb6dbb8c2e71b8ce8c231ae1272a2dfebd75a..1c3e4746b0c901c19722ee6443266de325cca668:/config/initializers/oauth.rb?ds=inline

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index 3b4f06a2e..b0b993e90 100644
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -1,52 +1,19 @@
-require "oauth/controllers/provider_controller"
-require "oauth/rack/oauth_filter"
-
-Rails.configuration.middleware.use OAuth::Rack::OAuthFilter
+require "oauth/helper"
 
 module OAuth
-  module RequestProxy
-    class RackRequest
-      def method
-        request.request_method
-      end
-    end
-  end
-end
-
-module OpenStreetMap
-  module ProviderController
-    def self.prepended(mod)
-      mod.singleton_class.prepend(OpenStreetMap::ProviderController::ClassMethods)
+  module Helper
+    def escape(value)
+      value.to_s.gsub(OAuth::RESERVED_CHARACTERS) do |c|
+        c.bytes.map do |b|
+          format("%%%02X", b)
+        end.join
+      end.force_encoding(Encoding::US_ASCII)
     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 options
-      end
-    end
-
-    module ClassMethods
-      def included(controller)
-        controller.class_eval do
-          def self.before_filter(*names, &blk)
-            before_action(*names, &blk)
-          end
-
-          def self.skip_before_filter(*names, &blk)
-            skip_before_action(*names, &blk)
-          end
-        end
-
-        super controller
-      end
+    def unescape(value)
+      value.to_s.gsub(/%\h{2}/) do |c|
+        c[1..].to_i(16).chr
+      end.force_encoding(Encoding::UTF_8)
     end
   end
 end
-
-OAuth::Controllers::ProviderController.prepend(OpenStreetMap::ProviderController)