removed unused code

miawinter98 · Feb 28, 2024 · f1cb3d7 · f1cb3d7
1 parent 17ab022
commit f1cb3d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git 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<IEmailService>("live")!);
-		builder.Services.AddScoped<IEmailSender, SmtpEmailSender>();
 		builder.Services.AddScoped<IEmailSender<ApplicationUser>, SmtpEmailSender>();
 	} else {
 		builder.Services.AddSingleton<IEmailSender<ApplicationUser>, IdentityNoOpEmailSender>();

diff --git 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<ApplicationUser>, IEmailSender, IAsyncDisposable {
+public class SmtpEmailSender(EmailFactory email, [FromKeyedServices("live")]IEmailService emailService) : IEmailSender<ApplicationUser>, IAsyncDisposable {
 	private EmailFactory Email { get; } = email;
 	private IEmailService EmailService { get; } = emailService;
-	private IEmailService BulkEmailService { get; } = bulkEmailService;
 
 	#region IEmailSenderAsync<ApplicationUser>
 
@@ -29,15 +26,7 @@ public Task SendPasswordResetCodeAsync(ApplicationUser user, string email, strin
 
 	#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 async Task SendDefaultMailAsync(string receiverMail, string? receiverName
 	public async ValueTask DisposeAsync() {
 		GC.SuppressFinalize(this);
 		await EmailService.DisposeAsync();
-		await BulkEmailService.DisposeAsync();
 	}
 }