mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
pull/274/head
David Yip 2017-12-20 03:15:54 -06:00
parent 6f11aa8383
commit bf1eb0912c
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/auth/sessions_controller.rb
View File

@ -8,8 +8,8 @@ class Auth::SessionsController < Devise::SessionsController
skip_before_action :require_no_authentication, only: [:create] skip_before_action :require_no_authentication, only: [:create]
skip_before_action :check_suspension, only: [:destroy] skip_before_action :check_suspension, only: [:destroy]
prepend_before_action :authenticate_with_two_factor, if: :two_factor_enabled?, only: [:create] 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_instance_presenter, only: [:new]
before_action :set_pack
def create def create
super do |resource| super do |resource|

6
app/controllers/settings/two_factor_authentication/confirmations_controller.rb
View File

@ -2,11 +2,7 @@
module Settings module Settings
module TwoFactorAuthentication module TwoFactorAuthentication
class ConfirmationsController < ApplicationController class ConfirmationsController < BaseController
layout 'admin'
before_action :authenticate_user!
def new def new
prepare_two_factor_form prepare_two_factor_form
end end

6
app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
View File

@ -2,11 +2,7 @@
module Settings module Settings
module TwoFactorAuthentication module TwoFactorAuthentication
class RecoveryCodesController < ApplicationController class RecoveryCodesController < BaseController
layout 'admin'
before_action :authenticate_user!
def create def create
@recovery_codes = current_user.generate_otp_backup_codes! @recovery_codes = current_user.generate_otp_backup_codes!
current_user.save! current_user.save!