about summary refs log tree commit diff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-04-21 22:23:17 -0400
committerEugen <eugen@zeonfederated.com>2017-04-22 04:23:17 +0200
commit67dea31b0f83eb711bbd49a7b893d04ca16c56fa (patch)
tree9dacc52579735eaabefe5c2f7fec803e015ff977 /config/routes.rb
parent6af21daac9f5ed3932694b211a04a715a348d995 (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 'config/routes.rb')
-rw-r--r--config/routes.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/config/routes.rb b/config/routes.rb
index d9b36661e..abc77535a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -58,11 +58,10 @@ Rails.application.routes.draw do
       resources :mutes, only: :index, controller: :muted_accounts
     end
 
-    resource :two_factor_auth, only: [:show, :new, :create] do
-      member do
-        post :disable
-        post :recovery_codes
-      end
+    resource :two_factor_authentication, only: [:show, :create, :destroy]
+    namespace :two_factor_authentication do
+      resources :recovery_codes, only: [:create]
+      resource :confirmation, only: [:new, :create]
     end
   end