Fix require_user! behavior when not logged in (#4604)

2017-08-15 21:14:12 +09:00 · 2017-08-15 21:14:12 +09:00 · e120d09c98
parent 4fcbb1f838
commit e120d09c98
1 changed files with 5 additions and 4 deletions
--- 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