diff options
| author | Reverite <github@reverite.sh> | 2019-07-23 20:54:15 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-23 20:54:15 -0700 |
| commit | fee3abd1dce8f437e3514cb03816ae50862b3c4c (patch) | |
| tree | 72e19e9e748edce7024737cfb70f9088346058bd /app/controllers/settings/two_factor_authentication | |
| parent | 9148c3e8479e59df9f9a4889ef58a959f60f6606 (diff) | |
| parent | 08325db62bcc4d5d530513c615bc1c733f166239 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/settings/two_factor_authentication')
| -rw-r--r-- | app/controllers/settings/two_factor_authentication/confirmations_controller.rb | 5 | ||||
| -rw-r--r-- | app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb index 363b32e17..3145e092d 100644 --- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb +++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb @@ -3,8 +3,13 @@ module Settings module TwoFactorAuthentication class ConfirmationsController < BaseController + layout 'admin' + + before_action :authenticate_user! before_action :ensure_otp_secret + skip_before_action :require_functional! + def new prepare_two_factor_form end diff --git a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb index 0555d61db..09a759860 100644 --- a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb +++ b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb @@ -3,6 +3,12 @@ module Settings module TwoFactorAuthentication class RecoveryCodesController < BaseController + layout 'admin' + + before_action :authenticate_user! + + skip_before_action :require_functional! + def create @recovery_codes = current_user.generate_otp_backup_codes! current_user.save! |