about summary refs log tree commit diff
path: root/app/controllers/auth
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-12-20 03:15:54 -0600
committerDavid Yip <yipdw@member.fsf.org>2017-12-20 03:15:54 -0600
commitbf1eb0912c584318448bc327b347ee526a8dbb93 (patch)
tree988bc228fd599baf97201a180bea37eb230c5a3b /app/controllers/auth
parent6f11aa8383a6afc4ef1b82c25b5f933027278457 (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/auth')
-rw-r--r--app/controllers/auth/sessions_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 72d544102..f45d77b88 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -8,8 +8,8 @@ class Auth::SessionsController < Devise::SessionsController
   skip_before_action :require_no_authentication, only: [:create]
   skip_before_action :check_suspension, only: [:destroy]
   prepend_before_action :authenticate_with_two_factor, if: :two_factor_enabled?, only: [:create]
+  prepend_before_action :set_pack
   before_action :set_instance_presenter, only: [:new]
-  before_action :set_pack
 
   def create
     super do |resource|