Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-09-15 01:15:41 -05:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge 4e834b3f24 into 4f062c8c7b

Browse Source
This commit is contained in:
Claire
2026-06-09 09:11:53 +00:00
committed by GitHub
parent 4f062c8c7b 4e834b3f24
commit ec53b810f7
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,13 +64,15 @@ class Api::BaseController < ApplicationController
def require_user!
if !current_user
render json: { error: 'This method requires an authenticated user' }, status: 422
render json: { error: 'This method requires an authenticated user', error_code: 'auth_required' }, status: 422
elsif !current_user.confirmed?
render json: { error: 'Your login is missing a confirmed e-mail address' }, status: 403
render json: { error: 'Your login is missing a confirmed e-mail address', error_code: 'unconfirmed_email' }, status: 403
elsif !current_user.approved?
render json: { error: 'Your login is currently pending approval' }, status: 403
render json: { error: 'Your login is currently pending approval', error_code: 'account_pending_approval' }, status: 403
elsif current_user.missing_2fa?
render json: { error: 'Your account requires two-factor authentication', error_code: 'unmet_2fa_requirement', action_url: mfa_setup_path }, status: 403
elsif !current_user.functional?
render json: { error: 'Your login is currently disabled' }, status: 403
render json: { error: 'Your login is currently disabled', error_code: 'account_disabled' }, status: 403
else
update_user_sign_in
end

8
app/controllers/application_controller.rb
View File

@@ -74,13 +74,13 @@ class ApplicationController < ActionController::Base
format.json do
if !current_user.confirmed?
render json: { error: 'Your login is missing a confirmed e-mail address' }, status: 403
render json: { error: 'Your login is missing a confirmed e-mail address', error_code: 'unconfirmed_email' }, status: 403
elsif !current_user.approved?
render json: { error: 'Your login is currently pending approval' }, status: 403
render json: { error: 'Your login is currently pending approval', error_code: 'account_pending_approval' }, status: 403
elsif current_user.missing_2fa?
render json: { error: 'Your account requires two-factor authentication' }, status: 403
render json: { error: 'Your account requires two-factor authentication', error_code: 'unmet_2fa_requirement', action_url: mfa_setup_path }, status: 403
elsif !current_user.functional?
render json: { error: 'Your login is currently disabled' }, status: 403
render json: { error: 'Your login is currently disabled', error_code: 'account_disabled' }, status: 403
end
end
end