mirrors/retrospring
1
0
Fork 1
mirror of https://github.com/Retrospring/retrospring.git synced 2025-03-23 18:17:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1121 from Retrospring/fix/2fa-issues

Browse source 
Fix various issues with 2FA settings
This commit is contained in:
Karina Kwiatek 2023-03-05 18:30:46 +01:00 • committed by GitHub
commit c9d76acc79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/components/_totp-setup.scss
View file

@ -47,6 +47,13 @@
&__recovery {
&-container {
max-width: 455px;
@media print {
.card {
box-shadow: none;
}
}
}
&-icon {
@ -73,4 +80,4 @@
#user_otp_attempt {
@extend %totp-input;
}
}

2
app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb
View file

@ -42,6 +42,6 @@ class Settings::TwoFactorAuthentication::OtpAuthenticationController < Applicati
def reset
current_user.totp_recovery_codes.delete_all
@recovery_keys = TotpRecoveryCode.generate_for(current_user)
render "settings/two_factor_authentication/otp_authentication/recovery_keys"
render "settings/two_factor_authentication/otp_authentication/recovery_keys", status: :see_other
end
end

2
app/views/layouts/base.html.haml
View file

@ -18,7 +18,7 @@
%link{ rel: 'icon', href: '/icons/maskable_icon_x192.png', sizes: '192x192' }
%link{ rel: 'icon', href: '/images/favicon/favicon-32.png', sizes: '32x32' }
%title= yield(:title)
= stylesheet_link_tag 'application', data: { 'turbo-track': 'reload' }
= stylesheet_link_tag "application", data: { 'turbo-track': "reload" }, media: "all"
= javascript_include_tag 'application', data: { 'turbo-track': 'reload' }, defer: true
= csrf_meta_tags
= yield(:og)

2
app/views/navigation/_main.html.haml
View file

@ -3,5 +3,5 @@
= render 'navigation/mobile', notifications: notifications
= render 'modal/ask'
%button.btn.btn-primary.btn-fab.d-block.d-lg-none{ data: { bs_target: '#modal-ask-followers', bs_toggle: :modal }, type: 'button' }
%button.btn.btn-primary.btn-fab.d-block.d-lg-none.d-print-none{ data: { bs_target: "#modal-ask-followers", bs_toggle: :modal }, type: "button" }
%i.fa.fa-pencil-square-o

2
app/views/settings/two_factor_authentication/otp_authentication/recovery_keys.html.haml
View file

@ -4,7 +4,7 @@
.card
.card-body
.d-none.d-print-block.totp-setup__recovery-icon
%i.fa.fa-comments
%img{ src: "/icons/icon.svg", width: 96 }
%h1.totp-setup__recovery-title= t(".heading", app_name: APP_CONFIG['site_name'])
%ul.totp-setup__recovery-codes