mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Disable API access when login is disabled (#7289)

This commit is contained in:
Eugen Rochko 2018-04-30 09:13:14 +02:00 committed by GitHub
parent 295e3ef02b
commit f62ee1ddb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/base_controller.rb
View File

@ -66,8 +66,10 @@ class Api::BaseController < ApplicationController
end end
def require_user! def require_user!
if current_user if current_user && !current_user.disabled?
set_user_activity set_user_activity
elsif current_user
render json: { error: 'Your login is currently disabled' }, status: 403
else else
render json: { error: 'This method requires an authenticated user' }, status: 422 render json: { error: 'This method requires an authenticated user' }, status: 422
end end