v3.3.1 - update MailKit, add injected SMTP config

Author: John Campion Jr

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v3.3.1
+
+- Added MailKit builder to use injected config to allow it to come from .NET config system
+- Updated to MailKit 4.3.0
+
 ## v3.3
 
 - Added support for mailgun templates - [Original Source/Credit](https://github.com/gps-lasrol/FluentEmail/tree/support-mailgun-templates)

src/Directory.Build.props

@@ -11,7 +11,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>3.3.0</Version>
+    <Version>3.3.1</Version>
 
 
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

src/Senders/FluentEmail.MailKit/FluentEmail.MailKit.csproj

@@ -16,6 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="3.5.0" />
+    <PackageReference Include="MailKit" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
   </ItemGroup>
 </Project>

src/Senders/FluentEmail.MailKit/FluentEmailMailKitBuilderExtensions.cs

@@ -1,7 +1,9 @@
 using FluentEmail.Core.Interfaces;
 using FluentEmail.MailKitSmtp;
 using MailKit;
+using MailKit.Security;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -17,5 +19,28 @@ public static FluentEmailServicesBuilder AddMailKitSender(this FluentEmailServic
             builder.Services.TryAdd(ServiceDescriptor.Scoped<ISender>(_ => new MailKitSender(smtpClientOptions, protocolLogger)));
             return builder;
         }
+        public static FluentEmailServicesBuilder AddMailKitSender(this FluentEmailServicesBuilder builder, string configPath = "SmtpClientOptions")
+        {
+            builder.Services.AddOptions<SmtpClientOptions>().BindConfiguration(configPath);
+            builder.Services.TryAddScoped<SmtpClientOptions>(resolver =>
+            {
+                var smtpOptions = resolver.GetRequiredService<IOptions<SmtpClientOptions>>();
+                if (smtpOptions.Value is null)
+                {
+                    throw new System.Exception("SmtpClientOptions is null");
+                }
+                if (smtpOptions.Value.User is not null && smtpOptions.Value.Password is not null)
+                {
+                    smtpOptions.Value.RequiresAuthentication = true;
+                    smtpOptions.Value.UseSsl = true;
+                    if (smtpOptions.Value.SocketOptions is null)
+                        smtpOptions.Value.SocketOptions = SecureSocketOptions.StartTls;
+                }
+                return smtpOptions.Value;
+            });
+            builder.Services.TryAddScoped<ISender, MailKitSender>();
+            return builder;
+        }
+
     }
 }