Bugfix for e-mail sending (#115)

* Features/upgrate to dotnet 6 (#108)

* Moved files to src; Adapted C# code to a more modern approach; Minor refactoring everywhere

* Removed old project folders/files

* Removed temporary old solution

* Refactored code; Set some members to nullable

* Changed usage on TryUpdateModelAsync

* Features/fix email bugs (#110)

* Moved files to src; Adapted C# code to a more modern approach; Minor refactoring everywhere

* Removed old project folders/files

* Removed temporary old solution

* Refactored code; Set some members to nullable

* Changed usage on TryUpdateModelAsync

* Fixed e-mail issues

* Features/fix email bugs (#112)

* Moved files to src; Adapted C# code to a more modern approach; Minor refactoring everywhere

* Removed old project folders/files

* Removed temporary old solution

* Refactored code; Set some members to nullable

* Changed usage on TryUpdateModelAsync

* Fixed e-mail issues

* Feature/fix email send issues (#114)

* Removed development files

* Updated .gitignore

* Added MailKit library

* Implemented e-mail sender with MailKit

Author: davidsonsousa

.gitignore

@@ -257,8 +257,7 @@ paket-files/
 # CmsEngine
 PublishOutput/
 package-lock.json
-/CmsEngine.Ui/certificate.Development.json
-/CmsEngine.Ui/emailsettings.Development.json
+*.Development.json
 [Rr]eadme.md
-/CmsEngine.Ui/_logs
+CmsEngine.Ui/_logs
 global.json

src/CmsEngine.Application/CmsEngine.Application.csproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="MailKit" Version="3.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />

src/CmsEngine.Application/GlobalUsings.cs

@@ -5,9 +5,7 @@
 global using System.Globalization;
 global using System.Linq.Expressions;
 global using System.Net;
-global using System.Net.Mail;
 global using System.Reflection;
-global using System.Text;
 global using System.Text.Encodings.Web;
 global using System.Xml.Linq;
 global using CmsEngine.Application.Attributes;
@@ -25,12 +23,14 @@
 global using CmsEngine.Core.Utils;
 global using CmsEngine.Data;
 global using CmsEngine.Data.Entities;
+global using MailKit.Net.Smtp;
 global using Microsoft.AspNetCore.Authentication;
 global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Identity;
 global using Microsoft.AspNetCore.Mvc.Rendering;
 global using Microsoft.Extensions.Caching.Memory;
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
+global using MimeKit;
 global using Newtonsoft.Json;
 global using Newtonsoft.Json.Linq;

src/CmsEngine.Application/Helpers/Email/CmsEngineEmailSender.cs

@@ -20,54 +20,52 @@ private async Task ExecuteAsync(ContactForm contactForm)
     {
         _logger.LogDebug("SendEmailAsync(contactForm: {0})", contactForm.ToString());
 
-        var from = contactForm.From ?? _emailSettings.Username;
-        var body = $"From: {from}\r\nTo: {contactForm.To}\r\n-----\r\n\r\n{contactForm.Message}";
+        var message = PrepareMailMessage(contactForm);
 
         try
         {
-            var message = new MailMessage
+            using (var smtpClient = new SmtpClient())
             {
-                From = new MailAddress(from),
-                Subject = $"🌐 CmsEngine - {contactForm.Subject}",
-                SubjectEncoding = Encoding.UTF8,
-                IsBodyHtml = false,
-                Body = body,
-                BodyEncoding = Encoding.UTF8,
-                Priority = MailPriority.Normal
-            };
-
-            if (!string.IsNullOrWhiteSpace(contactForm.To))
-            {
-                message.To.Add(contactForm.To);
+                await smtpClient.ConnectAsync(_emailSettings.Domain, _emailSettings.Port, true);
+                await smtpClient.AuthenticateAsync(_emailSettings.Username, _emailSettings.Password);
+                await smtpClient.SendAsync(message);
+                await smtpClient.DisconnectAsync(true);
             }
 
-            if (!string.IsNullOrWhiteSpace(_emailSettings.CcEmail))
-            {
-                message.CC.Add(_emailSettings.CcEmail);
-            }
-
-            if (!string.IsNullOrWhiteSpace(_emailSettings.BccEmail))
-            {
-                message.Bcc.Add(_emailSettings.BccEmail);
-            }
-
-            using (var smtp = new SmtpClient(_emailSettings.Domain, _emailSettings.Port))
-            {
-                smtp.EnableSsl = true;
-                smtp.DeliveryMethod = SmtpDeliveryMethod.Network;
-                smtp.UseDefaultCredentials = false;
-                smtp.Credentials = new NetworkCredential(_emailSettings.Username, _emailSettings.Password);
-
-                _logger.LogDebug("Message {0}", message.ToString());
-                await smtp.SendMailAsync(message);
-            }
-
-            _logger.LogDebug("Email sent from {0} to {1}", message.From, message.To[0]);
+            _logger.LogDebug("Email sent from {0} to {1}", message.From[0], message.To[0]);
         }
         catch (Exception ex)
         {
             _logger.LogError(ex, "Error when sending e-mail");
             throw new EmailException("Error when sending e-mail", ex);
         }
     }
+
+    private MimeMessage PrepareMailMessage(ContactForm contactForm)
+    {
+        var from = contactForm.From;
+        var body = contactForm.Message;
+
+        if (string.IsNullOrWhiteSpace(from))
+        {
+            from = _emailSettings.Username;
+            body = $"From: {from}\r\nTo: {contactForm.To}\r\n-----\r\n\r\n{body}";
+        }
+
+        var message = new MimeMessage();
+        message.From.Add(new MailboxAddress(from, from));
+        message.Subject = $"🌐 CmsEngine - {contactForm.Subject}";
+
+        message.Body = new TextPart("plain")
+        {
+            Text = body
+        };
+
+        if (!string.IsNullOrWhiteSpace(contactForm.To))
+        {
+            message.To.Add(new MailboxAddress(contactForm.To, contactForm.To));
+        }
+
+        return message;
+    }
 }