autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change account suspensions to be reversible by default (#14726)

Browse Source
This commit is contained in:
Eugen Rochko
2020-09-15 14:37:58 +02:00
committed by GitHub
parent bbcbf12215
commit ed099d8bdc
39 changed files with 526 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,12 +96,12 @@ class Api::BaseController < ApplicationController
def require_user!
if !current_user
render json: { error: 'This method requires an authenticated user' }, status: 422
elsif current_user.disabled?
render json: { error: 'Your login is currently disabled' }, status: 403
elsif !current_user.confirmed?
render json: { error: 'Your login is missing a confirmed e-mail address' }, status: 403
elsif !current_user.approved?
render json: { error: 'Your login is currently pending approval' }, status: 403
elsif !current_user.functional?
render json: { error: 'Your login is currently disabled' }, status: 403
else
set_user_activity
end