Remove hidden comments test from controller tests

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 225fc0677a39b3fcd7951c7e7d8b5be56fabb62f..cd7e48277a2517b23e49af4cdb31eddfd396a762 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -27,7 +27,7 @@ class OauthController < ApplicationController
     any_auth = false
 
     @token.client_application.permissions.each do |pref|
     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
         @token.write_attribute(pref, true)
         any_auth ||= true
       else


@@ -39,7 +39,7 @@ class OauthController < ApplicationController
   end
 
   def oauth1_authorize
   end
 
   def oauth1_authorize

-    override_content_security_policy_directives(:form_action => []) if CSP_ENFORCE || defined?(CSP_REPORT_URL)
+    override_content_security_policy_directives(:form_action => []) if Settings.csp_enforce || Settings.key?(:csp_report_url)

 
     if @token.invalidated?
       @message = t "oauth.authorize_failure.invalid"
 
     if @token.invalidated?
       @message = t "oauth.authorize_failure.invalid"


@@ -66,7 +66,7 @@ class OauthController < ApplicationController
 
           @redirect_url.query += "&oauth_verifier=#{@token.verifier}" unless @token.oauth10?
 
 
           @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!
         end
       else
         @token.invalidate!