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

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 38006fd35006b6e71be9b13d1e9450b47f3913aa..babd27c536ffd4eaf4d813e2fce559678a2fbadc 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -1,8 +1,10 @@
-require "oauth/controllers/provider_controller"
-
 class OauthController < ApplicationController
   include OAuth::Controllers::ProviderController
 
+  # The ProviderController will call login_required for any action that needs
+  # a login, but we want to check authorization on every action.
+  authorize_resource :class => false
+
   layout "site"
 
   def revoke
@@ -19,7 +21,6 @@ class OauthController < ApplicationController
   def login_required
     authorize_web
     set_locale
-    require_user
   end
 
   def user_authorizes_token?
@@ -38,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"