From 67dea31b0f83eb711bbd49a7b893d04ca16c56fa Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
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
---
 .../settings/two_factor_auths_controller.rb        | 56 ----------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 app/controllers/settings/two_factor_auths_controller.rb

(limited to 'app/controllers/settings/two_factor_auths_controller.rb')

diff --git a/app/controllers/settings/two_factor_auths_controller.rb b/app/controllers/settings/two_factor_auths_controller.rb
deleted file mode 100644
index a06b2a9f9..000000000
--- a/app/controllers/settings/two_factor_auths_controller.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-class Settings::TwoFactorAuthsController < ApplicationController
-  layout 'admin'
-
-  before_action :authenticate_user!
-
-  def show; end
-
-  def new
-    redirect_to settings_two_factor_auth_path if current_user.otp_required_for_login
-
-    @confirmation = Form::TwoFactorConfirmation.new
-    current_user.otp_secret = User.generate_otp_secret(32)
-    current_user.save!
-    set_qr_code
-  end
-
-  def create
-    if current_user.validate_and_consume_otp!(confirmation_params[:code])
-      current_user.otp_required_for_login = true
-      @codes = current_user.generate_otp_backup_codes!
-      current_user.save!
-      flash[:notice] = I18n.t('two_factor_auth.enabled_success')
-    else
-      @confirmation = Form::TwoFactorConfirmation.new
-      set_qr_code
-      flash.now[:alert] = I18n.t('two_factor_auth.wrong_code')
-      render :new
-    end
-  end
-
-  def recovery_codes
-    @codes = current_user.generate_otp_backup_codes!
-    current_user.save!
-    flash[:notice] = I18n.t('two_factor_auth.recovery_codes_regenerated')
-  end
-
-  def disable
-    current_user.otp_required_for_login = false
-    current_user.save!
-
-    redirect_to settings_two_factor_auth_path
-  end
-
-  private
-
-  def set_qr_code
-    @provision_url = current_user.otp_provisioning_uri(current_user.email, issuer: Rails.configuration.x.local_domain)
-    @qrcode        = RQRCode::QRCode.new(@provision_url)
-  end
-
-  def confirmation_params
-    params.require(:form_two_factor_confirmation).permit(:code)
-  end
-end
-- 
cgit