#59, #63 Include response content in WebPushException & Improve the error message when the request fails

Author: coryjthompson

WebPush.Test/WebPushClientTest.cs

@@ -138,24 +138,35 @@ public void TestHandlingSuccessHttpCodes(HttpStatusCode status)
         [TestMethod]
         [DataRow(HttpStatusCode.BadRequest, "Bad Request")]
         [DataRow(HttpStatusCode.RequestEntityTooLarge, "Payload too large")]
-        [DataRow((HttpStatusCode)429, "Too many request.")]
+        [DataRow((HttpStatusCode)429, "Too many request")]
         [DataRow(HttpStatusCode.NotFound, "Subscription no longer valid")]
         [DataRow(HttpStatusCode.Gone, "Subscription no longer valid")]
         [DataRow(HttpStatusCode.InternalServerError, "Received unexpected response code: 500")]
         public void TestHandlingFailureHttpCodes(HttpStatusCode status, string expectedMessage)
         {
             var actual = Assert.ThrowsException<WebPushException>(() => TestSendNotification(status));
-
             Assert.AreEqual(expectedMessage, actual.Message);
         }
 
-        private void TestSendNotification(HttpStatusCode status)
+        [TestMethod]
+        [DataRow(HttpStatusCode.BadRequest, "authorization key missing", "Bad Request. Details: authorization key missing")]
+        [DataRow(HttpStatusCode.RequestEntityTooLarge, "max size is 512", "Payload too large. Details: max size is 512")]
+        [DataRow((HttpStatusCode)429, "the api is limited", "Too many request. Details: the api is limited")]
+        [DataRow(HttpStatusCode.NotFound, "", "Subscription no longer valid")]
+        [DataRow(HttpStatusCode.Gone, "", "Subscription no longer valid")]
+        [DataRow(HttpStatusCode.InternalServerError, "internal error", "Received unexpected response code: 500. Details: internal error")]
+        public void TestHandlingFailureMessages(HttpStatusCode status, string response, string expectedMessage)
         {
-            var subscription = new PushSubscription(TestFcmEndpoint, TestPublicKey, TestPrivateKey); ;
-            httpMessageHandlerMock.When(TestFcmEndpoint).Respond(status);
+            var actual = Assert.ThrowsException<WebPushException>(() => TestSendNotification(status, response));
+            Assert.AreEqual(expectedMessage, actual.Message);
+        }
 
+        private void TestSendNotification(HttpStatusCode status, string response=null)
+        {
+            var subscription = new PushSubscription(TestFcmEndpoint, TestPublicKey, TestPrivateKey);
+            var httpContent = response == null ? null : new StringContent(response);
+            httpMessageHandlerMock.When(TestFcmEndpoint).Respond(new HttpResponseMessage { StatusCode = status, Content = httpContent });
             client.SetVapidDetails(TestSubject, TestPublicKey, TestPrivateKey);
-
             client.SendNotification(subscription, "123");
         }
     }

WebPush/Model/WebPushException.cs

@@ -1,21 +1,22 @@
 using System;
 using System.Net;
+using System.Net.Http;
 using System.Net.Http.Headers;
 
 namespace WebPush
 {
     public class WebPushException : Exception
     {
-        public WebPushException(string message, HttpStatusCode statusCode, HttpResponseHeaders headers,
-            PushSubscription pushSubscription) : base(message)
+        public WebPushException(string message, PushSubscription pushSubscription, HttpResponseMessage responseMessage) : base(message)
         {
-            StatusCode = statusCode;
-            Headers = headers;
             PushSubscription = pushSubscription;
+            HttpResponseMessage = responseMessage;
         }
 
-        public HttpStatusCode StatusCode { get; set; }
-        public HttpResponseHeaders Headers { get; set; }
+        public HttpStatusCode StatusCode => HttpResponseMessage.StatusCode;
+
+        public HttpResponseHeaders Headers => HttpResponseMessage.Headers;
         public PushSubscription PushSubscription { get; set; }
+        public HttpResponseMessage HttpResponseMessage { get; set; }
     }
 }

WebPush/WebPushClient.cs

@@ -359,28 +359,33 @@ private static void HandleResponse(HttpResponseMessage response, PushSubscriptio
             }
 
             // Error
-            var message = @"Received unexpected response code: " + (int)response.StatusCode;
+            var responseCodeMessage = @"Received unexpected response code: " + (int)response.StatusCode;
             switch (response.StatusCode)
             {
                 case HttpStatusCode.BadRequest:
-                    message = "Bad Request";
+                    responseCodeMessage = "Bad Request";
                     break;
 
                 case HttpStatusCode.RequestEntityTooLarge:
-                    message = "Payload too large";
+                    responseCodeMessage = "Payload too large";
                     break;
 
                 case (HttpStatusCode)429:
-                    message = "Too many request.";
+                    responseCodeMessage = "Too many request";
                     break;
 
                 case HttpStatusCode.NotFound:
                 case HttpStatusCode.Gone:
-                    message = "Subscription no longer valid";
+                    responseCodeMessage = "Subscription no longer valid";
                     break;
             }
 
-            throw new WebPushException(message, response.StatusCode, response.Headers, subscription);
+            var details = response.Content?.ReadAsStringAsync().GetAwaiter().GetResult();
+            var message = string.IsNullOrEmpty(details)
+                ? responseCodeMessage
+                : $"{responseCodeMessage}. Details: {details}";
+
+            throw new WebPushException(message, subscription, response);
         }
 
         public void Dispose()