flywithu/CryptoExchange.Net
1
0
Fork 0
mirror of https://github.com/JKorf/CryptoExchange.Net synced 2025-06-11 01:46:12 +00:00
Code Issues Releases Wiki Activity

Added requestBodyFormat

Browse Source
This commit is contained in:
JKorf 2018-09-25 09:42:13 +02:00
parent 344fad1fe9
commit 4102d4474e
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CryptoExchange.Net/ExchangeClient.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
@ -8,6 +9,7 @@ using System.Net.Sockets;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web;
using CryptoExchange.Net.Attributes; using CryptoExchange.Net.Attributes;
using CryptoExchange.Net.Authentication; using CryptoExchange.Net.Authentication;
using CryptoExchange.Net.Interfaces; using CryptoExchange.Net.Interfaces;
@ -30,7 +32,8 @@ namespace CryptoExchange.Net
protected RateLimitingBehaviour rateLimitBehaviour; protected RateLimitingBehaviour rateLimitBehaviour;
protected PostParameters postParametersPosition = PostParameters.InBody; protected PostParameters postParametersPosition = PostParameters.InBody;
protected RequestBodyFormat requestBodyFormat = RequestBodyFormat.Json;
protected AuthenticationProvider authProvider; protected AuthenticationProvider authProvider;
private List<IRateLimiter> rateLimiters; private List<IRateLimiter> rateLimiters;
@ -186,7 +189,7 @@ namespace CryptoExchange.Net
uriString += parameters.CreateParamString(); uriString += parameters.CreateParamString();
var request = RequestFactory.Create(uriString); var request = RequestFactory.Create(uriString);
request.ContentType = "application/json"; request.ContentType = requestBodyFormat == RequestBodyFormat.Json ? "application/json": "application/x-www-form-urlencoded";
request.Accept = "application/json"; request.Accept = "application/json";
request.Method = method; request.Method = method;
@ -208,7 +211,7 @@ namespace CryptoExchange.Net
return request; return request;
} }
protected void WriteParamBody(IRequest request, string stringData) protected virtual void WriteParamBody(IRequest request, string stringData)
{ {
var data = Encoding.UTF8.GetBytes(stringData); var data = Encoding.UTF8.GetBytes(stringData);
request.ContentLength = data.Length; request.ContentLength = data.Length;
@ -217,10 +220,21 @@ namespace CryptoExchange.Net
stream.Write(data, 0, data.Length); stream.Write(data, 0, data.Length);
} }
protected void WriteParamBody(IRequest request, Dictionary<string, object> parameters) protected virtual void WriteParamBody(IRequest request, Dictionary<string, object> parameters)
{ {
var stringData = JsonConvert.SerializeObject(parameters.OrderBy(p => p.Key).ToDictionary(p => p.Key, p => p.Value)); if (requestBodyFormat == RequestBodyFormat.Json)
WriteParamBody(request, stringData); {
var stringData = JsonConvert.SerializeObject(parameters.OrderBy(p => p.Key).ToDictionary(p => p.Key, p => p.Value));
WriteParamBody(request, stringData);
}
else if(requestBodyFormat == RequestBodyFormat.FormData)
{
NameValueCollection formData = HttpUtility.ParseQueryString(String.Empty);
foreach (var kvp in parameters.OrderBy(p => p.Key))
formData.Add(kvp.Key, kvp.Value.ToString());
string stringData = formData.ToString();
WriteParamBody(request, stringData);
}
} }
private async Task<CallResult<string>> ExecuteRequest(IRequest request) private async Task<CallResult<string>> ExecuteRequest(IRequest request)

6
CryptoExchange.Net/Objects/Enums.cs
View File

@ -11,4 +11,10 @@
InBody, InBody,
InUri InUri
} }
public enum RequestBodyFormat
{
FormData,
Json
}
} }