Skip to content

Moved error responses processing to single method; throw http errors … #29

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.

Sign up for GitHub

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

Open
mpiliszcz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Moved error responses processing to single method; throw http errors … #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions MailJetClient/MailJet.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup>
<Compile Include="Converters\MailAddressArrayConverter.cs" />
Expand Down
36 changes: 24 additions & 12 deletions MailJetClient/MailJetClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using System.Net;
using System.Net.Mail;
using MimeTypes;
using System.Web;

namespace MailJet.Client
{
Expand Down Expand Up @@ -633,9 +634,7 @@ private Response<T> ExecuteRequest<T>(RestRequest request) where T : DataItem
if (result.ResponseStatus == ResponseStatus.Completed && (result.StatusCode == HttpStatusCode.NoContent))
return null;

var error = JsonConvert.DeserializeObject<ErrorResponse>(result.Content);
if (!String.IsNullOrWhiteSpace(error.ErrorInfo) || !String.IsNullOrWhiteSpace(error.ErrorMessage))
throw new Exception(String.Format("{0}\n{1}", error.ErrorMessage, error.ErrorMessage));
ProcessWebResponse(result);

var data = JsonConvert.DeserializeObject<Response<T>>(result.Content);
return data;
Expand All @@ -651,12 +650,7 @@ private SentMessageData SendMessage(RestRequest request)
if (result.ResponseStatus == ResponseStatus.Completed && (result.StatusCode == HttpStatusCode.NoContent))
return null;

if (result.ResponseStatus == ResponseStatus.Completed && result.StatusCode == HttpStatusCode.Unauthorized)
throw new UnauthorizedAccessException("MailJet returned an HTTP 401 exception, please check your credentials");

var error = JsonConvert.DeserializeObject<ErrorResponse>(result.Content);
if (!String.IsNullOrWhiteSpace(error.ErrorInfo) || !String.IsNullOrWhiteSpace(error.ErrorMessage))
throw new Exception(String.Format("{0}\n{1}", error.ErrorMessage, error.ErrorMessage));
ProcessWebResponse(result);

var data = JsonConvert.DeserializeObject<SentMessageData>(result.Content);
return data;
Expand All @@ -671,9 +665,27 @@ private void ExecuteRequest(RestRequest request)
if (result.ResponseStatus == ResponseStatus.Completed && result.StatusCode == HttpStatusCode.NoContent)
return;

var error = JsonConvert.DeserializeObject<ErrorResponse>(result.Content);
if (!String.IsNullOrWhiteSpace(error.ErrorInfo) || !String.IsNullOrWhiteSpace(error.ErrorMessage))
throw new Exception(String.Format("{0}\n{1}", error.ErrorMessage, error.ErrorMessage));
ProcessWebResponse(result);
}

private void ProcessWebResponse(IRestResponse result)
{
if (result.StatusCode == HttpStatusCode.Unauthorized)
throw new UnauthorizedAccessException("MailJet returned an HTTP 401 exception, please check your credentials");

if (result.StatusCode >= HttpStatusCode.BadRequest)
throw new HttpException((int)result.StatusCode, result.StatusCode.ToString());

if (result.ErrorMessage != null && String.IsNullOrWhiteSpace(result.Content))
{
throw new Exception(result.ErrorMessage);
}
else
{
var error = JsonConvert.DeserializeObject<ErrorResponse>(result.Content);
if ((error != null) && (!String.IsNullOrWhiteSpace(error.ErrorInfo) || !String.IsNullOrWhiteSpace(error.ErrorMessage)))
throw new Exception(String.Format("{0}\n{1}", error.ErrorMessage, error.ErrorMessage));
}
}

private RestClient WebClient
Expand Down