Skip to content

Change SMTP proxy to use injected Http Client #35

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

Merged
merged 2 commits into from
Dec 16, 2020
Merged

Change SMTP proxy to use injected Http Client #35

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9287303
Change SMTP proxy to use injected Http Client
StuartFerguson Dec 16, 2020
4491716
Merge branch 'master' into task/#10_smtptogoinjectedclient
StuartFerguson Dec 16, 2020
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
75 changes: 40 additions & 35 deletions MessagingService.BusinessLogic/Services/EmailServices/Smtp2Go/Smtp2GoProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class Smtp2GoProxy : IEmailServiceProxy
#region Constructors

/// <summary>
/// Initializes a new instance of the <see cref="Smtp2GoProxy"/> class.
/// Initializes a new instance of the <see cref="Smtp2GoProxy" /> class.
/// </summary>
/// <param name="httpClient">The HTTP client.</param>
public Smtp2GoProxy(HttpClient httpClient)
Expand Down Expand Up @@ -83,27 +83,25 @@ public async Task<EmailServiceProxyResponse> SendEmail(Guid messageId,

StringContent content = new StringContent(requestSerialised, Encoding.UTF8, "application/json");

using(HttpClient client = new HttpClient())
{
client.BaseAddress = new Uri(ConfigurationReader.GetValue("SMTP2GoBaseAddress"));

HttpResponseMessage httpResponse = await client.PostAsync("email/send", content, cancellationToken);
String requestUri = $"{ConfigurationReader.GetValue("SMTP2GoBaseAddress")}/email/send";
HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
requestMessage.Content = content;

Smtp2GoSendEmailResponse apiResponse = JsonConvert.DeserializeObject<Smtp2GoSendEmailResponse>(await httpResponse.Content.ReadAsStringAsync());
HttpResponseMessage httpResponse = await this.HttpClient.SendAsync(requestMessage, cancellationToken);

Logger.LogDebug($"Response Message Received from Email Provider [SMTP2Go] {JsonConvert.SerializeObject(apiResponse)}");
Smtp2GoSendEmailResponse apiResponse = JsonConvert.DeserializeObject<Smtp2GoSendEmailResponse>(await httpResponse.Content.ReadAsStringAsync());

// Translate the Response
response = new EmailServiceProxyResponse
{
ApiStatusCode = httpResponse.StatusCode,
EmailIdentifier = apiResponse.Data.EmailId,
Error = apiResponse.Data.Error,
ErrorCode = apiResponse.Data.ErrorCode,
RequestIdentifier = apiResponse.RequestId
};
}
Logger.LogDebug($"Response Message Received from Email Provider [SMTP2Go] {JsonConvert.SerializeObject(apiResponse)}");

// Translate the Response
response = new EmailServiceProxyResponse
{
ApiStatusCode = httpResponse.StatusCode,
EmailIdentifier = apiResponse.Data.EmailId,
Error = apiResponse.Data.Error,
ErrorCode = apiResponse.Data.ErrorCode,
RequestIdentifier = apiResponse.RequestId
};
return response;
}

Expand All @@ -125,40 +123,47 @@ public async Task<MessageStatusResponse> GetMessageStatus(String providerReferen
Smtp2GoEmailSearchRequest apiRequest = new Smtp2GoEmailSearchRequest
{
ApiKey = ConfigurationReader.GetValue("SMTP2GoAPIKey"),
EmailId = new List<String>{providerReference},
EmailId = new List<String>
{
providerReference
},
StartDate = startDate.ToString("yyyy-MM-dd"),
EndDate = endDate.ToString("yyyy-MM-dd"),
};
};

String requestSerialised = JsonConvert.SerializeObject(apiRequest);

Logger.LogDebug($"Request Message Sent to Email Provider [SMTP2Go] {requestSerialised}");

StringContent content = new StringContent(requestSerialised, Encoding.UTF8, "application/json");

using (HttpClient client = new HttpClient())
{
client.BaseAddress = new Uri(ConfigurationReader.GetValue("SMTP2GoBaseAddress"));
String requestUri = $"{ConfigurationReader.GetValue("SMTP2GoBaseAddress")}/email/search";
HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
requestMessage.Content = content;

HttpResponseMessage httpResponse = await client.PostAsync("email/search", content, cancellationToken);
HttpResponseMessage httpResponse = await this.HttpClient.SendAsync(requestMessage, cancellationToken);

Smtp2GoEmailSearchResponse apiResponse = JsonConvert.DeserializeObject<Smtp2GoEmailSearchResponse>(await httpResponse.Content.ReadAsStringAsync());
Smtp2GoEmailSearchResponse apiResponse = JsonConvert.DeserializeObject<Smtp2GoEmailSearchResponse>(await httpResponse.Content.ReadAsStringAsync());

Logger.LogDebug($"Response Message Received from Email Provider [SMTP2Go] {JsonConvert.SerializeObject(apiResponse)}");
Logger.LogDebug($"Response Message Received from Email Provider [SMTP2Go] {JsonConvert.SerializeObject(apiResponse)}");

// Translate the Response
response = new MessageStatusResponse
{
ApiStatusCode = httpResponse.StatusCode,
MessageStatus = this.TranslateMessageStatus(apiResponse.Data.EmailDetails.Single().Status),
ProviderStatusDescription = apiResponse.Data.EmailDetails.Single().Status,
Timestamp = apiResponse.Data.EmailDetails.Single().EmailStatusDate
};
}
// Translate the Response
response = new MessageStatusResponse
{
ApiStatusCode = httpResponse.StatusCode,
MessageStatus = this.TranslateMessageStatus(apiResponse.Data.EmailDetails.Single().Status),
ProviderStatusDescription = apiResponse.Data.EmailDetails.Single().Status,
Timestamp = apiResponse.Data.EmailDetails.Single().EmailStatusDate
};

return response;
}

/// <summary>
/// Translates the message status.
/// </summary>
/// <param name="status">The status.</param>
/// <returns></returns>
private MessageStatus TranslateMessageStatus(String status)
{
MessageStatus result;
Expand Down