Merge pull request #24 from PandaTechAM/development

SMTP user/pass not required

Author: HaikAsatryan

src/Communicator/Communicator.csproj

@@ -21,8 +21,8 @@
         <PackageIcon>pandatech.png</PackageIcon>
         <PackageReadmeFile>README.md</PackageReadmeFile>
 
-        <Version>4.0.1</Version>
-        <PackageReleaseNotes>Multi-target net8.0/net9.0/net10.0, source-generated logging, removed unused OpenAPI reference, cleaned up models</PackageReleaseNotes>
+        <Version>4.0.2</Version>
+        <PackageReleaseNotes>Support email integration with username and password</PackageReleaseNotes>
 
         <!-- Build quality -->
         <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
@@ -49,8 +49,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="MailKit" Version="4.14.1"/>
-        <PackageReference Include="MimeKit" Version="4.14.0"/>
+        <PackageReference Include="MailKit" Version="4.15.1" />
+        <PackageReference Include="MimeKit" Version="4.15.1" />
     </ItemGroup>
 
     <!-- Analyzers -->

src/Communicator/Options/EmailConfiguration.cs

@@ -4,8 +4,8 @@ public class EmailConfiguration
 {
    public required string SmtpServer { get; set; }
    public int SmtpPort { get; set; }
-   public required string SmtpUsername { get; set; }
-   public required string SmtpPassword { get; set; }
+   public string? SmtpUsername { get; set; }
+   public string? SmtpPassword { get; set; }
    public required string SenderEmail { get; set; }
    public string? SenderName { get; set; }
    public int TimeoutMs { get; set; } = 10000;

src/Communicator/Services/Implementations/EmailService.cs

@@ -75,14 +75,27 @@ private static SmtpClient CreateClient(EmailConfiguration config)
       return client;
    }
 
-   private static async Task ConnectAndAuthAsync(SmtpClient client, EmailConfiguration config, CancellationToken ct)
+   private static async Task ConnectAndAuthAsync(SmtpClient client,
+      EmailConfiguration config,
+      CancellationToken ct)
    {
-      var socketOptions = ResolveSocketOptions(config.SmtpPort);
-      await client.ConnectAsync(config.SmtpServer, config.SmtpPort, socketOptions, ct);
+      await client.ConnectAsync(
+         config.SmtpServer,
+         config.SmtpPort,
+         ResolveSocketOptions(config.SmtpPort),
+         ct);
 
-      if (!string.IsNullOrWhiteSpace(config.SmtpUsername))
+      var hasUser = !string.IsNullOrWhiteSpace(config.SmtpUsername);
+      var hasPass = !string.IsNullOrWhiteSpace(config.SmtpPassword);
+
+      if (hasUser != hasPass)
       {
-         await client.AuthenticateAsync(config.SmtpUsername, config.SmtpPassword, ct);
+         throw new InvalidOperationException("SMTP username and password must both be set or both be empty.");
+      }
+
+      if (hasUser)
+      {
+         await client.AuthenticateAsync(config.SmtpUsername!, config.SmtpPassword!, ct);
       }
    }
 
@@ -98,36 +111,25 @@ private static SecureSocketOptions ResolveSocketOptions(int port)
 
    private static MimeMessage CreateMimeMessage(EmailConfiguration config, EmailMessage emailMessage)
    {
-      var senderEmail = !string.IsNullOrWhiteSpace(config.SenderEmail) ? config.SenderEmail : config.SmtpUsername;
+      if (string.IsNullOrWhiteSpace(config.SenderEmail))
+      {
+         throw new InvalidOperationException("SenderEmail is required.");
+      }
 
       var message = new MimeMessage();
 
-      if (!string.IsNullOrWhiteSpace(config.SenderName) && !string.IsNullOrWhiteSpace(senderEmail))
-      {
-         message.From.Add(new MailboxAddress(config.SenderName, senderEmail));
-      }
-      else if (!string.IsNullOrWhiteSpace(senderEmail))
-      {
-         message.From.Add(MailboxAddress.Parse(senderEmail));
-      }
-      else
-      {
-         throw new InvalidOperationException("SenderEmail (or SmtpUsername fallback) is required.");
-      }
+      message.From.Add(!string.IsNullOrWhiteSpace(config.SenderName)
+         ? new MailboxAddress(config.SenderName, config.SenderEmail)
+         : MailboxAddress.Parse(config.SenderEmail));
 
       message.To.AddRange(ParseDistinct(emailMessage.Recipients));
       message.Subject = emailMessage.Subject;
 
-      var builder = new BodyBuilder();
-
-      if (emailMessage.IsBodyHtml)
+      var builder = new BodyBuilder
       {
-         builder.HtmlBody = emailMessage.Body;
-      }
-      else
-      {
-         builder.TextBody = emailMessage.Body;
-      }
+         HtmlBody = emailMessage.IsBodyHtml ? emailMessage.Body : null,
+         TextBody = emailMessage.IsBodyHtml ? null : emailMessage.Body
+      };
 
       if (emailMessage.Attachments is { Count: > 0 })
       {

test/Communicator.Demo/Communicator.Demo.csproj

@@ -8,8 +8,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.2" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0"/>
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.4" />
     </ItemGroup>
 
     <ItemGroup>

test/Communicator.Tests/Communicator.Tests.csproj

@@ -10,13 +10,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
         <PackageReference Include="xunit" Version="2.9.3"/>
         <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.4">
+        <PackageReference Include="coverlet.collector" Version="8.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>