Fixed configuration for new Settings values

Author: mitchelsellers

src/NetCore.Utilities.Email.SendGrid.Tests/SmtpServiceTests.cs

@@ -11,11 +11,7 @@ public class SendGridServiceTests
         private readonly SendGridServiceOptions _options = new SendGridServiceOptions()
         {
             AdminEmail = "[email protected]",
-            Port = 15,
-            UseSsl = true,
-            SenderUsername = "User",
-            SenderPassword = "Password",
-            Server = "Server",
+            SendGridApiKey = "APIKEY",
             AddEnvironmentSuffix = false,
             AlwaysTemplateEmails = false
         };

src/NetCore.Utilities.Email.SendGrid.Tests/StartupExtensiosTests.cs

@@ -1,14 +1,13 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;
 
 namespace ICG.NetCore.Utilities.Email.SendGrid.Tests
 {
-    public class StartupExtensiosTests
+    public class StartupExtensionsTests
     {
         [Fact]
         public void Configuration_ShouldMapAllValues()
@@ -28,11 +27,11 @@ public void Configuration_ShouldMapAllValues()
             Assert.NotNull(myConfig);
             var values = myConfig.Value;
             Assert.Equal("[email protected]", values.AdminEmail);
-            Assert.Equal("test.SendGrid.com", values.Server);
-            Assert.Equal(527, values.Port);
-            Assert.True(values.UseSsl);
-            Assert.Equal("MySender", values.SenderUsername);
-            Assert.Equal("Password", values.SenderPassword);
+            Assert.Equal("TestKey", values.SendGridApiKey);
+            Assert.Single(values.AdditionalApiKeys);
+            var specialKeyValue = values.AdditionalApiKeys["SpecialSender"];
+            Assert.Equal("SpecialKey", specialKeyValue);
+
             Assert.True(values.AlwaysTemplateEmails);
             Assert.True(values.AddEnvironmentSuffix);
         }

src/NetCore.Utilities.Email.SendGrid.Tests/appsettings.json

@@ -1,11 +1,8 @@
 {
   "SendGridServiceOptions": {
     "AdminEmail": "[email protected]",
-    "Server": "test.SendGrid.com",
-    "Port": "527",
-    "UseSsl": true,
-    "SenderUsername": "MySender",
-    "SenderPassword": "Password",
+    "SendGridApiKey": "TestKey",
+    "AdditionalApiKeys": { "SpecialSender": "SpecialKey" },
     "AlwaysTemplateEmails": true,
     "AddEnvironmentSuffix": true
   }

src/NetCore.Utilities.Email.SendGrid/SendGridServiceOptions.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 namespace ICG.NetCore.Utilities.Email.SendGrid
 {
@@ -14,34 +15,14 @@ public class SendGridServiceOptions
         public string AdminEmail { get; set; }
 
         /// <summary>
-        ///     The server for outbound emails
+        /// The SendGrid API key that needs to 
         /// </summary>
-        [Display(Name = "Server")]
-        public string Server { get; set; }
+        public string SendGridApiKey { get; set; }
 
         /// <summary>
-        ///     The port to use for communication
+        /// Optional additional API Keys for sending outbound emails
         /// </summary>
-        [Display(Name = "Port")]
-        public int Port { get; set; }
-
-        /// <summary>
-        ///     Should this use SSL connection
-        /// </summary>
-        [Display(Name = "Use SSL")]
-        public bool UseSsl { get; set; }
-
-        /// <summary>
-        ///     The username to use for sending
-        /// </summary>
-        [Display(Name = "Sender Username")]
-        public string SenderUsername { get; set; }
-
-        /// <summary>
-        ///     THe password to use for sending
-        /// </summary>
-        [Display(Name = "Sender Password")]
-        public string SenderPassword { get; set; }
+        public Dictionary<string, string> AdditionalApiKeys { get; set; }
 
         /// <summary>
         ///     If selected outbound emails will be sent with the default template unless a special template is requested