tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-06-19 00:58:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

failing pesky test

Browse Source
This commit is contained in:
TomPallister
2016-09-14 21:18:25 +01:00
parent 0627e9399b
commit f3128cffe0
5 changed files with 203 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Ocelot.Library/Infrastructure/Requester/HttpClientHttpRequester.cs
View File

@ -1,17 +1,39 @@
using System.IO;
using System.Net.Http;
using System.Threading.Tasks;
using Flurl;
using Flurl.Http;
using Microsoft.AspNetCore.Http;
namespace Ocelot.Library.Infrastructure.Requester
{
public class HttpClientHttpRequester : IHttpRequester
{
public async Task<HttpResponseMessage> GetResponse(string httpMethod, string downstreamUrl, Stream content = null)
public async Task<HttpResponseMessage> GetResponse(
string httpMethod,
string downstreamUrl,
Stream content,
IHeaderDictionary headers,
IRequestCookieCollection cookies,
IQueryCollection queryString)
{
var method = new HttpMethod(httpMethod);
var streamContent = new StreamContent(content);
return await downstreamUrl.SendAsync(method, new StreamContent(content));
if (content.Length > 0)
{
return await downstreamUrl
.SetQueryParams(queryString)
.WithCookies(cookies)
.WithHeaders(streamContent.Headers)
.SendAsync(method, streamContent);
}
return await downstreamUrl
.SetQueryParams(queryString)
.WithHeaders(headers)
.WithCookies(cookies)
.SendAsync(method, streamContent);
}
}
}

9
src/Ocelot.Library/Infrastructure/Requester/IHttpRequester.cs
View File

@ -2,11 +2,18 @@
using System.Net.Http;
using System.Threading.Tasks;
using Flurl.Http;
using Microsoft.AspNetCore.Http;
namespace Ocelot.Library.Infrastructure.Requester
{
public interface IHttpRequester
{
Task<HttpResponseMessage> GetResponse(string httpMethod, string downstreamUrl, Stream content = null);
Task<HttpResponseMessage> GetResponse(
string httpMethod,
string downstreamUrl,
Stream content,
IHeaderDictionary headers,
IRequestCookieCollection cookies,
IQueryCollection queryString);
}
}

4
src/Ocelot.Library/Middleware/ProxyMiddleware.cs
View File

@ -47,7 +47,9 @@ namespace Ocelot.Library.Middleware
var downstreamUrl = _urlReplacer.ReplaceTemplateVariables(downstreamRoute.Data);
var response = await _requester.GetResponse(context.Request.Method, downstreamUrl, context.Request.Body);
var response = await _requester
.GetResponse(context.Request.Method, downstreamUrl, context.Request.Body,
context.Request.Headers, context.Request.Cookies, context.Request.Query);
await _responder.CreateResponse(context, response);