Skip to content
Merged
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
v1.1.1
- SSL Store Api Changed Encoding Rules, needed to fix integration to match

v1.1.0
- Added new AutoWWW field for single domain SSL Store products

Expand Down
22 changes: 11 additions & 11 deletions SslStoreCaProxy/Client/SslStoreClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public SslStoreClient(ICAConnectorConfigProvider config)
public async Task<NewOrderResponse> SubmitNewOrderRequestAsync(NewOrderRequest newOrderRequest)
{
using (var resp = await RestClient.PostAsync("/rest/order/neworder", new StringContent(
JsonConvert.SerializeObject(newOrderRequest), Encoding.ASCII, "application/json")))
JsonConvert.SerializeObject(newOrderRequest), Encoding.UTF8, "application/json")))
{
Logger.Trace(JsonConvert.SerializeObject(newOrderRequest));
resp.EnsureSuccessStatusCode();
Expand All @@ -47,7 +47,7 @@ public async Task<NewOrderResponse> SubmitNewOrderRequestAsync(NewOrderRequest n
public async Task<EmailApproverResponse> SubmitEmailApproverRequestAsync(EmailApproverRequest newApproverRequest)
{
using (var resp = await RestClient.PostAsync("/rest/order/approverlist", new StringContent(
JsonConvert.SerializeObject(newApproverRequest), Encoding.ASCII, "application/json")))
JsonConvert.SerializeObject(newApproverRequest), Encoding.UTF8, "application/json")))
{
Logger.Trace(JsonConvert.SerializeObject(newApproverRequest));
resp.EnsureSuccessStatusCode();
Expand All @@ -60,7 +60,7 @@ public async Task<EmailApproverResponse> SubmitEmailApproverRequestAsync(EmailAp
public async Task<NewOrderResponse> SubmitReIssueRequestAsync(ReIssueRequest reIssueOrderRequest)
{
using (var resp = await RestClient.PostAsync("/rest/order/reissue", new StringContent(
JsonConvert.SerializeObject(reIssueOrderRequest), Encoding.ASCII, "application/json")))
JsonConvert.SerializeObject(reIssueOrderRequest), Encoding.UTF8, "application/json")))
{
var orderStatusResponse =
JsonConvert.DeserializeObject<NewOrderResponse>(await resp.Content.ReadAsStringAsync());
Expand All @@ -71,7 +71,7 @@ public async Task<NewOrderResponse> SubmitReIssueRequestAsync(ReIssueRequest reI
public async Task<NewOrderResponse> SubmitRenewRequestAsync(NewOrderRequest renewOrderRequest)
{
using (var resp = await RestClient.PostAsync("/rest/order/neworder", new StringContent(
JsonConvert.SerializeObject(renewOrderRequest), Encoding.ASCII, "application/json")))
JsonConvert.SerializeObject(renewOrderRequest), Encoding.UTF8, "application/json")))
{
Logger.Trace(JsonConvert.SerializeObject(renewOrderRequest));
resp.EnsureSuccessStatusCode();
Expand All @@ -86,7 +86,7 @@ public async Task<IDownloadCertificateResponse> SubmitDownloadCertificateAsync(
DownloadCertificateRequest downloadOrderRequest)
{
using (var resp = await RestClient.PostAsync("/rest/order/download", new StringContent(
JsonConvert.SerializeObject(downloadOrderRequest), Encoding.ASCII, "application/json")))
JsonConvert.SerializeObject(downloadOrderRequest), Encoding.UTF8, "application/json")))
{
Logger.Trace(JsonConvert.SerializeObject(downloadOrderRequest));
resp.EnsureSuccessStatusCode();
Expand All @@ -112,7 +112,7 @@ public async Task SubmitQueryOrderRequestAsync(BlockingCollection<INewOrderRespo
var queryOrderRequest = requestManager.GetQueryOrderRequest(PageSize, pageCounter);
var batchItemsProcessed = 0;
using (var resp = await RestClient.PostAsync("/rest/order/query", new StringContent(
JsonConvert.SerializeObject(queryOrderRequest), Encoding.ASCII, "application/json")))
JsonConvert.SerializeObject(queryOrderRequest), Encoding.UTF8, "application/json")))
{
if (!resp.IsSuccessStatusCode)
{
Expand All @@ -132,7 +132,7 @@ public async Task SubmitQueryOrderRequestAsync(BlockingCollection<INewOrderRespo
await resp.Content.ReadAsStringAsync());

Logger.Trace($"Order List JSON {JsonConvert.SerializeObject(batchResponse)}");

var batchCount = batchResponse.Count;

Logger.Trace($"Processing {batchCount} items in batch");
Expand Down Expand Up @@ -186,7 +186,7 @@ public async Task SubmitQueryOrderRequestAsync(BlockingCollection<INewOrderRespo
public async Task<IOrderStatusResponse> SubmitRevokeCertificateAsync(RevokeOrderRequest revokeOrderRequest)
{
using (var resp = await RestClient.PostAsync("/rest/order/refundrequest", new StringContent(
JsonConvert.SerializeObject(revokeOrderRequest), Encoding.ASCII, "application/json")))
JsonConvert.SerializeObject(revokeOrderRequest), Encoding.UTF8, "application/json")))
{
var revocationResponse =
JsonConvert.DeserializeObject<OrderStatusResponse>(await resp.Content.ReadAsStringAsync());
Expand All @@ -197,7 +197,7 @@ public async Task<IOrderStatusResponse> SubmitRevokeCertificateAsync(RevokeOrder
public async Task<INewOrderResponse> SubmitOrderStatusRequestAsync(OrderStatusRequest orderStatusRequest)
{
using (var resp = await RestClient.PostAsync("/rest/order/status", new StringContent(
JsonConvert.SerializeObject(orderStatusRequest), Encoding.ASCII, "application/json")))
JsonConvert.SerializeObject(orderStatusRequest), Encoding.UTF8, "application/json")))
{
var orderStatusResponse =
JsonConvert.DeserializeObject<NewOrderResponse>(await resp.Content.ReadAsStringAsync());
Expand All @@ -208,7 +208,7 @@ public async Task<INewOrderResponse> SubmitOrderStatusRequestAsync(OrderStatusRe
public async Task<IOrganizationResponse> SubmitOrganizationListAsync(OrganizationListRequest organizationListRequest)
{
using (var resp = await RestClient.PostAsync("/rest/digicert/organizationlist", new StringContent(
JsonConvert.SerializeObject(organizationListRequest), Encoding.ASCII, "application/json")))
JsonConvert.SerializeObject(organizationListRequest), Encoding.UTF8, "application/json")))
{
var organizationListResponse =
JsonConvert.DeserializeObject<OrganizationResponse>(await resp.Content.ReadAsStringAsync());
Expand All @@ -219,7 +219,7 @@ public async Task<IOrganizationResponse> SubmitOrganizationListAsync(Organizatio
private HttpClient ConfigureRestClient()
{
var clientHandler = new WebRequestHandler();
var returnClient = new HttpClient(clientHandler, true) {BaseAddress = BaseUrl};
var returnClient = new HttpClient(clientHandler, true) { BaseAddress = BaseUrl };
returnClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
return returnClient;
}
Expand Down
Loading