diff --git a/Wave/Program.cs b/Wave/Program.cs index c09ec2d..de19f3a 100644 --- a/Wave/Program.cs +++ b/Wave/Program.cs @@ -148,7 +148,6 @@ if (emailConfig.Smtp.Keys.Any(k => k.Equals("live", StringComparison.CurrentCultureIgnoreCase))) { builder.Services.AddScoped(sp => sp.GetKeyedService("live")!); - builder.Services.AddScoped(); builder.Services.AddScoped, SmtpEmailSender>(); } else { builder.Services.AddSingleton, IdentityNoOpEmailSender>(); diff --git a/Wave/Services/SmtpEmailSender.cs b/Wave/Services/SmtpEmailSender.cs index 2f068b0..a1a6f63 100644 --- a/Wave/Services/SmtpEmailSender.cs +++ b/Wave/Services/SmtpEmailSender.cs @@ -1,14 +1,11 @@ using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.UI.Services; using Wave.Data; -using Wave.Utilities; namespace Wave.Services; -public class SmtpEmailSender(EmailFactory email, [FromKeyedServices("live")]IEmailService emailService, [FromKeyedServices("bulk")]IEmailService bulkEmailService) : IEmailSender, IEmailSender, IAsyncDisposable { +public class SmtpEmailSender(EmailFactory email, [FromKeyedServices("live")]IEmailService emailService) : IEmailSender, IAsyncDisposable { private EmailFactory Email { get; } = email; private IEmailService EmailService { get; } = emailService; - private IEmailService BulkEmailService { get; } = bulkEmailService; #region IEmailSenderAsync @@ -29,15 +26,7 @@ public class SmtpEmailSender(EmailFactory email, [FromKeyedServices("live")]IEma #endregion - #region IEmailSender - - public Task SendEmailAsync(string email, string subject, string htmlMessage) { - return SendDefaultMailAsync(email, null, subject, subject, htmlMessage, HtmlUtilities.GetPlainText(htmlMessage)); - } - - #endregion - - public async Task SendDefaultMailAsync(string receiverMail, string? receiverName, string subject, string title, string bodyHtml, string bodyPlain) { + private async Task SendDefaultMailAsync(string receiverMail, string? receiverName, string subject, string title, string bodyHtml, string bodyPlain) { await EmailService.ConnectAsync(CancellationToken.None); var email = await Email.CreateDefaultEmail(receiverMail, receiverName, subject, title, bodyHtml, bodyPlain); await EmailService.SendEmailAsync(email); @@ -47,6 +36,5 @@ public class SmtpEmailSender(EmailFactory email, [FromKeyedServices("live")]IEma public async ValueTask DisposeAsync() { GC.SuppressFinalize(this); await EmailService.DisposeAsync(); - await BulkEmailService.DisposeAsync(); } } \ No newline at end of file