X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bda8544d94a10b2ae20db86a2140058d8fe86e30..2c497aee7a45c31ae6d1a448c35ce1b3f0ebb608:/app/controllers/oauth_controller.rb?ds=sidebyside

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 38006fd35..cd7e48277 100644
--- 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,14 +21,13 @@ class OauthController < ApplicationController
   def login_required
     authorize_web
     set_locale
-    require_user
   end
 
   def user_authorizes_token?
     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
@@ -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"
@@ -65,7 +66,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!