From 96f88ac990c6423756582dffaa05a5d0c4c154e5 Mon Sep 17 00:00:00 2001 From: Mole Date: Fri, 4 Jun 2021 15:47:34 +0200 Subject: [PATCH] Apply suggestions from PR --- .../Models/Email/NotificationEmailAddress.cs | 4 +- .../Extensions/EmailMessageExtensions.cs | 42 +++++++++---------- .../Extensions/EmailMessageExtensionsTests.cs | 30 ++++++------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/Umbraco.Core/Models/Email/NotificationEmailAddress.cs b/src/Umbraco.Core/Models/Email/NotificationEmailAddress.cs index 04da915fab..755947c6a4 100644 --- a/src/Umbraco.Core/Models/Email/NotificationEmailAddress.cs +++ b/src/Umbraco.Core/Models/Email/NotificationEmailAddress.cs @@ -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; } } diff --git a/src/Umbraco.Infrastructure/Extensions/EmailMessageExtensions.cs b/src/Umbraco.Infrastructure/Extensions/EmailMessageExtensions.cs index 3e1483c744..f7bed9d74c 100644 --- a/src/Umbraco.Infrastructure/Extensions/EmailMessageExtensions.cs +++ b/src/Umbraco.Infrastructure/Extensions/EmailMessageExtensions.cs @@ -55,6 +55,27 @@ namespace Umbraco.Cms.Infrastructure.Extensions return messageToSend; } + private static void AddAddresses(MimeMessage message, string[] addresses, Func 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 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."); - } - } } } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs index f348a6e9a1..709873e8a3 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs @@ -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);