Merge pull request #29 from notion-dotnet/feature/parse-error-response-and-make-it-available-in-exception

Parse error response and make it available in exception

Author: KoditkarVedant

Src/Notion.Client/NotionAPIErrorCode.cs

@@ -0,0 +1,43 @@
+using System.Runtime.Serialization;
+
+namespace Notion.Client
+{
+    public enum NotionAPIErrorCode
+    {
+        [EnumMember(Value = "invalid_json")]
+        InvalidJSON,
+
+        [EnumMember(Value = "invalid_request_url")]
+        InvalidRequestURL,
+
+        [EnumMember(Value = "invalid_request")]
+        InvalidRequest,
+
+        [EnumMember(Value = "validation_error")]
+        ValidationError,
+
+        [EnumMember(Value = "missing_version")]
+        MissingVersion,
+
+        [EnumMember(Value = "unauthorized")]
+        Unauthorized,
+
+        [EnumMember(Value = "restricted_resource")]
+        RestrictedResource,
+
+        [EnumMember(Value = "object_not_found")]
+        ObjectNotFound,
+
+        [EnumMember(Value = "conflict_error")]
+        ConflictError,
+
+        [EnumMember(Value = "rate_limited")]
+        RateLimited,
+
+        [EnumMember(Value = "internal_server_error")]
+        InternalServerError,
+
+        [EnumMember(Value = "service_unavailable")]
+        ServiceUnavailable,
+    }
+}

Src/Notion.Client/NotionApiErrorResponse.cs

@@ -0,0 +1,8 @@
+namespace Notion.Client
+{
+    class NotionApiErrorResponse
+    {
+        public NotionAPIErrorCode ErrorCode { get; set; }
+        public string Message { get; set; }
+    }
+}

Src/Notion.Client/NotionApiException.cs

@@ -3,15 +3,32 @@
 
 namespace Notion.Client
 {
-    class NotionApiException : Exception
+    public class NotionApiException : Exception
     {
-        public NotionApiException(HttpStatusCode statusCode, string message) : this(statusCode, message, null)
+        public NotionApiException(HttpStatusCode statusCode, NotionAPIErrorCode? notionAPIErrorCode, string message)
+            : this(statusCode, notionAPIErrorCode, message, null)
         {
         }
 
-        public NotionApiException(HttpStatusCode statusCode, string message, Exception innerException) : base(message, innerException)
+        public NotionApiException(HttpStatusCode statusCode, string message)
+            : this(statusCode, null, message, null)
         {
+        }
+
+        public NotionApiException(
+            HttpStatusCode statusCode,
+            NotionAPIErrorCode? notionAPIErrorCode,
+            string message,
+            Exception innerException) : base(message, innerException)
+        {
+            NotionAPIErrorCode = notionAPIErrorCode;
+            StatusCode = statusCode;
+
             Data.Add("StatusCode", statusCode);
+            Data.Add("NotionApiErrorCode", NotionAPIErrorCode);
         }
+
+        public NotionAPIErrorCode? NotionAPIErrorCode { get; }
+        public HttpStatusCode StatusCode { get; }
     }
 }

Src/Notion.Client/RestClient/RestClient.cs

@@ -48,31 +48,42 @@ public async Task<T> GetAsync<T>(
             JsonSerializerSettings serializerSettings = null,
             CancellationToken cancellationToken = default)
         {
-            EnsureHttpClient();
+            var response = await SendAsync(uri, HttpMethod.Get, queryParams, headers, cancellationToken: cancellationToken);
 
-            string requestUri = queryParams == null ? uri : QueryHelpers.AddQueryString(uri, queryParams);
+            return await response.ParseStreamAsync<T>(serializerSettings);
+        }
 
-            var response = await SendAsync(requestUri, HttpMethod.Get, headers, cancellationToken: cancellationToken);
+        private static async Task<Exception> BuildException(HttpResponseMessage response)
+        {
+            var errorBody = await response.Content.ReadAsStringAsync();
 
-            if (response.IsSuccessStatusCode)
+            NotionApiErrorResponse errorResponse = null;
+            if (!string.IsNullOrWhiteSpace(errorBody))
             {
-                return await response.ParseStreamAsync<T>(serializerSettings);
+                try
+                {
+                    errorResponse = JsonConvert.DeserializeObject<NotionApiErrorResponse>(errorBody);
+                }
+                catch
+                {
+                }
             }
 
-            var message = !string.IsNullOrWhiteSpace(response.ReasonPhrase)
-                    ? response.ReasonPhrase
-                    : await response.Content.ReadAsStringAsync();
-
-            throw new NotionApiException(response.StatusCode, message);
+            return new NotionApiException(response.StatusCode, errorResponse?.ErrorCode, errorResponse.Message);
         }
 
         private async Task<HttpResponseMessage> SendAsync(
             string requestUri,
             HttpMethod httpMethod,
+            IDictionary<string, string> queryParams = null,
             IDictionary<string, string> headers = null,
             Action<HttpRequestMessage> attachContent = null,
             CancellationToken cancellationToken = default)
         {
+            EnsureHttpClient();
+
+            requestUri = AddQueryString(requestUri, queryParams);
+
             HttpRequestMessage httpRequest = new HttpRequestMessage(httpMethod, requestUri);
             httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Bearer", _options.AuthToken);
             httpRequest.Headers.Add("Notion-Version", _options.NotionVersion);
@@ -84,7 +95,14 @@ private async Task<HttpResponseMessage> SendAsync(
 
             attachContent?.Invoke(httpRequest);
 
-            return await _httpClient.SendAsync(httpRequest, cancellationToken);
+            var response = await _httpClient.SendAsync(httpRequest, cancellationToken);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                throw await BuildException(response);
+            }
+
+            return response;
         }
 
         private static void AddHeaders(HttpRequestMessage request, IDictionary<string, string> headers)
@@ -103,55 +121,27 @@ public async Task<T> PostAsync<T>(
             JsonSerializerSettings serializerSettings = null,
             CancellationToken cancellationToken = default)
         {
-            EnsureHttpClient();
-
             void AttachContent(HttpRequestMessage httpRequest)
             {
                 httpRequest.Content = new StringContent(JsonConvert.SerializeObject(body, defaultSerializerSettings), Encoding.UTF8, "application/json");
             }
 
-            string requestUri = queryParams == null ? uri : QueryHelpers.AddQueryString(uri, queryParams);
-
-            var response = await SendAsync(requestUri, HttpMethod.Post, headers, AttachContent, cancellationToken: cancellationToken);
-
-            if (response.IsSuccessStatusCode)
-            {
-                return await response.ParseStreamAsync<T>(serializerSettings);
-            }
-
-            var message = !string.IsNullOrWhiteSpace(response.ReasonPhrase)
-                    ? response.ReasonPhrase
-                    : await response.Content.ReadAsStringAsync();
+            var response = await SendAsync(uri, HttpMethod.Post, queryParams, headers, AttachContent, cancellationToken: cancellationToken);
 
-            throw new NotionApiException(response.StatusCode, message);
+            return await response.ParseStreamAsync<T>(serializerSettings);
         }
 
         public async Task<T> PatchAsync<T>(string uri, object body, IDictionary<string, string> queryParams = null, IDictionary<string, string> headers = null, JsonSerializerSettings serializerSettings = null, CancellationToken cancellationToken = default)
         {
-            EnsureHttpClient();
-
             void AttachContent(HttpRequestMessage httpRequest)
             {
                 var serializedBody = JsonConvert.SerializeObject(body, defaultSerializerSettings);
                 httpRequest.Content = new StringContent(serializedBody, Encoding.UTF8, "application/json");
             }
 
-            string requestUri = queryParams == null ? uri : QueryHelpers.AddQueryString(uri, queryParams);
+            var response = await SendAsync(uri, new HttpMethod("PATCH"), queryParams, headers, AttachContent, cancellationToken: cancellationToken);
 
-            var response = await SendAsync(requestUri, new HttpMethod("PATCH"), headers, AttachContent, cancellationToken: cancellationToken);
-
-            if (response.IsSuccessStatusCode)
-            {
-                return await response.ParseStreamAsync<T>(serializerSettings);
-            }
-
-            var message = !string.IsNullOrWhiteSpace(response.ReasonPhrase)
-                    ? response.ReasonPhrase
-                    : await response.Content.ReadAsStringAsync();
-
-            var errorMessage = await response.Content.ReadAsStringAsync();
-
-            throw new NotionApiException(response.StatusCode, message);
+            return await response.ParseStreamAsync<T>(serializerSettings);
         }
 
         private HttpClient EnsureHttpClient()
@@ -164,5 +154,10 @@ private HttpClient EnsureHttpClient()
 
             return _httpClient;
         }
+
+        private static string AddQueryString(string uri, IDictionary<string, string> queryParams)
+        {
+            return queryParams == null ? uri : QueryHelpers.AddQueryString(uri, queryParams);
+        }
     }
 }