From ad31db9f4afa888a88e5617d25f94d43d856336b Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Wed, 20 May 2020 00:21:45 +0200
Subject: [PATCH] Adding DeliveryMethod option which we make use of in
 EmailSender.cs

---
 src/Umbraco.Configuration/Legacy/SmtpSettings.cs       |  1 +
 src/Umbraco.Configuration/Models/GlobalSettings.cs     |  5 +++--
 src/Umbraco.Core/Configuration/ISmtpSettings.cs        |  1 +
 .../Builders/SmtpSettingsBuilder.cs                    | 10 ++++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Configuration/Legacy/SmtpSettings.cs b/src/Umbraco.Configuration/Legacy/SmtpSettings.cs
index 7e3ff80690..beb6eb9691 100644
--- a/src/Umbraco.Configuration/Legacy/SmtpSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/SmtpSettings.cs
@@ -8,5 +8,6 @@ namespace Umbraco.Configuration
         public string Host { get; set; }
         public int Port { get; set; }
         public string PickupDirectoryLocation { get; set; }
+        public string DeliveryMethod { get; set; }
     }
 }
diff --git a/src/Umbraco.Configuration/Models/GlobalSettings.cs b/src/Umbraco.Configuration/Models/GlobalSettings.cs
index 4b30813bd5..646bca0f13 100644
--- a/src/Umbraco.Configuration/Models/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/Models/GlobalSettings.cs
@@ -72,10 +72,10 @@ namespace Umbraco.Configuration.Models
             _configuration.GetValue(Prefix + "NoNodesViewPath", "~/config/splashes/NoNodes.cshtml");
 
         public bool IsSmtpServerConfigured =>
-            _configuration.GetSection(Constants.Configuration.ConfigPrefix + "Smtp")?.GetChildren().Any() ?? false;
+            _configuration.GetSection(Constants.Configuration.ConfigGlobalPrefix + "Smtp")?.GetChildren().Any() ?? false;
 
         public ISmtpSettings SmtpSettings =>
-            new SmtpSettingsImpl(_configuration.GetSection(Constants.Configuration.ConfigPrefix + "Smtp"));
+            new SmtpSettingsImpl(_configuration.GetSection(Constants.Configuration.ConfigGlobalPrefix + "Smtp"));
 
         private class SmtpSettingsImpl : ISmtpSettings
         {
@@ -90,6 +90,7 @@ namespace Umbraco.Configuration.Models
             public string Host => _configurationSection.GetValue<string>("Host");
             public int Port => _configurationSection.GetValue<int>("Port");
             public string PickupDirectoryLocation => _configurationSection.GetValue<string>("PickupDirectoryLocation");
+            public string DeliveryMethod => _configurationSection.GetValue<string>("DeliveryMethod");
         }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/ISmtpSettings.cs b/src/Umbraco.Core/Configuration/ISmtpSettings.cs
index c2fb4b2dbe..217e83455b 100644
--- a/src/Umbraco.Core/Configuration/ISmtpSettings.cs
+++ b/src/Umbraco.Core/Configuration/ISmtpSettings.cs
@@ -6,5 +6,6 @@ namespace Umbraco.Core.Configuration
         string Host { get; }
         int Port{ get; }
         string PickupDirectoryLocation { get; }
+        string DeliveryMethod { get; }
     }
 }
diff --git a/src/Umbraco.Tests.Common/Builders/SmtpSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/SmtpSettingsBuilder.cs
index 344d7bcf87..140af5f723 100644
--- a/src/Umbraco.Tests.Common/Builders/SmtpSettingsBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/SmtpSettingsBuilder.cs
@@ -16,6 +16,7 @@ namespace Umbraco.Tests.Common.Builders
         private string _host;
         private int? _port;
         private string _pickupDirectoryLocation;
+        private string _deliveryMethod;
 
         public SmtpSettingsBuilder(TParent parentBuilder) : base(parentBuilder)
         {
@@ -45,12 +46,19 @@ namespace Umbraco.Tests.Common.Builders
             return this;
         }
 
+        public SmtpSettingsBuilder<TParent> WithDeliveryMethod(string deliveryMethod)
+        {
+            _deliveryMethod = deliveryMethod;
+            return this;
+        }
+
         public override ISmtpSettings Build()
         {
             var from = _from ?? null;
             var host = _host ?? null;
             var port = _port ?? 25;
             var pickupDirectoryLocation = _pickupDirectoryLocation ?? null;
+            var deliveryMethod = _deliveryMethod ?? null;
 
             return new TestSmtpSettings()
             {
@@ -58,6 +66,7 @@ namespace Umbraco.Tests.Common.Builders
                 Host = host,
                 Port = port,
                 PickupDirectoryLocation = pickupDirectoryLocation,
+                DeliveryMethod = deliveryMethod
             };
         }
 
@@ -67,6 +76,7 @@ namespace Umbraco.Tests.Common.Builders
             public string Host { get; set; }
             public int Port { get; set; }
             public string PickupDirectoryLocation { get; set; }
+            public string DeliveryMethod { get; set; }
         }
     }
 }