finale

sendgrid · Nov 24, 2023 · 6b4b5b8 · 6b4b5b8
1 parent 1519a0a
commit 6b4b5b8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/src/SendGrid/SendGridClient.cs b/src/SendGrid/SendGridClient.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
 
@@ -90,5 +91,6 @@ private static SendGridClientOptions buildOptions(string apiKey, string host, Di
                 HttpErrorAsException = httpErrorAsException
             };
         }
+
     }
 }
diff --git a/src/SendGrid/SendGridClientOptions.cs b/src/SendGrid/SendGridClientOptions.cs
@@ -9,6 +9,12 @@ namespace SendGrid
     /// </summary>
     public class SendGridClientOptions : BaseClientOptions
     {
+        Dictionary<string, string> REGION_HOST_MAP = new Dictionary<string, string>
+        {
+            {"eu", "https://api.eu.sendgrid.com/"},
+            {"global", "https://api.sendgrid.com/"}
+        };
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SendGridClientOptions"/> class.
         /// </summary>
@@ -18,11 +24,6 @@ public SendGridClientOptions()
         }
 
         private string apiKey;
-        Dictionary<string, string> REGION_HOST_MAP = new Dictionary<string, string>
-        {
-            {"eu", "https://api.eu.sendgrid.com/"},
-            {"global", "https://api.sendgrid.com/"}
-        };
 
         /// <summary>
         /// The Twilio SendGrid API key.
@@ -59,11 +60,8 @@ public SendGridClientOptions SetDataResidency(string region)
             {
                 Console.WriteLine("Region can only be 'global' or 'eu'.");
             }
-            else
-            {
-                Host = REGION_HOST_MAP[region];
-            }
-
+            string result = REGION_HOST_MAP.ContainsKey(region) ? REGION_HOST_MAP[region] : "https://api.sendgrid.com";
+            Host = result;
             return this;
         }
     }

diff --git a/tests/SendGrid.Tests/SendgridEmailClientTests.cs b/tests/SendGrid.Tests/SendgridEmailClientTests.cs
@@ -1,6 +1,7 @@
 namespace SendGrid.Tests
 {
     using System;
+    using SendGrid.Helpers.Mail;
     using Xunit;
 
     public class SendgridEmailClientTests
@@ -19,12 +20,24 @@ public void TestClientOptionsSetDataResidency()
             Assert.Equal("https://api.eu.sendgrid.com/", options.Host);
         }
         [Fact]
-        public void TestClientOptionsSetDataResidencyGlobalWrong()
+        public void TestClientOptionsSetDataResidencyEU()
         {
             var options = new SendGridClientOptions();
             options.SetDataResidency("eu");
-            Assert.Equal("https://api.sendgrid.com/", options.Host);
+            Assert.Equal("https://api.eu.sendgrid.com/", options.Host);
         }
 
+        [Fact]
+        public void TestClientOptionsSetViaSendgridClient()
+        {
+            var options = new SendGridClientOptions();
+            options.SetDataResidency("eu");
+            var sg = new SendGridClient(options);
+            Assert.Equal("https://api.eu.sendgrid.com/", options.Host);
+            Console.WriteLine(sg);
+            //Assert.Equal("https://api.eu.sendgrid.com/", sg.UrlPath);
+        }
+
+
     }
 }