X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a92223a50672201070bbf659b1e99bbda6edadbd..1e13e6ae2d5326d93ec3c55daaac08d884d69265:/app/controllers/application_controller.rb?ds=sidebyside

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5018dcc42..e22f64c76 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -106,7 +106,7 @@ class ApplicationController < ActionController::Base
   # is optional.
   def setup_user_auth
     # try and setup using OAuth
-    if oauthenticate
+    if Authenticator.new(self, [:token]).allow?
       @user = current_token.user
     else
       username, passwd = get_auth_data # parse from headers
@@ -358,4 +358,8 @@ private
     return [user, pass] 
   end 
 
+  # override to stop oauth plugin sending errors
+  def invalid_oauth_response
+  end
+
 end