]> cat aescling's git repositories - mastodon.git/commit
2FA controller cleanup (#2296)
authorMatt Jankowski <mjankowski@thoughtbot.com>
Sat, 22 Apr 2017 02:23:17 +0000 (22:23 -0400)
committerEugen <eugen@zeonfederated.com>
Sat, 22 Apr 2017 02:23:17 +0000 (04:23 +0200)
commit67dea31b0f83eb711bbd49a7b893d04ca16c56fa
tree9dacc52579735eaabefe5c2f7fec803e015ff977
parent6af21daac9f5ed3932694b211a04a715a348d995
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
38 files changed:
app/assets/stylesheets/lists.scss
app/controllers/settings/two_factor_authentication/confirmations_controller.rb [new file with mode: 0644]
app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb [new file with mode: 0644]
app/controllers/settings/two_factor_authentications_controller.rb [new file with mode: 0644]
app/controllers/settings/two_factor_auths_controller.rb [deleted file]
app/views/settings/shared/_links.html.haml
app/views/settings/two_factor_authentication/confirmations/new.html.haml [new file with mode: 0644]
app/views/settings/two_factor_authentication/recovery_codes/index.html.haml [new file with mode: 0644]
app/views/settings/two_factor_authentications/show.html.haml [new file with mode: 0644]
app/views/settings/two_factor_auths/_recovery_codes.html.haml [deleted file]
app/views/settings/two_factor_auths/create.html.haml [deleted file]
app/views/settings/two_factor_auths/new.html.haml [deleted file]
app/views/settings/two_factor_auths/recovery_codes.html.haml [deleted file]
app/views/settings/two_factor_auths/show.html.haml [deleted file]
config/locales/bg.yml
config/locales/en.yml
config/locales/eo.yml
config/locales/es.yml
config/locales/fi.yml
config/locales/fr.yml
config/locales/hr.yml
config/locales/id.yml
config/locales/io.yml
config/locales/it.yml
config/locales/ja.yml
config/locales/nl.yml
config/locales/no.yml
config/locales/oc.yml
config/locales/pl.yml
config/locales/ru.yml
config/locales/zh-CN.yml
config/locales/zh-HK.yml
config/locales/zh-TW.yml
config/navigation.rb
config/routes.rb
spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb [new file with mode: 0644]
spec/controllers/settings/two_factor_authentication/recovery_codes_controller_spec.rb [new file with mode: 0644]
spec/controllers/settings/two_factor_authentications_controller_spec.rb [new file with mode: 0644]