sarsoo/Spotify.NET
1
0
Fork 0
mirror of https://github.com/Sarsoo/Spotify.NET.git synced 2024-12-24 23:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check if the header exists and replace it rather than add it again (#299)

Browse Source
This commit is contained in:
Florian Jäckel 2018-10-24 23:21:13 +02:00 committed by Jonas Dellinger
parent f94fbc82f3
commit 9859e9d4ae
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
SpotifyAPI.Web/SpotifyWebClient.cs
View File

@ -39,10 +39,7 @@ namespace SpotifyAPI.Web
{ {
if (headers != null) if (headers != null)
{ {
foreach (KeyValuePair<string, string> headerPair in headers) AddHeaders(headers);
{
_client.DefaultRequestHeaders.TryAddWithoutValidation(headerPair.Key, headerPair.Value);
}
} }
using (HttpResponseMessage response = Task.Run(() => _client.GetAsync(url)).Result) using (HttpResponseMessage response = Task.Run(() => _client.GetAsync(url)).Result)
{ {
@ -58,10 +55,7 @@ namespace SpotifyAPI.Web
{ {
if (headers != null) if (headers != null)
{ {
foreach (KeyValuePair<string, string> headerPair in headers) AddHeaders(headers);
{
_client.DefaultRequestHeaders.TryAddWithoutValidation(headerPair.Key, headerPair.Value);
}
} }
using (HttpResponseMessage response = await _client.GetAsync(url).ConfigureAwait(false)) using (HttpResponseMessage response = await _client.GetAsync(url).ConfigureAwait(false))
{ {
@ -101,10 +95,7 @@ namespace SpotifyAPI.Web
{ {
if (headers != null) if (headers != null)
{ {
foreach (KeyValuePair<string, string> headerPair in headers) AddHeaders(headers);
{
_client.DefaultRequestHeaders.TryAddWithoutValidation(headerPair.Key, headerPair.Value);
}
} }
HttpRequestMessage message = new HttpRequestMessage(new HttpMethod(method), url) HttpRequestMessage message = new HttpRequestMessage(new HttpMethod(method), url)
@ -125,10 +116,7 @@ namespace SpotifyAPI.Web
{ {
if (headers != null) if (headers != null)
{ {
foreach (KeyValuePair<string, string> headerPair in headers) AddHeaders(headers);
{
_client.DefaultRequestHeaders.TryAddWithoutValidation(headerPair.Key, headerPair.Value);
}
} }
HttpRequestMessage message = new HttpRequestMessage(new HttpMethod(method), url) HttpRequestMessage message = new HttpRequestMessage(new HttpMethod(method), url)
@ -176,6 +164,18 @@ namespace SpotifyAPI.Web
return newHeaders; return newHeaders;
} }
private void AddHeaders(Dictionary<string,string> headers)
{
foreach (KeyValuePair<string, string> headerPair in headers)
{
if (_client.DefaultRequestHeaders.Contains(headerPair.Key))
{
_client.DefaultRequestHeaders.Remove(headerPair.Key);
}
_client.DefaultRequestHeaders.TryAddWithoutValidation(headerPair.Key, headerPair.Value);
}
}
private static HttpClientHandler CreateClientHandler(ProxyConfig proxyConfig = null) private static HttpClientHandler CreateClientHandler(ProxyConfig proxyConfig = null)
{ {
HttpClientHandler clientHandler = new HttpClientHandler HttpClientHandler clientHandler = new HttpClientHandler