Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass request error status codes through to ForceException #369

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/CommonLibrariesForNET/AuthenticationClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public async Task TokenRefreshAsync(string clientId, string refreshToken, string
else
{
var errorResponse = JsonConvert.DeserializeObject<AuthErrorResponse>(response);
throw new ForceException(errorResponse.Error, errorResponse.ErrorDescription);
throw new ForceException(errorResponse.Error, errorResponse.ErrorDescription, responseMessage.StatusCode);
}
}

Expand Down Expand Up @@ -220,7 +220,7 @@ public async Task GetLatestVersionAsync()
else
{
var errorResponse = JsonConvert.DeserializeObject<AuthErrorResponse>(response);
throw new ForceException(errorResponse.Error, errorResponse.ErrorDescription);
throw new ForceException(errorResponse.Error, errorResponse.ErrorDescription, responseMessage.StatusCode);
}
}
catch (Exception ex)
Expand Down
19 changes: 10 additions & 9 deletions src/CommonLibrariesForNET/JsonHttpClient.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
Expand All @@ -23,10 +24,10 @@ public JsonHttpClient(string instanceUrl, string apiVersion, string accessToken,
HttpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
}

private static ForceException ParseForceException(string responseMessage)
private static ForceException ParseForceException(string responseMessage, HttpStatusCode statusCode)
{
var errorResponse = JsonConvert.DeserializeObject<ErrorResponses>(responseMessage);
return new ForceException(errorResponse[0].ErrorCode, errorResponse[0].Message);
return new ForceException(errorResponse[0].ErrorCode, errorResponse[0].Message, statusCode);
}

// GET
Expand Down Expand Up @@ -61,7 +62,7 @@ public async Task<T> HttpGetAsync<T>(Uri uri)
}
catch (BaseHttpClientException e)
{
throw ParseForceException(e.Message);
throw ParseForceException(e.Message, e.GetStatus());
}
}

Expand All @@ -87,7 +88,7 @@ public async Task<IList<T>> HttpGetAsync<T>(string urlSuffix, string nodeName)
}
catch (BaseHttpClientException e)
{
throw ParseForceException(e.Message);
throw ParseForceException(e.Message, e.GetStatus());
}
}
while (!string.IsNullOrEmpty(next));
Expand Down Expand Up @@ -150,7 +151,7 @@ public async Task<T> HttpPostAsync<T>(object inputObject, Uri uri)
}
catch (BaseHttpClientException e)
{
throw ParseForceException(e.Message);
throw ParseForceException(e.Message, e.GetStatus());
}
}

Expand Down Expand Up @@ -193,7 +194,7 @@ public async Task<T> HttpBinaryDataPostAsync<T>(string urlSuffix, object inputOb
return JsonConvert.DeserializeObject<T>(response);
}

throw ParseForceException(response);
throw ParseForceException(response, responseMessage.StatusCode);
}

// PATCH
Expand Down Expand Up @@ -238,7 +239,7 @@ public async Task<SuccessResponse> HttpPatchAsync(object inputObject, Uri uri)
}
catch (BaseHttpClientException e)
{
throw ParseForceException(e.Message);
throw ParseForceException(e.Message, e.GetStatus());
}
}

Expand All @@ -264,7 +265,7 @@ public async Task<SuccessResponse> HttpPatchAsync(object inputObject, Uri uri, N
}
catch (BaseHttpClientException e)
{
throw ParseForceException(e.Message);
throw ParseForceException(e.Message, e.GetStatus());
}
}

Expand All @@ -285,7 +286,7 @@ public async Task<bool> HttpDeleteAsync(string urlSuffix)
}
catch (BaseHttpClientException e)
{
throw ParseForceException(e.Message);
throw ParseForceException(e.Message, e.GetStatus());
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions src/CommonLibrariesForNET/XmlHttpClient.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.IO;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using System.Xml;
Expand Down Expand Up @@ -38,7 +39,7 @@ public async Task<T> HttpGetAsync<T>(Uri uri)
}
catch (BaseHttpClientException e)
{
throw ParseForceException(e.Message);
throw ParseForceException(e.Message, e.GetStatus());
}
}

Expand All @@ -60,16 +61,16 @@ public async Task<T> HttpPostAsync<T>(object inputObject, Uri uri)
}
catch (BaseHttpClientException e)
{
throw ParseForceException(e.Message);
throw ParseForceException(e.Message, e.GetStatus());
}
}

// HELPER METHODS

private static ForceException ParseForceException(string responseMessage)
private static ForceException ParseForceException(string responseMessage, HttpStatusCode statusCode)
{
var errorResponse = DeserializeXmlString<ErrorResponse>(responseMessage);
return new ForceException(errorResponse.ErrorCode, errorResponse.Message);
return new ForceException(errorResponse.ErrorCode, errorResponse.Message, statusCode);
}

private static string SerializeXmlObject(object inputObject)
Expand Down