X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0654be27f9826e6cca4b88c03b39517214612351..a638220ff7a44bb54845535cb833d983e2eeac56:/config/initializers/oauth.rb?ds=inline diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb index c89778551..812e6610d 100644 --- a/config/initializers/oauth.rb +++ b/config/initializers/oauth.rb @@ -1,9 +1,26 @@ require "oauth/controllers/provider_controller" +require "oauth/helper" require "oauth/rack/oauth_filter" Rails.configuration.middleware.use OAuth::Rack::OAuthFilter module OAuth + 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 unescape(value) + value.to_s.gsub(/%\h{2}/) do |c| + c[1..].to_i(16).chr + end.force_encoding(Encoding::UTF_8) + end + end + module RequestProxy class RackRequest def method @@ -23,12 +40,12 @@ module OpenStreetMap def render(options = {}) text = options.delete(:text) if text - super options.merge(:plain => text) + super(options.merge(:plain => text)) elsif options.delete(:nothing) status = options.delete(:status) || :ok head status, options else - super options + super end end @@ -44,7 +61,7 @@ module OpenStreetMap end end - super controller + super end end end