4 Commits (e3682c9c1750e5e7e5d2f817e29f6760a18400ca)

Author	SHA1	Message	Date
David Yip	1253279feb	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	7 years ago
Aboobacker MK	112b1fa265	Redirect to 2FA creation page when otp_secret is not available (#6314)	7 years ago
David Yip	bf1eb0912c	Set packs on 2FA-related pages. Fixes #271. ... Specifically, this commit: - changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from S::BaseController, because this gives us the necessary actions and packs - prepends set_pack to Auth::SessionsController's action chain so that it takes effect in time for render :two_factor	7 years ago
Matt Jankowski	67dea31b0f	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	8 years ago