♻️ Mix things up

DysonNetwork.Pass/Email/EmailService.cs

@@ -1,92 +1,56 @@
-using MailKit.Net.Smtp;
+using dotnet_etcd;
+using DysonNetwork.Shared.Proto;
 using Microsoft.AspNetCore.Components;
-using MimeKit;
 
 namespace DysonNetwork.Pass.Email;
 
-public class EmailServiceConfiguration
-{
-    public string Server { get; set; } = null!;
-    public int Port { get; set; }
-    public bool UseSsl { get; set; }
-    public string Username { get; set; } = null!;
-    public string Password { get; set; } = null!;
-    public string FromAddress { get; set; } = null!;
-    public string FromName { get; set; } = null!;
-    public string SubjectPrefix { get; set; } = null!;
-}
-
 public class EmailService
 {
-    private readonly EmailServiceConfiguration _configuration;
+    private readonly PusherService.PusherServiceClient _client;
     private readonly RazorViewRenderer _viewRenderer;
     private readonly ILogger<EmailService> _logger;
 
-    public EmailService(IConfiguration configuration, RazorViewRenderer viewRenderer, ILogger<EmailService> logger)
+    public EmailService(
+        EtcdClient etcd,
+        RazorViewRenderer viewRenderer,
+        IConfiguration configuration,
+        ILogger<EmailService> logger,
+        PusherService.PusherServiceClient client
+    )
     {
-        var cfg = configuration.GetSection("Email").Get<EmailServiceConfiguration>();
-        _configuration = cfg ?? throw new ArgumentException("Email service was not configured.");
+        _client = GrpcClientHelper.CreatePusherServiceClient(
+            etcd,
+            configuration["Service:CertPath"]!,
+            configuration["Service:KeyPath"]!
+        ).GetAwaiter().GetResult();
         _viewRenderer = viewRenderer;
         _logger = logger;
+        _client = client;
     }
-
-    public async Task SendEmailAsync(string? recipientName, string recipientEmail, string subject, string textBody)
+    
+    public async Task SendEmailAsync(
+        string? recipientName,
+        string recipientEmail,
+        string subject,
+        string htmlBody
+    )
     {
-        await SendEmailAsync(recipientName, recipientEmail, subject, textBody, null);
+        subject = $"[Solarpass] {subject}";
+
+        await _client.SendEmailAsync(
+            new SendEmailRequest()
+            {
+                Email = new EmailMessage()
+                {
+                    ToName = recipientName,
+                    ToAddress = recipientEmail,
+                    Subject = subject,
+                    Body = htmlBody
+                }
+            }
+        );
     }
 
-    public async Task SendEmailAsync(string? recipientName, string recipientEmail, string subject, string textBody,
-        string? htmlBody)
-    {
-        subject = $"[{_configuration.SubjectPrefix}] {subject}";
-
-        var emailMessage = new MimeMessage();
-        emailMessage.From.Add(new MailboxAddress(_configuration.FromName, _configuration.FromAddress));
-        emailMessage.To.Add(new MailboxAddress(recipientName, recipientEmail));
-        emailMessage.Subject = subject;
-
-        var bodyBuilder = new BodyBuilder
-        {
-            TextBody = textBody
-        };
-
-        if (!string.IsNullOrEmpty(htmlBody))
-            bodyBuilder.HtmlBody = htmlBody;
-
-        emailMessage.Body = bodyBuilder.ToMessageBody();
-
-        using var client = new SmtpClient();
-        await client.ConnectAsync(_configuration.Server, _configuration.Port, _configuration.UseSsl);
-        await client.AuthenticateAsync(_configuration.Username, _configuration.Password);
-        await client.SendAsync(emailMessage);
-        await client.DisconnectAsync(true);
-    }
-
-    private static string _ConvertHtmlToPlainText(string html)
-    {
-        // Remove style tags and their contents
-        html = System.Text.RegularExpressions.Regex.Replace(html, "<style[^>]*>.*?</style>", "", 
-            System.Text.RegularExpressions.RegexOptions.Singleline);
-    
-        // Replace header tags with text + newlines
-        html = System.Text.RegularExpressions.Regex.Replace(html, "<h[1-6][^>]*>(.*?)</h[1-6]>", "$1\n\n",
-            System.Text.RegularExpressions.RegexOptions.IgnoreCase);
-    
-        // Replace line breaks
-        html = html.Replace("<br>", "\n").Replace("<br/>", "\n").Replace("<br />", "\n");
-    
-        // Remove all remaining HTML tags
-        html = System.Text.RegularExpressions.Regex.Replace(html, "<[^>]+>", "");
-    
-        // Decode HTML entities
-        html = System.Net.WebUtility.HtmlDecode(html);
-    
-        // Remove excess whitespace
-        html = System.Text.RegularExpressions.Regex.Replace(html, @"\s+", " ").Trim();
-    
-        return html;
-    }
-    
     public async Task SendTemplatedEmailAsync<TComponent, TModel>(string? recipientName, string recipientEmail,
         string subject, TModel model)
         where TComponent : IComponent
@@ -94,8 +58,7 @@ public class EmailService
         try
         {
             var htmlBody = await _viewRenderer.RenderComponentToStringAsync<TComponent, TModel>(model);
-            var fallbackTextBody = _ConvertHtmlToPlainText(htmlBody);
-            await SendEmailAsync(recipientName, recipientEmail, subject, fallbackTextBody, htmlBody);
+            await SendEmailAsync(recipientName, recipientEmail, subject, htmlBody);
         }
         catch (Exception err)
         {