Merge remote-tracking branch 'upstream/pull/3484'

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 225fc0677a39b3fcd7951c7e7d8b5be56fabb62f..7ab7f68359c52e7498ee6e5b0e15dcdda2dedeb1 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|
-      if params[pref]
+      if params[pref].to_i.nonzero?
         @token.write_attribute(pref, true)
         any_auth ||= true
       else
@@ -39,7 +39,7 @@ class OauthController < ApplicationController
   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"