From e120d09c982d0108bdcdb3dd4d3800870b9e3f8c Mon Sep 17 00:00:00 2001 From: abcang Date: Tue, 15 Aug 2017 21:14:12 +0900 Subject: [PATCH] Fix require_user! behavior when not logged in (#4604) --- app/controllers/api/base_controller.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 105a2859d..6ede63c79 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -62,10 +62,11 @@ class Api::BaseController < ApplicationController end def require_user! - current_resource_owner - set_user_activity - rescue ActiveRecord::RecordNotFound - render json: { error: 'This method requires an authenticated user' }, status: 422 + if current_user + set_user_activity + else + render json: { error: 'This method requires an authenticated user' }, status: 422 + end end def render_empty