Merge pull request #4680 from tomhughes/validate-page-numbers

[rails.git] / app / controllers / oauth_controller.rb

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index babd27c536ffd4eaf4d813e2fce559678a2fbadc..49af05b0d188e814960468d0a0f335cfd989f62e 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -5,6 +5,8 @@ class OauthController < ApplicationController
   # a login, but we want to check authorization on every action.
   authorize_resource :class => false
 
+  before_action :require_oauth_10a_support
+
   layout "site"
 
   def revoke
@@ -27,7 +29,7 @@ class OauthController < ApplicationController
     any_auth = false
 
     @token.client_application.permissions.each do |pref|
-      if params[pref]
+      if params[pref].to_i.nonzero?
         @token.write_attribute(pref, true)
         any_auth ||= true
       else
@@ -66,7 +68,7 @@ class OauthController < ApplicationController
 
           @redirect_url.query += "&oauth_verifier=#{@token.verifier}" unless @token.oauth10?
 
-          redirect_to @redirect_url.to_s
+          redirect_to @redirect_url.to_s, :allow_other_host => true
         end
       else
         @token.invalidate!