From 67dea31b0f83eb711bbd49a7b893d04ca16c56fa Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 21 Apr 2017 22:23:17 -0400 Subject: 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 --- config/locales/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/locales/en.yml') diff --git a/config/locales/en.yml b/config/locales/en.yml index c1438134f..cf492e117 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -277,7 +277,7 @@ en: import: Import preferences: Preferences settings: Settings - two_factor_auth: Two-factor Authentication + two_factor_authentication: Two-factor Authentication statuses: open_in_web: Open in web over_character_limit: character limit of %{max} exceeded @@ -293,7 +293,7 @@ en: time: formats: default: "%b %d, %Y, %H:%M" - two_factor_auth: + two_factor_authentication: code_hint: Enter the code generated by your authenticator app to confirm description_html: If you enable two-factor authentication, logging in will require you to be in possession of your phone, which will generate tokens for you to enter. disable: Disable -- cgit