Merge pull request #19 from mailjet/fix-for-500-and-429-errors

Fix for 500 and 429 errors

Author: mskochev

Mailjet.Client/MailjetClient.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
+using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
@@ -26,6 +27,9 @@ public class MailjetClient : IMailjetClient
         private const string ApiVersionPathV3 = "v3";
         private const string ApiVersionPathV3_1 = "v3.1";
         private const string ApiVersionPathV4 = "v4";
+        private const string ErrorInfo = "ErrorInfo";
+        private const string TooManyRequestsMessage = "Too many requests";
+        private const string InternalServerErrorGeneralMessage = "Internal Server Error";
 
         private HttpClient _httpClient;
 
@@ -119,7 +123,18 @@ private async Task<JObject> GetContent(HttpResponseMessage responseMessage)
 
                 if (!responseMessage.IsSuccessStatusCode)
                 {
-                    content.Add("ErrorInfo", new JValue(responseMessage.ReasonPhrase));
+                    if (responseMessage.StatusCode == ((HttpStatusCode) 429))
+                    {
+                        content.Add(ErrorInfo, new JValue(TooManyRequestsMessage));
+                    }
+                    else if (responseMessage.StatusCode == HttpStatusCode.InternalServerError)
+                    {
+                        content.Add(ErrorInfo, new JValue(InternalServerErrorGeneralMessage));
+                    }
+                    else
+                    {
+                        content.Add(ErrorInfo, new JValue(responseMessage.ReasonPhrase));
+                    }
                 }
             }
 

Mailjet.Tests/MailjetClientTests.cs

@@ -4,6 +4,7 @@
 using Newtonsoft.Json.Linq;
 using RichardSzalay.MockHttp;
 using System;
+using System.Net;
 using sms = Mailjet.Client.Resources.SMS;
 
 namespace Mailjet.Tests
@@ -69,6 +70,50 @@ public void TestGetAsync()
             Assert.IsTrue(JToken.DeepEquals(expectedData, response.GetData()));
         }
 
+        [TestMethod]
+        public void TestTooManyRequestsStatus()
+        {
+            var mockHttp = new MockHttpMessageHandler();
+            mockHttp.When("https://api.mailjet.com/v3/*")
+                   .Respond(((HttpStatusCode) 429));
+
+            // Inject the handler into your application code
+            IMailjetClient client = new MailjetClient(ApiKeyTest, ApiSecretTest, mockHttp);
+
+            MailjetRequest request = new MailjetRequest
+            {
+                Resource = Apikey.Resource,
+            };
+
+            MailjetResponse response = client.GetAsync(request).Result;
+
+            Assert.AreEqual(429, response.StatusCode);
+            Assert.AreEqual("Too many requests", response.GetErrorInfo());
+        }
+
+
+        [TestMethod]
+        public void TestInternalServerErrorStatus()
+        {
+            var mockHttp = new MockHttpMessageHandler();
+            mockHttp.When("https://api.mailjet.com/v3/*")
+                   .Respond(HttpStatusCode.InternalServerError);
+
+
+            // Inject the handler into your application code
+            IMailjetClient client = new MailjetClient(ApiKeyTest, ApiSecretTest, mockHttp);
+
+            MailjetRequest request = new MailjetRequest
+            {
+                Resource = Apikey.Resource,
+            };
+
+            MailjetResponse response = client.GetAsync(request).Result;
+
+            Assert.AreEqual(500, response.StatusCode);
+            Assert.AreEqual("Internal Server Error", response.GetErrorInfo());
+        }
+
         [TestMethod]
         public void TestSmsCountAsync()
         {