diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-14 05:28:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 05:28:30 +0100 |
| commit | 51e154f5e87968d6bb115e053689767ab33e80cd (patch) | |
| tree | d86ba475bfc61ba7a774bf36e24704dc82f68991 /app/controllers/api/base_controller.rb | |
| parent | 6e3936aa6f4296ac202b54c0b178b4fa825d7885 (diff) | |
Admission-based registrations mode (#10250)
Fix #6856 Fix #6951
Diffstat (limited to 'app/controllers/api/base_controller.rb')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index a1dd30918..3a92ee4e4 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -73,7 +73,9 @@ class Api::BaseController < ApplicationController elsif current_user.disabled? render json: { error: 'Your login is currently disabled' }, status: 403 elsif !current_user.confirmed? - render json: { error: 'Email confirmation is not completed' }, status: 403 + 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 else set_user_activity end |