Added logging of invalid email address in EmailMessageRelay.cs.

THC-Software · Jul 10, 2024 · af1c978 · af1c978
1 parent 6aab78f
commit af1c978
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/ClubService.Domain/Repository/ILoggerService.cs b/ClubService.Domain/Repository/ILoggerService.cs
@@ -64,4 +64,5 @@ public interface ILoggerService<T>
     void LogJsonMissingProperties(string jsonValue);
     void LogEmailMessageRelayStop();
     void LogSystemOperatorRegistered(Guid id);
+    void LogInvalidEMailAddress(string emailAddress);
 }
diff --git a/ClubService.Infrastructure/Logging/LoggerService.cs b/ClubService.Infrastructure/Logging/LoggerService.cs
@@ -320,4 +320,9 @@ public void LogSystemOperatorRegistered(Guid id)
     {
         logger.LogInformation("Registered system operator with id '{id}'.", id);
     }
+
+    public void LogInvalidEMailAddress(string emailAddress)
+    {
+        logger.LogError("The following email address is invalid: {emailMessageRecipientEMailAddress}", emailAddress);
+    }
 }
diff --git a/ClubService.Infrastructure/Mail/EmailMessageRelay.cs b/ClubService.Infrastructure/Mail/EmailMessageRelay.cs
@@ -12,7 +12,7 @@ public class EmailMessageRelay : BackgroundService
 {
     private readonly ILoggerService<EmailMessageRelay> _loggerService;
     private readonly int _pollingInterval;
-    private readonly string _senderEmailAddress;
+    private readonly MailAddress _senderEmailAddress;
     private readonly IServiceProvider _serviceProvider;
     private readonly SmtpClient _smtpClient;
 
@@ -24,7 +24,7 @@ public EmailMessageRelay(
         _serviceProvider = serviceProvider;
         _loggerService = loggerService;
         _pollingInterval = smtpConfiguration.Value.PollingInterval;
-        _senderEmailAddress = smtpConfiguration.Value.SenderEmailAddress;
+        _senderEmailAddress = new MailAddress(smtpConfiguration.Value.SenderEmailAddress);
         _smtpClient = new SmtpClient(smtpConfiguration.Value.Host, smtpConfiguration.Value.Port);
         _smtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
     }
@@ -41,7 +41,18 @@ private async Task SendEmails()
         {
             await transactionManager.TransactionScope(async () =>
             {
-                var mailMessage = new MailMessage(_senderEmailAddress, emailMessage.RecipientEMailAddress)
+                MailAddress recipientEmailAddress;
+                try
+                {
+                    recipientEmailAddress = new MailAddress(emailMessage.RecipientEMailAddress);
+                }
+                catch (FormatException e)
+                {
+                    _loggerService.LogInvalidEMailAddress(emailMessage.RecipientEMailAddress);
+                    throw;
+                }
+
+                var mailMessage = new MailMessage(_senderEmailAddress, recipientEmailAddress)
                 {
                     Subject = emailMessage.Subject,
                     Body = emailMessage.Body