Fixed mistake in postgres-secret.yaml where stringData was used inste…

…ad of data. Moved sender email from mailhog-secret.yaml to mailhog-config.yaml. Removed logging of sender email in EmailMessageRelay.cs. Co-authored-by: Adrian Essig <[email protected]>
THC-Software · Jul 10, 2024 · cc25df1 · cc25df1
1 parent 4d47481
commit cc25df1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 25 deletions.
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;
     }
@@ -42,17 +42,6 @@ private async Task SendEmails()
             await transactionManager.TransactionScope(async () =>
             {
                 MailAddress recipientEmailAddress;
-                MailAddress senderMailAddress;
-                try
-                {
-                    senderMailAddress = new MailAddress(_senderEmailAddress);
-                }
-                catch (FormatException)
-                {
-                    _loggerService.LogInvalidEMailAddress(_senderEmailAddress);
-                    throw;
-                }
-
                 try
                 {
                     recipientEmailAddress = new MailAddress(emailMessage.RecipientEMailAddress);
@@ -63,7 +52,7 @@ await transactionManager.TransactionScope(async () =>
                     throw;
                 }
 
-                var mailMessage = new MailMessage(senderMailAddress, recipientEmailAddress)
+                var mailMessage = new MailMessage(_senderEmailAddress, recipientEmailAddress)
                 {
                     Subject = emailMessage.Subject,
                     Body = emailMessage.Body

diff --git a/deployment/configs/mailhog-config.yaml b/deployment/configs/mailhog-config.yaml
@@ -4,4 +4,5 @@ metadata:
   name: club-service-mailhog-config
 data:
   mailhog-host: "club-service-mailhog-service"
-  mailhog-smtp-port: "1025"
+  mailhog-smtp-port: "1025"
+  smtp-sender-email-address: "[email protected]"
diff --git a/deployment/deployments/club-service-deployment.yaml b/deployment/deployments/club-service-deployment.yaml
@@ -85,6 +85,6 @@ spec:
                   key: mailhog-smtp-port
             - name: SMTP_SENDER_EMAIL_ADDRESS
               valueFrom:
-                secretKeyRef:
-                  name: club-service-mailhog-secret
+                configMapKeyRef:
+                  name: club-service-mailhog-config
                   key: smtp-sender-email-address
diff --git a/deployment/secrets/mailhog-secret.yaml b/deployment/secrets/mailhog-secret.yaml
diff --git a/deployment/secrets/postgres-secret.yaml b/deployment/secrets/postgres-secret.yaml
@@ -3,6 +3,6 @@ kind: Secret
 metadata:
   name: club-service-postgres-secret
 type: Opaque
-stringData:
+data:
   postgres-user: dXNlcgo=
   postgres-password: cGFzc3dvcmQK