]> cat aescling's git repositories - mastodon.git/commitdiff
Fix require_user! behavior when not logged in (#4604)
authorabcang <abcang1015@gmail.com>
Tue, 15 Aug 2017 12:14:12 +0000 (21:14 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 15 Aug 2017 12:14:12 +0000 (14:14 +0200)
app/controllers/api/base_controller.rb

index 105a2859d3ec178b6c497587fafe3db44eebf93f..6ede63c79096e85b8cf382a64797bbdc51e207b6 100644 (file)
@@ -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