Fixed paramters.

Author: eben-roux

Shuttle.Pigeon.MailKit/MailKitMessageSender.cs

@@ -8,7 +8,7 @@ namespace Shuttle.Pigeon.MailKit;
 
 public class MailKitMessageSender(IOptions<MailKitOptions> mailKitOptions) : IMessageSender
 {
-    private readonly MailKitOptions _mailKitOptions = Guard.AgainstNull(Guard.AgainstNull(mailKitOptions).Value);
+    private readonly MailKitOptions _mailKitOptions = Guard.AgainstNull(mailKitOptions).Value;
 
     public string Channel => "email";
     public string Name => "mailKit";
@@ -27,17 +27,17 @@ public async Task SendAsync(Message message, CancellationToken cancellationToken
             {
                 case RecipientType.To:
                 {
-                    mimeMessage.To.Add(new MailboxAddress(recipient.HasDisplayName ? recipient.DisplayName : recipient.Identifier, recipient.Identifier));
+                    mimeMessage.To.Add(new MailboxAddress(recipient.DisplayName, recipient.Identifier));
                     break;
                 }
                 case RecipientType.Cc:
                 {
-                    mimeMessage.Cc.Add(new MailboxAddress(recipient.HasDisplayName ? recipient.DisplayName : recipient.Identifier, recipient.Identifier));
+                    mimeMessage.Cc.Add(new MailboxAddress(recipient.DisplayName, recipient.Identifier));
                     break;
                 }
                 case RecipientType.Bcc:
                 {
-                    mimeMessage.Bcc.Add(new MailboxAddress(recipient.HasDisplayName ? recipient.DisplayName : recipient.Identifier, recipient.Identifier));
+                    mimeMessage.Bcc.Add(new MailboxAddress(recipient.DisplayName, recipient.Identifier));
                     break;
                 }
             }
@@ -57,15 +57,14 @@ public async Task SendAsync(Message message, CancellationToken cancellationToken
 
         foreach (var attachment in message.GetAttachments())
         {
-            using var stream = new MemoryStream(attachment.Content);
-            await bodyBuilder.Attachments.AddAsync(attachment.Name, stream, ContentType.Parse(attachment.ContentType), CancellationToken.None);
+            await bodyBuilder.Attachments.AddAsync(attachment.Name, new MemoryStream(attachment.Content), ContentType.Parse(attachment.ContentType), CancellationToken.None);
         }
 
         mimeMessage.Body = bodyBuilder.ToMessageBody();
 
         using var client = new SmtpClient();
 
-        await client.ConnectAsync(message.FindParameter("Host")?.GetValue<string>() ?? _mailKitOptions.Host, message.FindParameter("Port")?.GetValue<int>() ?? _mailKitOptions.Port, SecureSocketOptions.StartTls, cancellationToken); 
+        await client.ConnectAsync(message.FindParameter("Host")?.GetValue<string>() ?? _mailKitOptions.Host, message.FindParameter("Port")?.GetValue<int>() ?? _mailKitOptions.Port, SecureSocketOptions.Auto, cancellationToken); 
         await client.AuthenticateAsync(message.FindParameter("Username")?.GetValue<string>() ?? _mailKitOptions.Username, message.FindParameter("Password")?.GetValue<string>() ?? _mailKitOptions.Password, cancellationToken);
         await client.SendAsync(mimeMessage, cancellationToken);
         await client.DisconnectAsync(true, cancellationToken);

Shuttle.Pigeon.Server/Program.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;

Shuttle.Pigeon.Server/SendMessageHandler.cs

@@ -12,6 +12,7 @@ public class SendMessageHandler(IMessageService messageService) : IMessageHandle
     {
         var pigeonMessage = new Message(message.Id, message.Channel, message.Content, message.ContentType)
             .AddRecipients(message.Recipients.Select(item => new Message.Recipient(item.Identifier, (RecipientType)item.Type)))
+            .AddParameters(message.Parameters.Select(item => new Message.Parameter(item.Name, item.Value)))
             .WithSubject(message.Subject);
 
         if (!string.IsNullOrWhiteSpace(message.Sender))

Shuttle.Pigeon/Message.cs

@@ -45,6 +45,16 @@ public Message AddParameter(Parameter parameter)
         return this;
     }
 
+    public Message AddParameters(IEnumerable<Parameter> parameters)
+    {
+        foreach (var parameter in parameters)
+        {
+            AddParameter(parameter);
+        }
+
+        return this;
+    }
+
     public Message AddRecipient(Recipient recipient)
     {
         Guard.AgainstNull(recipient);