From 4b2ecc3fac32b2d9866ddc324c66ad7260e310f4 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Tue, 25 Oct 2016 10:35:10 +0800 Subject: [PATCH] token overrides current user in api --- app/controllers/api/v2/restful_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v2/restful_controller.rb b/app/controllers/api/v2/restful_controller.rb index b64682f3..7cc6a44c 100644 --- 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