Refactored settings to IOptions pattern, added user secrets for Google Maps API Key

Author: lorddev

Devlord.Utilities.sln.DotSettings

@@ -15,4 +15,6 @@
 	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Devlord_002EUtilities_003B_002A_003BDevlord_002EUtilities_002EResources_002E_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EdotCover_002EIde_002ECore_002EFilterManagement_002EModel_002ESolutionFilterSettingsManagerMigrateSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters&gt;&lt;Filter ModuleMask="Devlord.Utilities" ModuleVersionMask="*" ClassMask="Devlord.Utilities.Properties.*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Devlord.Utilities" ModuleVersionMask="*" ClassMask="Devlord.Utilities.Resources.*" FunctionMask="*" IsEnabled="True" /&gt;&lt;/ExcludeFilters&gt;&lt;/data&gt;</s:String>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Devlord/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=botmail/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Devlord/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mailbot/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Devlord.Utilities/Devlord.Utilities.csproj

@@ -25,6 +25,7 @@
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Next" Version="2.1.1" />
     <PackageReference Include="Elmah.Io.AspNetCore" Version="3.2.39-pre" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
     <ProjectReference Include="..\Encryptamajig\Encryptamajig.csproj" />

src/Devlord.Utilities/DevlordSettings.cs renamed to src/Devlord.Utilities/DevlordOptions.cs

@@ -18,17 +18,18 @@
 
 namespace Devlord.Utilities
 {
-    public class DevlordSettings
+    public class DevlordOptions
     {
         public string GoogleMapsApiKey { get; set; }
         private static readonly IConfiguration _configuration = GetConfig();
 
-        public static DevlordSettings Default { get; } = new DevlordSettings();
+        public static DevlordOptions Default { get; } = new DevlordOptions();
 
         public int SmtpPort => int.Parse(GetValue("SmtpPort"));
         public string SmtpLogin => GetValue("SmtpLogin");
         public string SmtpPassword => GetValue("SmtpPassword");
-        
+        public string SmtpServer { get; set; }
+
         private static IConfiguration GetConfig()
         {
             var builder = new ConfigurationBuilder()

src/Devlord.Utilities/DevlordSettingsExtension.cs

@@ -0,0 +1,28 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DevlordSettingsExtension.cs" company="Lord Design">
+//   © 2022 Lord Design
+// </copyright>
+// <license type="GPL-3.0">
+//   You may use freely and commercially without modification; if you make changes, please share back to the
+//   community.
+// </license>
+// <author>Aaron Lord</author>
+// --------------------------------------------------------------------------------------------------------------------
+
+using Devlord.Utilities;
+using Microsoft.Extensions.Configuration;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class DevlordSettingsExtension
+    {
+        public static IServiceCollection AddDevlordUtilities(this IServiceCollection services,
+            IConfiguration namedConfigurationSection)
+        {
+            services.Configure<DevlordOptions>(namedConfigurationSection);
+            services.AddSingleton<IMailbotFactory, MailbotFactory>();
+
+            return services;
+        }
+    }
+}

src/Devlord.Utilities/IMailbotFactory.cs

@@ -0,0 +1,18 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IMailbotFactory.cs" company="Lord Design">
+//   © 2022 Lord Design
+// </copyright>
+// <license type="GPL-3.0">
+//   You may use freely and commercially without modification; if you make changes, please share back to the
+//   community.
+// </license>
+// <author>Aaron Lord</author>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace Devlord.Utilities
+{
+    public interface IMailbotFactory
+    {
+        Mailbot GetMailbot(string smtpServer);
+    }
+}

src/Devlord.Utilities/Mailbot.Core.cs

@@ -10,28 +10,37 @@
 // <author>aaron@lorddesign.net</author>
 // --------------------------------------------------------------------------------------------------------------------
 
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Devlord.Utilities.Cryptography;
+using MailKit.Net.Smtp;
+using MailKit.Security;
+using MimeKit;
 
 namespace Devlord.Utilities
 {
     /// <summary>
     /// Multi-threaded mailer to keep your systems running by sending messages asynchronously. If you're using it in a
     /// service that sends a lot of messages, be aware that you'll be limited by your .NET working threads.
     /// </summary>
-    public partial class Mailbot
+    public class Mailbot
     {
-        private static readonly object DictionaryLock = new object();
+        #region Fields
 
-        private static readonly Dictionary<string, Mailbot> Instances = new Dictionary<string, Mailbot>();
+        private readonly Crypt _crypt = new Crypt();
 
+        /// <summary>
+        /// The throttles.
+        /// </summary>
+        internal Throttles Throttles = new Throttles();
+
+        #endregion
+        
         #region Constructors and Destructors
 
         /// <summary>
         /// Private constructor to enforce use of singleton.
         /// </summary>
-        private Mailbot()
+        internal Mailbot()
         {
             _crypt.Key = new byte[]
             {
@@ -51,51 +60,49 @@ private Mailbot()
         /// <summary>
         /// Gets the SMTP server.
         /// </summary>
-        public string SmtpServer { get; private set; }
+        public string SmtpServer { get; internal set; }
+
+        public int SmtpPort { get; internal set; }
+        public string SmtpLogin { get; internal set; }
+        public string EncryptedPassword { get; internal set; }
 
         #endregion
 
-        // Per minute 180, Per hour 3600, Per day 10,000
+        #region Methods
 
+        // Per minute 180, Per hour 3600, Per day 10,000
         public async Task QueueMail(Botmail message)
         {
             await SendMail(message);
         }
 
-        /// <summary>
-        /// Gets the instance.
-        /// </summary>
-        public static Mailbot GetInstance(string smtpServer)
+
+        // Per minute 180, Per hour 3600, Per day 10,000
+        private async Task SendMail(Botmail botmail)
         {
-            smtpServer = smtpServer.ToLower();
-            lock (DictionaryLock)
+            Throttles.Wait();
+
+            var mm = new MimeMessage();
+            mm.From.Add(new MailboxAddress(botmail.Addresser));
+            mm.Subject = botmail.Subject;
+            mm.Body = new TextPart(botmail.Format.ToString().ToLower())
+            {
+                Text = botmail.Body
+            };
+
+            botmail.Addressees.ForEach(a => mm.To.Add(new MailboxAddress(a)));
+            using (var client = new SmtpClient())
             {
-                if (Instances.ContainsKey(smtpServer))
-                {
-                    return Instances[smtpServer];
-                }
-
-                var instance = new Mailbot { SmtpServer = smtpServer };
-                if (smtpServer == "smtp.gmail.com")
-                {
-                    instance._throttles = new GmailThrottles();
-                }
-
-                instance.SmtpServer = smtpServer;
-                Instances.Add(smtpServer, instance);
-                return instance;
+                client.Connect(SmtpServer, SmtpPort, SecureSocketOptions.SslOnConnect);
+                await client.AuthenticateAsync(SmtpLogin,
+                    _crypt.DecryptSecret(EncryptedPassword));
+                await client.SendAsync(mm);
+                Throttles.Increment();
+                client.Disconnect(true);
             }
         }
 
-        #region Fields
-
-        private readonly Crypt _crypt = new Crypt();
-
-        /// <summary>
-        /// The throttles.
-        /// </summary>
-        private Throttles _throttles = new Throttles();
-
         #endregion
+
     }
 }