mirror/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon synced 2024-11-28 06:48:28 +09:00
Code

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

Browse Source
This commit is contained in:
abcang 2017-08-15 21:14:12 +09:00 committed by Eugen Rochko
parent 4fcbb1f838
commit e120d09c98
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/api/base_controller.rb
View 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