token overrides current user in api

2016-10-25 10:35:10 +08:00 · 2016-10-25 10:35:10 +08:00 · 4b2ecc3fac
commit 4b2ecc3fac
parent 47bca5907e
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/api/v2/restful_controller.rb
+++ b/app/controllers/api/v2/restful_controller.rb
@ -45,7 +45,7 @@ module Api
      end

      def current_user
-        super || token_user || doorkeeper_user || nil
+        token_user || super || doorkeeper_user || nil
      end

      def load_resource