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

Apply suggestions from PR

Browse Source
This commit is contained in:
Mole
2021-06-04 15:47:34 +02:00
parent a56de298a3
commit 96f88ac990
3 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Models/Email/NotificationEmailAddress.cs
View File

@@ -7,11 +7,11 @@ namespace Umbraco.Cms.Core.Models.Email
{
public string DisplayName { get; }
public string Adress { get; }
public string Address { get; }
public NotificationEmailAddress(string address, string displayName)
{
Adress = address;
Address = address;
DisplayName = displayName;
}
}

42
src/Umbraco.Infrastructure/Extensions/EmailMessageExtensions.cs
View File

@@ -55,6 +55,27 @@ namespace Umbraco.Cms.Infrastructure.Extensions
return messageToSend;
}
private static void AddAddresses(MimeMessage message, string[] addresses, Func<MimeMessage, InternetAddressList> addressListGetter, bool throwIfNoneValid = false)
{
var foundValid = false;
if (addresses != null)
{
foreach (var address in addresses)
{
if (InternetAddress.TryParse(address, out InternetAddress internetAddress))
{
addressListGetter(message).Add(internetAddress);
foundValid = true;
}
}
}
if (throwIfNoneValid && foundValid == false)
{
throw new InvalidOperationException($"Email could not be sent. Could not parse a valid recipient address.");
}
}
public static NotificationEmailModel ToNotificationEmail(this EmailMessage emailMessage,
string configuredFromAddress)
{
@@ -106,26 +127,5 @@ namespace Umbraco.Cms.Infrastructure.Extensions
return notificationAddresses;
}
private static void AddAddresses(MimeMessage message, string[] addresses, Func<MimeMessage, InternetAddressList> addressListGetter, bool throwIfNoneValid = false)
{
var foundValid = false;
if (addresses != null)
{
foreach (var address in addresses)
{
if (InternetAddress.TryParse(address, out InternetAddress internetAddress))
{
addressListGetter(message).Add(internetAddress);
foundValid = true;
}
}
}
if (throwIfNoneValid && foundValid == false)
{
throw new InvalidOperationException($"Email could not be sent. Could not parse a valid recipient address.");
}
}
}
}

30
src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs
View File

@@ -111,10 +111,10 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Extensions
NotificationEmailModel result = emailMessage.ToNotificationEmail(ConfiguredSender);
Assert.AreEqual(from, result.From.Adress);
Assert.AreEqual(from, result.From.Address);
Assert.AreEqual("", result.From.DisplayName);
Assert.AreEqual(1, result.To.Count());
Assert.AreEqual(to, result.To.First().Adress);
Assert.AreEqual(to, result.To.First().Address);
Assert.AreEqual("", result.To.First().DisplayName);
Assert.AreEqual(subject, result.Subject);
Assert.AreEqual(body, result.Body);
@@ -133,10 +133,10 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Extensions
NotificationEmailModel result = emailMessage.ToNotificationEmail(ConfiguredSender);
Assert.AreEqual(ConfiguredSender, result.From.Adress);
Assert.AreEqual(ConfiguredSender, result.From.Address);
Assert.AreEqual("", result.From.DisplayName);
Assert.AreEqual(1, result.To.Count());
Assert.AreEqual(to, result.To.First().Adress);
Assert.AreEqual(to, result.To.First().Address);
Assert.AreEqual("", result.To.First().DisplayName);
Assert.AreEqual(subject, result.Subject);
Assert.AreEqual(body, result.Body);
@@ -156,10 +156,10 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Extensions
NotificationEmailModel result = emailMessage.ToNotificationEmail(ConfiguredSender);
Assert.AreEqual("from@from.com", result.From.Adress);
Assert.AreEqual("from@from.com", result.From.Address);
Assert.AreEqual("From Email", result.From.DisplayName);
Assert.AreEqual(1, result.To.Count());
Assert.AreEqual("to@to.com", result.To.First().Adress);
Assert.AreEqual("to@to.com", result.To.First().Address);
Assert.AreEqual("To Email", result.To.First().DisplayName);
Assert.AreEqual(subject, result.Subject);
Assert.AreEqual(body, result.Body);
@@ -189,31 +189,31 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Extensions
var result = emailMessage.ToNotificationEmail(ConfiguredSender);
Assert.AreEqual("from@from.com", result.From.Adress);
Assert.AreEqual("from@from.com", result.From.Address);
Assert.AreEqual("From Email", result.From.DisplayName);
Assert.AreEqual(2, result.To.Count());
Assert.AreEqual("to@email.com", result.To.First().Adress);
Assert.AreEqual("to@email.com", result.To.First().Address);
Assert.AreEqual("", result.To.First().DisplayName);
Assert.AreEqual("to2@email.com", result.To.Skip(1).First().Adress);
Assert.AreEqual("to2@email.com", result.To.Skip(1).First().Address);
Assert.AreEqual("Second Email", result.To.Skip(1).First().DisplayName);
Assert.AreEqual(2, result.Cc.Count());
Assert.AreEqual("cc@email.com", result.Cc.First().Adress);
Assert.AreEqual("cc@email.com", result.Cc.First().Address);
Assert.AreEqual("First CC", result.Cc.First().DisplayName);
Assert.AreEqual("cc2@email.com", result.Cc.Skip(1).First().Adress);
Assert.AreEqual("cc2@email.com", result.Cc.Skip(1).First().Address);
Assert.AreEqual("", result.Cc.Skip(1).First().DisplayName);
Assert.AreEqual(3, result.Bcc.Count());
Assert.AreEqual("bcc@email.com", result.Bcc.First().Adress);
Assert.AreEqual("bcc@email.com", result.Bcc.First().Address);
Assert.AreEqual("", result.Bcc.First().DisplayName);
Assert.AreEqual("bcc2@email.com", result.Bcc.Skip(1).First().Adress);
Assert.AreEqual("bcc2@email.com", result.Bcc.Skip(1).First().Address);
Assert.AreEqual("", result.Bcc.Skip(1).First().DisplayName);
Assert.AreEqual("bcc3@email.com", result.Bcc.Skip(2).First().Adress);
Assert.AreEqual("bcc3@email.com", result.Bcc.Skip(2).First().Address);
Assert.AreEqual("Third BCC", result.Bcc.Skip(2).First().DisplayName);
Assert.AreEqual(1, result.ReplyTo.Count());
Assert.AreEqual("replyto@email.com", result.ReplyTo.First().Adress);
Assert.AreEqual("replyto@email.com", result.ReplyTo.First().Address);
Assert.AreEqual("", result.ReplyTo.First().DisplayName);
Assert.AreEqual(subject, result.Subject);