X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5cbd4038edb32b0304bd766e70fc680ea447b52b..8f1676b71ae32eca2706b582f65bcefec2285976:/config/initializers/oauth.rb diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb index fa9685d70..3b4f06a2e 100644 --- a/config/initializers/oauth.rb +++ b/config/initializers/oauth.rb @@ -1,4 +1,5 @@ -require 'oauth/rack/oauth_filter' +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)