From 2d80cd12ff5ef5d82f93e48019c188fe2a863c80 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 6 Jun 2017 10:02:10 +0100
Subject: [PATCH] Monkey patch oauth-plugin to avoid using deprecated methods

---
 config/initializers/oauth.rb | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index 437a00c97..3b4f06a2e 100644
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -1,3 +1,4 @@
+require "oauth/controllers/provider_controller"
 require "oauth/rack/oauth_filter"
 
 Rails.configuration.middleware.use OAuth::Rack::OAuthFilter
@@ -11,3 +12,41 @@ module OAuth
     end
   end
 end
+
+module OpenStreetMap
+  module ProviderController
+    def self.prepended(mod)
+      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 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
+    end
+  end
+end
+
+OAuth::Controllers::ProviderController.prepend(OpenStreetMap::ProviderController)
-- 
2.43.2