fix: Make MailSender singleton

GZTimeWalker · Apr 14, 2024 · 1332846 · 1332846
1 parent b72f995
commit 1332846
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/src/GZCTF/Controllers/AccountController.cs b/src/GZCTF/Controllers/AccountController.cs
@@ -110,7 +110,7 @@ public async Task<IActionResult> Register([FromBody] RegisterModel model, Cancel
         }
         else
         {
-            if (!mailSender.SendConfirmEmailUrl(user.UserName, user.Email, link))
+            if (!mailSender.SendConfirmEmailUrl(user.UserName, user.Email, link, localizer))
                 return BadRequest(new RequestResponse(localizer[nameof(Resources.Program.Account_EmailSendFailed)]));
         }
 
@@ -174,7 +174,7 @@ public async Task<IActionResult> Recovery([FromBody] RecoveryModel model, Cancel
         }
         else
         {
-            if (!mailSender.SendResetPasswordUrl(user.UserName, user.Email, link))
+            if (!mailSender.SendResetPasswordUrl(user.UserName, user.Email, link, localizer))
                 return BadRequest(new RequestResponse(localizer[nameof(Resources.Program.Account_EmailSendFailed)]));
         }
 
@@ -434,7 +434,7 @@ public async Task<IActionResult> ChangeEmail([FromBody] MailChangeModel model)
         }
         else
         {
-            if (!mailSender.SendChangeEmailUrl(user!.UserName, model.NewMail, link))
+            if (!mailSender.SendChangeEmailUrl(user!.UserName, model.NewMail, link, localizer))
                 return BadRequest(new RequestResponse(localizer[nameof(Resources.Program.Account_EmailSendFailed)]));
         }
 

diff --git a/src/GZCTF/Program.cs b/src/GZCTF/Program.cs
@@ -206,7 +206,7 @@
 
 #region Services and Repositories
 
-builder.Services.AddTransient<IMailSender, MailSender>()
+builder.Services.AddSingleton<IMailSender, MailSender>()
     .Configure<EmailConfig>(builder.Configuration.GetSection(nameof(EmailConfig)));
 
 builder.Services.Configure<RegistryConfig>(builder.Configuration.GetSection(nameof(RegistryConfig)));

diff --git a/src/GZCTF/Services/Interface/IMailSender.cs b/src/GZCTF/Services/Interface/IMailSender.cs
@@ -1,4 +1,6 @@
-namespace GZCTF.Services.Interface;
+using Microsoft.Extensions.Localization;
+
+namespace GZCTF.Services.Interface;
 
 public interface IMailSender
 {
@@ -23,21 +25,24 @@ public interface IMailSender
     /// <param name="userName">用户名</param>
     /// <param name="email">用户新注册的Email</param>
     /// <param name="confirmLink">确认链接</param>
-    public bool SendConfirmEmailUrl(string? userName, string? email, string? confirmLink);
+    /// <param name="localizer">本地化</param>
+    public bool SendConfirmEmailUrl(string? userName, string? email, string? confirmLink, IStringLocalizer<Program> localizer);
 
     /// <summary>
     /// 发送邮箱重置邮件
     /// </summary>
     /// <param name="userName">用户名</param>
     /// <param name="email">用户的电子邮件</param>
     /// <param name="resetLink">重置链接</param>
-    public bool SendChangeEmailUrl(string? userName, string? email, string? resetLink);
+    /// <param name="localizer">本地化</param>
+    public bool SendChangeEmailUrl(string? userName, string? email, string? resetLink, IStringLocalizer<Program> localizer);
 
     /// <summary>
     /// 发送密码重置邮件
     /// </summary>
     /// <param name="userName">用户名</param>
     /// <param name="email">用户的电子邮件</param>
     /// <param name="resetLink">重置链接</param>
-    public bool SendResetPasswordUrl(string? userName, string? email, string? resetLink);
+    /// <param name="localizer">本地化</param>
+    public bool SendResetPasswordUrl(string? userName, string? email, string? resetLink, IStringLocalizer<Program> localizer);
 }
diff --git a/src/GZCTF/Services/MailSender.cs b/src/GZCTF/Services/MailSender.cs
@@ -16,7 +16,6 @@ public sealed class MailSender : IMailSender, IDisposable
     private readonly EmailConfig? _options;
     private readonly IOptionsSnapshot<GlobalConfig> _globalConfig;
     private readonly ILogger<MailSender> _logger;
-    private readonly IStringLocalizer<Program> _localizer;
     private readonly SmtpClient? _smtpClient;
     private readonly CancellationTokenSource _cancellationTokenSource = new();
     private readonly CancellationToken _cancellationToken;
@@ -26,12 +25,10 @@ public sealed class MailSender : IMailSender, IDisposable
     public MailSender(
         IOptions<EmailConfig> options,
         IOptionsSnapshot<GlobalConfig> globalConfig,
-        ILogger<MailSender> logger,
-        IStringLocalizer<Program> localizer)
+        ILogger<MailSender> logger)
     {
         _globalConfig = globalConfig;
         _logger = logger;
-        _localizer = localizer;
         _options = options.Value;
         _cancellationToken = _cancellationTokenSource.Token;
 
@@ -70,7 +67,7 @@ public async Task SendUrlAsync(MailContent content)
     {
         var template = _globalConfig.Value.EmailTemplate switch
         {
-            GlobalConfig.DefaultEmailTemplate => _localizer[nameof(Resources.Program.MailSender_Template)],
+            GlobalConfig.DefaultEmailTemplate => content.Localizer[nameof(Resources.Program.MailSender_Template)],
             _ => _globalConfig.Value.EmailTemplate
         };
 
@@ -133,16 +130,16 @@ private async Task MailSenderWorker()
         }
     }
 
-    public bool SendConfirmEmailUrl(string? userName, string? email, string? confirmLink) =>
-        SendUrlIfPossible(userName, email, confirmLink, MailType.ConfirmEmail);
+    public bool SendConfirmEmailUrl(string? userName, string? email, string? confirmLink, IStringLocalizer<Program> localizer) =>
+        SendUrlIfPossible(userName, email, confirmLink, MailType.ConfirmEmail, localizer);
 
-    public bool SendChangeEmailUrl(string? userName, string? email, string? resetLink) =>
-        SendUrlIfPossible(userName, email, resetLink, MailType.ChangeEmail);
+    public bool SendChangeEmailUrl(string? userName, string? email, string? resetLink, IStringLocalizer<Program> localizer) =>
+        SendUrlIfPossible(userName, email, resetLink, MailType.ChangeEmail, localizer);
 
-    public bool SendResetPasswordUrl(string? userName, string? email, string? resetLink) =>
-        SendUrlIfPossible(userName, email, resetLink, MailType.ResetPassword);
+    public bool SendResetPasswordUrl(string? userName, string? email, string? resetLink, IStringLocalizer<Program> localizer) =>
+        SendUrlIfPossible(userName, email, resetLink, MailType.ResetPassword, localizer);
 
-    bool SendUrlIfPossible(string? userName, string? email, string? resetLink, MailType type)
+    bool SendUrlIfPossible(string? userName, string? email, string? resetLink, MailType type, IStringLocalizer<Program> localizer)
     {
         if (_smtpClient is null)
             return false;
@@ -154,7 +151,7 @@ bool SendUrlIfPossible(string? userName, string? email, string? resetLink, MailT
             return false;
         }
 
-        var content = new MailContent(userName, email, resetLink, type, _localizer);
+        var content = new MailContent(userName, email, resetLink, type, localizer);
 
         _mailQueue.Enqueue(content);
         _resetEvent.Set();
@@ -248,4 +245,6 @@ public class MailContent(
     /// 发信时间
     /// </summary>
     public string Time { get; set; } = DateTimeOffset.UtcNow.ToString("u");
+
+    public IStringLocalizer<Program> Localizer => localizer;
 }