mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-20 03:25:17 +01:00
Fix #587 - Display TOTP secret next to QR code
This commit is contained in:
parent
bae7cf8cce
commit
63886bdc59
@ -8,7 +8,8 @@ class Settings::TwoFactorAuthsController < ApplicationController
|
||||
def show
|
||||
return unless current_user.otp_required_for_login
|
||||
|
||||
@qrcode = RQRCode::QRCode.new(current_user.otp_provisioning_uri(current_user.email, issuer: Rails.configuration.x.local_domain))
|
||||
@provision_url = current_user.otp_provisioning_uri(current_user.email, issuer: Rails.configuration.x.local_domain)
|
||||
@qrcode = RQRCode::QRCode.new(@provision_url)
|
||||
end
|
||||
|
||||
def enable
|
||||
|
@ -7,6 +7,10 @@
|
||||
|
||||
.qr-code= raw @qrcode.as_svg(padding: 0, module_size: 5)
|
||||
|
||||
%p= t('two_factor_auth.plaintext_secret_html', secret: current_user.otp_secret)
|
||||
|
||||
%p= t('two_factor_auth.warning')
|
||||
|
||||
= link_to t('two_factor_auth.disable'), disable_settings_two_factor_auth_path, data: { method: 'POST' }, class: 'block-button'
|
||||
- else
|
||||
%p= t('two_factor_auth.description_html')
|
||||
|
@ -118,6 +118,8 @@ en:
|
||||
disable: Disable
|
||||
enable: Enable
|
||||
instructions_html: "<strong>Scan this QR code into Google Authenticator or a similiar app on your phone</strong>. From now on, that app will generate tokens that you will have to enter when logging in."
|
||||
plaintext_secret_html: "Plain-text secret: <samp>%{secret}</samp>"
|
||||
warning: If you cannot configure an authenticator app right now, you should click "disable" or you won't be able to login.
|
||||
users:
|
||||
invalid_email: The e-mail address is invalid
|
||||
invalid_otp_token: Invalid two-factor code
|
||||
|
Loading…
Reference in New Issue
Block a user