mirror of
https://github.com/whippyshou/mastodon
synced 2024-11-24 23:26:31 +09:00
964ae8eee5
Allow access to account settings, 2FA, authorized applications, and account deletions to unconfirmed and pending users, as well as users who had their accounts disabled. Suspended users cannot update their e-mail or password or delete their account. Display account status on account settings page, for example, when an account is frozen, limited, unconfirmed or pending review. After sign up, login users straight away and show a simple page that tells them the status of their account with links to account settings and logout, to reduce onboarding friction and allow users to correct wrongly typed e-mail addresses. Move the final sign-up step of SSO integrations to be the same as above to reduce code duplication.
50 lines
1.3 KiB
Ruby
50 lines
1.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Settings
|
|
class TwoFactorAuthenticationsController < BaseController
|
|
layout 'admin'
|
|
|
|
before_action :authenticate_user!
|
|
before_action :verify_otp_required, only: [:create]
|
|
|
|
skip_before_action :require_functional!
|
|
|
|
def show
|
|
@confirmation = Form::TwoFactorConfirmation.new
|
|
end
|
|
|
|
def create
|
|
current_user.otp_secret = User.generate_otp_secret(32)
|
|
current_user.save!
|
|
redirect_to new_settings_two_factor_authentication_confirmation_path
|
|
end
|
|
|
|
def destroy
|
|
if acceptable_code?
|
|
current_user.otp_required_for_login = false
|
|
current_user.save!
|
|
redirect_to settings_two_factor_authentication_path
|
|
else
|
|
flash.now[:alert] = I18n.t('two_factor_authentication.wrong_code')
|
|
@confirmation = Form::TwoFactorConfirmation.new
|
|
render :show
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def confirmation_params
|
|
params.require(:form_two_factor_confirmation).permit(:code)
|
|
end
|
|
|
|
def verify_otp_required
|
|
redirect_to settings_two_factor_authentication_path if current_user.otp_required_for_login?
|
|
end
|
|
|
|
def acceptable_code?
|
|
current_user.validate_and_consume_otp!(confirmation_params[:code]) ||
|
|
current_user.invalidate_otp_backup_code!(confirmation_params[:code])
|
|
end
|
|
end
|
|
end
|