yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doesn't send async if not using a network based SMTP server

Browse Source
This commit is contained in:
Shannon
2017-07-11 15:06:18 +10:00
parent 3c31e33000
commit 50a896a6cc
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Umbraco.Core/Security/EmailService.cs
View File

@@ -9,17 +9,33 @@ namespace Umbraco.Core.Security
{
public async Task SendAsync(IdentityMessage message)
{
using (var client = new SmtpClient())
using (var mailMessage = new MailMessage(
UmbracoConfig.For.UmbracoSettings().Content.NotificationEmailAddress,
var mailMessage = new MailMessage(
UmbracoConfig.For.UmbracoSettings().Content.NotificationEmailAddress,
message.Destination,
message.Subject,
message.Body))
{
mailMessage.IsBodyHtml = message.Body.IsNullOrWhiteSpace() == false
&& message.Body.Contains("<") && message.Body.Contains("</");
message.Body)
{
IsBodyHtml = message.Body.IsNullOrWhiteSpace() == false
&& message.Body.Contains("<") && message.Body.Contains("</")
};
await client.SendMailAsync(mailMessage);
try
{
using (var client = new SmtpClient())
{
if (client.DeliveryMethod == SmtpDeliveryMethod.Network)
{
await client.SendMailAsync(mailMessage);
}
else
{
client.Send(mailMessage);
}
}
}
finally
{
mailMessage.Dispose();
}
}
}