mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
67dea31b0f
* Add spec coverage for settings/two_factor_auth area * extract setup method for qr code * Move otp required check to before action * Merge method only used once * Remove duplicate view * Consolidate creation of @codes for backup * Move settings/2fq#recovery_codes to settings/recovery_codes#create * Rename settings/two_factor_auth#disable to #destroy * Add coverage for the otp required path on 2fa#show * Clean up the recovery codes list styles * Move settings/two_factor_auth to settings/two_factor_authentication * Reorganize the settings two factor auth area Updated to use a flow like: - settings/two_factor_authentication goes to a #show view which has a button either enable or disable 2fa on the account - the disable button turns off the otp requirement for the user - the enable button cycles the user secret and redirects to a confirmation page - the confirmation page is a #new view which shows the QR code for user - that page posts to #create which verifies the code, and creates the recovery codes - that create action shares a view with a recovery codes controller which can be used separately to reset codes if needed
43 lines
1.2 KiB
Ruby
43 lines
1.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Settings
|
|
module TwoFactorAuthentication
|
|
class ConfirmationsController < ApplicationController
|
|
layout 'admin'
|
|
|
|
before_action :authenticate_user!
|
|
|
|
def new
|
|
prepare_two_factor_form
|
|
end
|
|
|
|
def create
|
|
if current_user.validate_and_consume_otp!(confirmation_params[:code])
|
|
flash[:notice] = I18n.t('two_factor_authentication.enabled_success')
|
|
|
|
current_user.otp_required_for_login = true
|
|
@recovery_codes = current_user.generate_otp_backup_codes!
|
|
current_user.save!
|
|
|
|
render 'settings/two_factor_authentication/recovery_codes/index'
|
|
else
|
|
flash.now[:alert] = I18n.t('two_factor_authentication.wrong_code')
|
|
prepare_two_factor_form
|
|
render :new
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def confirmation_params
|
|
params.require(:form_two_factor_confirmation).permit(:code)
|
|
end
|
|
|
|
def prepare_two_factor_form
|
|
@confirmation = Form::TwoFactorConfirmation.new
|
|
@provision_url = current_user.otp_provisioning_uri(current_user.email, issuer: Rails.configuration.x.local_domain)
|
|
@qrcode = RQRCode::QRCode.new(@provision_url)
|
|
end
|
|
end
|
|
end
|
|
end
|