reactiveui · anaisbetts · Jul 6, 2014 · Jun 27, 2014 · Jun 28, 2014 · Jun 30, 2014
diff --git a/Refit-Tests/RestService.cs b/Refit-Tests/RestService.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using System.Net.Http;
 using NUnit.Framework;
 using System.Threading.Tasks;
@@ -46,6 +47,9 @@ public interface IGitHubApi
 
         [Get("/")]
         Task<HttpResponseMessage> GetIndex();
+
+        [Get("/give-me-some-404-action")]
+        Task NothingToSeeHere();
     }
 
     public class RootObject
@@ -111,7 +115,7 @@ public void PostToRequestBin()
                 ae.Handle(
                     x =>
                     {
-                        if (x is HttpRequestException)
+                        if (x is ApiException)
                         {
                             // we should be good but maybe a 404 occurred
                             return true;
@@ -123,6 +127,22 @@ public void PostToRequestBin()
             }
         }
 
+        [Test]
+        public async Task CanGetDataOutOfErrorResponses() 
+        {
+            var fixture = RestService.For<IGitHubApi>("https://api.github.com");
+            try {
+                await fixture.NothingToSeeHere();
+                Assert.Fail();
+            }
+            catch (ApiException exception) {
+                Assert.AreEqual(HttpStatusCode.NotFound, exception.StatusCode);
+                var content = exception.GetContentAs<dynamic>();
+                Assert.AreEqual("Not Found", (string)content.message);
+                Assert.IsNotNull((string)content.documentation_url);
+            }
+        }
+
         public interface IRequestBin
         {
             [Post("/1h3a5jm1")]

diff --git a/Refit/RequestBuilderImplementation.cs b/Refit/RequestBuilderImplementation.cs
@@ -1,14 +1,16 @@
 using System;
+using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http.Headers;
 using System.Reflection;
 using System.Threading.Tasks;
 using System.Text.RegularExpressions;
 using System.Text;
 using Newtonsoft.Json;
 using System.IO;
-using System.Web;
+using HttpUtility = System.Web.HttpUtility;
 using System.Threading;
 
 namespace Refit
@@ -180,7 +182,9 @@ Func<HttpClient, object[], Task> buildVoidTaskFuncForMethod(RestMethodInfo restM
                 var rq = factory(paramList);
                 var resp = await client.SendAsync(rq);
 
-                resp.EnsureSuccessStatusCode();
+                if (!resp.IsSuccessStatusCode) {
+                    throw await ApiException.Create(resp);
+                }
             };
         }
 
@@ -195,7 +199,9 @@ Func<HttpClient, object[], Task<T>> buildTaskFuncForMethod<T>(RestMethodInfo res
                     return resp as T;
                 }
 
-                resp.EnsureSuccessStatusCode();
+                if (!resp.IsSuccessStatusCode) {
+                    throw await ApiException.Create(resp);
+                }
 
                 var content = await resp.Content.ReadAsStringAsync();
                 if (restMethod.SerializedReturnType == typeof(string)) {
@@ -511,4 +517,56 @@ void determineReturnTypeInfo(MethodInfo methodInfo)
             throw new ArgumentException("All REST Methods must return either Task<T> or IObservable<T>");
         }
     }
+
+    public class ApiException : Exception
+    {
+        public HttpStatusCode StatusCode { get; private set; }
+        public string ReasonPhrase { get; private set; }
+        public HttpResponseHeaders Headers { get; private set; }
+
+        public HttpContentHeaders ContentHeaders { get; private set; }
+        public string Content { get; private set; }
+        public bool HasContent
+        {
+            get { return !string.IsNullOrWhiteSpace(Content); }
+        }
+
+        private ApiException(HttpStatusCode statusCode, string reasonPhrase, HttpResponseHeaders headers)
+            : base(createMessage(statusCode, reasonPhrase)) {
+            StatusCode = statusCode;
+            ReasonPhrase = reasonPhrase;
+            Headers = headers;
+        }
+
+        public T GetContentAs<T>()
+        {
+            return HasContent
+                       ? JsonConvert.DeserializeObject<T>(Content)
+                       : default(T);
+        }
+
+        public static async Task<ApiException> Create(HttpResponseMessage response) {
+            var exception = new ApiException(response.StatusCode, response.ReasonPhrase, response.Headers);
+
+            if (response.Content == null) return exception;
+
+            try {
+                exception.ContentHeaders = response.Content.Headers;
+                exception.Content = await response.Content.ReadAsStringAsync();
+                response.Content.Dispose();
+            }
+            catch {
+                // We're already handling an exception at this point, 
+                // so we want to make sure we don't throw another one 
+                // that hides the real error.
+            }
+
+            return exception;
+        }
+
+        static string createMessage(HttpStatusCode statusCode, string reasonPhrase)
+        {
+            return string.Format("Response status code does not indicate success: {0} ({1}).", (int)statusCode, reasonPhrase);
+        }
+    }
 }