diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-20 03:15:54 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-20 03:15:54 -0600 |
| commit | bf1eb0912c584318448bc327b347ee526a8dbb93 (patch) | |
| tree | 988bc228fd599baf97201a180bea37eb230c5a3b /app/controllers/settings | |
| parent | 6f11aa8383a6afc4ef1b82c25b5f933027278457 (diff) | |
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
Diffstat (limited to 'app/controllers/settings')
| -rw-r--r-- | app/controllers/settings/two_factor_authentication/confirmations_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb index 4cf62db13..f1fa03f0a 100644 --- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb +++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb @@ -2,11 +2,7 @@ module Settings module TwoFactorAuthentication - class ConfirmationsController < ApplicationController - layout 'admin' - - before_action :authenticate_user! - + class ConfirmationsController < BaseController 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 e591e9502..94d1567f3 100644 --- a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb +++ b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb @@ -2,11 +2,7 @@ module Settings module TwoFactorAuthentication - class RecoveryCodesController < ApplicationController - layout 'admin' - - before_action :authenticate_user! - + class RecoveryCodesController < BaseController def create @recovery_codes = current_user.generate_otp_backup_codes! current_user.save! |