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

5 files changed, 0 insertions, 48 deletions

diff --git a/app/views/settings/two_factor_auths/_recovery_codes.html.haml b/app/views/settings/two_factor_auths/_recovery_codes.html.haml
deleted file mode 100644
index 054588b97..000000000
--- a/app/views/settings/two_factor_auths/_recovery_codes.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-%p.hint= t('two_factor_auth.recovery_instructions')
-
-%ol.recovery-codes
-  - recovery_codes.each do |code|
-    %li
-      %samp= code
diff --git a/app/views/settings/two_factor_auths/create.html.haml b/app/views/settings/two_factor_auths/create.html.haml
deleted file mode 100644
index aaeebaf2e..000000000
--- a/app/views/settings/two_factor_auths/create.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- content_for :page_title do
-  = t('settings.two_factor_auth')
-
-= render 'recovery_codes', recovery_codes: @codes
diff --git a/app/views/settings/two_factor_auths/new.html.haml b/app/views/settings/two_factor_auths/new.html.haml
deleted file mode 100644
index 5bae743ef..000000000
--- a/app/views/settings/two_factor_auths/new.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-- content_for :page_title do
-  = t('settings.two_factor_auth')
-
-= simple_form_for @confirmation, url: settings_two_factor_auth_path, method: :post do |f|
-  %p.hint= t('two_factor_auth.instructions_html')
-
-  .qr-wrapper
-    .qr-code= raw @qrcode.as_svg(padding: 0, module_size: 4)
-
-    .qr-alternative
-      %p.hint= t('two_factor_auth.manual_instructions')
-      %samp.qr-alternative__code= current_user.otp_secret.scan(/.{4}/).join(' ')
-
-  = f.input :code, hint: t('two_factor_auth.code_hint'), placeholder: t('simple_form.labels.defaults.otp_attempt')
-
-  .actions
-    = f.button :button, t('two_factor_auth.enable'), type: :submit
diff --git a/app/views/settings/two_factor_auths/recovery_codes.html.haml b/app/views/settings/two_factor_auths/recovery_codes.html.haml
deleted file mode 100644
index aaeebaf2e..000000000
--- a/app/views/settings/two_factor_auths/recovery_codes.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- content_for :page_title do
-  = t('settings.two_factor_auth')
-
-= render 'recovery_codes', recovery_codes: @codes
diff --git a/app/views/settings/two_factor_auths/show.html.haml b/app/views/settings/two_factor_auths/show.html.haml
deleted file mode 100644
index c966ecebf..000000000
--- a/app/views/settings/two_factor_auths/show.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-- content_for :page_title do
-  = t('settings.two_factor_auth')
-
-.simple_form
-  %p.hint= t('two_factor_auth.description_html')
-
-  - if current_user.otp_required_for_login
-    = link_to t('two_factor_auth.disable'), disable_settings_two_factor_auth_path, data: { method: 'POST' }, class: 'block-button'
-  - else
-    = link_to t('two_factor_auth.setup'), new_settings_two_factor_auth_path, class: 'block-button'
-
-- if current_user.otp_required_for_login
-  %p
-
-  .simple_form
-    %p.hint= t('two_factor_auth.lost_recovery_codes')
-    = link_to t('two_factor_auth.generate_recovery_codes'), recovery_codes_settings_two_factor_auth_path, data: { method: 'POST' }, class: 'block-button'