Fix that Redmine::Twofa::Base raises ArgumentError in development mode (#1237, #33925).

git-svn-id: http://svn.redmine.org/redmine/trunk@19995 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-08-31 08:29:44 +00:00
parent 03aebc3d3e
commit ddce44f490

View File

@@ -53,7 +53,7 @@ module Redmine
end end
def deliver_twofa_paired def deliver_twofa_paired
Mailer.security_notification( ::Mailer.security_notification(
@user, @user,
User.current, User.current,
{ {
@@ -82,7 +82,7 @@ module Redmine
end end
def deliver_twofa_unpaired def deliver_twofa_unpaired
Mailer.security_notification( ::Mailer.security_notification(
@user, @user,
User.current, User.current,
{ {
@@ -114,7 +114,7 @@ module Redmine
Token.where(user_id: @user.id).find_token('twofa_backup_code', code).try(:delete) Token.where(user_id: @user.id).find_token('twofa_backup_code', code).try(:delete)
# make sure the user using the backup code is the same it's been issued to # make sure the user using the backup code is the same it's been issued to
return false unless @user.present? && @user == user_from_code return false unless @user.present? && @user == user_from_code
Mailer.security_notification( ::Mailer.security_notification(
@user, @user,
User.current, User.current,
{ {
@@ -135,7 +135,7 @@ module Redmine
token.update_columns value: Redmine::Utils.random_hex(6) token.update_columns value: Redmine::Utils.random_hex(6)
tokens << token tokens << token
end end
Mailer.security_notification( ::Mailer.security_notification(
@user, @user,
User.current, User.current,
{ {