diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-26 23:14:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-26 23:14:09 +0200 |
| commit | 6d13901e4c1f660a25420b623cbfea6966b218b9 (patch) | |
| tree | c1376f9a3a7533c2d43fc9e281c92d168e941846 /app/controllers/api | |
| parent | a33a0f69523298520704b98d4dc7fdd1accae642 (diff) | |
| parent | 7c6fff34d059c90eafdb1beeb2597a9606453582 (diff) | |
Merge pull request #1785 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index d96285b44..2e393fbb6 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -11,6 +11,7 @@ class Api::BaseController < ApplicationController skip_before_action :require_functional!, unless: :whitelist_mode? before_action :require_authenticated_user!, if: :disallow_unauthenticated_api_access? + before_action :require_not_suspended! before_action :set_cache_headers protect_from_forgery with: :null_session @@ -97,6 +98,10 @@ class Api::BaseController < ApplicationController render json: { error: 'This method requires an authenticated user' }, status: 401 unless current_user end + def require_not_suspended! + render json: { error: 'Your login is currently disabled' }, status: 403 if current_user&.account&.suspended? + end + def require_user! if !current_user render json: { error: 'This method requires an authenticated user' }, status: 422 |