Merge pull request #417 from nofrixion/MOOV-3586-Load-Tribe-Account-When-Payin-Complete

Support for receiving data in case of non-success response

Author: sauravmaiti22

src/NoFrixion.MoneyMoov/RestClient/RestApiClient.cs

@@ -61,6 +61,8 @@ public class RestApiClient : IRestApiClient, IDisposable
     private bool _disposed;
 
     public HttpClient HttpClient { get; set; }
+    
+    private readonly bool _dataExpectedOnErrorResponse;
 
     public RestApiClient(string baseUri)
     {
@@ -77,6 +79,12 @@ public RestApiClient(IHttpClientFactory httpClientFactory, string httpClientName
     {
         HttpClient = httpClientFactory.CreateClient(httpClientName);
     }
+    
+    public RestApiClient(HttpClient httpClient, bool dataExpectedOnErrorResponse)
+    {
+        HttpClient = httpClient;
+        _dataExpectedOnErrorResponse = dataExpectedOnErrorResponse;
+    }
 
     public Uri GetBaseUri()
         => HttpClient.BaseAddress ?? new Uri(MoneyMoovUrlBuilder.DEFAULT_MONEYMOOV_BASE_URL);
@@ -200,8 +208,18 @@ private async Task<RestApiResponse<T>> ToApiResponse<T>(HttpResponseMessage resp
         }
         else if (response.Content.Headers.ContentLength > 0)
         {
-            string contentStr = await response.Content.ReadAsStringAsync();
+            var contentStr = await response.Content.ReadAsStringAsync();
             var problem = DeserialiseProblem(response.StatusCode, contentStr);
+
+            if (_dataExpectedOnErrorResponse)
+            {
+                var result = TryDeserialiseDataOnErrorResponse<T>(contentStr);
+                
+                if (result != null)
+                {
+                    return new RestApiResponse<T>(response.StatusCode, requestUri, response.Headers, problem, result);
+                }
+            }
             return new RestApiResponse<T>(response.StatusCode, requestUri, response.Headers, problem);
         }
         else
@@ -210,6 +228,18 @@ private async Task<RestApiResponse<T>> ToApiResponse<T>(HttpResponseMessage resp
                 new NoFrixionProblem(response.StatusCode, "Response content was expected."));
         }
     }
+    
+    private T? TryDeserialiseDataOnErrorResponse<T>(string contentStr)
+    {
+        try
+        {
+            return contentStr.FromJson<T>();
+        }
+        catch (Newtonsoft.Json.JsonException)
+        {
+            return default;
+        }
+    }
 
     /// <summary>
     /// Attempts to deserialise a problem object from the contents of a failure response.

src/NoFrixion.MoneyMoov/RestClient/RestApiResponse.cs

@@ -104,6 +104,13 @@ public RestApiResponse(HttpStatusCode statusCode, Uri? requestUri, NoFrixionProb
     public RestApiResponse(HttpStatusCode statusCode, Uri? requestUri, Option<HttpResponseHeaders> headers, NoFrixionProblem problem)
         : base(statusCode, requestUri, headers, problem)
     { }
+
+    public RestApiResponse(HttpStatusCode statusCode, Uri? requestUri, Option<HttpResponseHeaders> headers,
+        NoFrixionProblem problem, T data)
+        : base(statusCode, requestUri, headers, problem)
+    {
+        Data = data;
+    }
  }
 
 /// <summary>