Add password challenge to 2FA settings, e-mail notifications (#11878)

Fix #3961
2019-09-18 16:37:27 +02:00
parent d0c2c52783
commit e1066cd431
32 changed files with 567 additions and 50 deletions
--- a/app/views/auth/shared/_links.html.haml
+++ b/app/views/auth/shared/_links.html.haml
@ -11,7 +11,7 @@
    - if controller_name != 'passwords' && controller_name != 'registrations'
      %li= link_to t('auth.forgot_password'), new_user_password_path

-  - if controller_name != 'confirmations'
+  - if controller_name != 'confirmations' && (!user_signed_in? || !current_user.confirmed? || current_user.unconfirmed_email.present?)
    %li= link_to t('auth.didnt_get_confirmation'), new_user_confirmation_path

  - if user_signed_in? && controller_name != 'setup'