diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-04-21 22:23:17 -0400 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-22 04:23:17 +0200 |
| commit | 67dea31b0f83eb711bbd49a7b893d04ca16c56fa (patch) | |
| tree | 9dacc52579735eaabefe5c2f7fec803e015ff977 /app/views/settings/shared | |
| parent | 6af21daac9f5ed3932694b211a04a715a348d995 (diff) | |
2FA controller cleanup (#2296)
* 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
Diffstat (limited to 'app/views/settings/shared')
| -rw-r--r-- | app/views/settings/shared/_links.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/settings/shared/_links.html.haml b/app/views/settings/shared/_links.html.haml index 6490ffdd8..0abb5a7ab 100644 --- a/app/views/settings/shared/_links.html.haml +++ b/app/views/settings/shared/_links.html.haml @@ -5,6 +5,6 @@ %li= link_to t('settings.preferences'), settings_preferences_path - if controller_name != 'registrations' %li= link_to t('auth.change_password'), edit_user_registration_path - - if controller_name != 'two_factor_auths' - %li= link_to t('settings.two_factor_auth'), settings_two_factor_auth_path + - if controller_name != 'two_factor_authentications' + %li= link_to t('settings.two_factor_authentication'), settings_two_factor_authentication_path %li= link_to t('settings.back'), root_path |