tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-11-04 13:30:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

some tidying up and a bit of refactoring...not too happy about how the proxy is working at the moment! May need a rethink!

Browse Source
This commit is contained in:
TomPallister
2016-09-11 21:32:56 +01:00
parent 87702141e2
commit 72cec38c0e
16 changed files with 151 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,10 @@
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options;
using Ocelot.Library.Infrastructure.Configuration;
using Ocelot.Library.Infrastructure.DownstreamRouteFinder;
using Ocelot.Library.Infrastructure.Requester;
using Ocelot.Library.Infrastructure.Responder;
using Ocelot.Library.Infrastructure.UrlTemplateReplacer;
namespace Ocelot.Library.Middleware
@@ -15,16 +15,22 @@ namespace Ocelot.Library.Middleware
private readonly IDownstreamUrlTemplateVariableReplacer _urlReplacer;
private readonly IOptions<Configuration> _configuration;
private readonly IDownstreamRouteFinder _downstreamRouteFinder;
private readonly IHttpRequester _requester;
private readonly IHttpResponder _responder;
public ProxyMiddleware(RequestDelegate next,
IDownstreamUrlTemplateVariableReplacer urlReplacer,
IOptions<Configuration> configuration,
IDownstreamRouteFinder downstreamRouteFinder)
IDownstreamRouteFinder downstreamRouteFinder,
IHttpRequester requester,
IHttpResponder responder)
{
_next = next;
_urlReplacer = urlReplacer;
_configuration = configuration;
_downstreamRouteFinder = downstreamRouteFinder;
_requester = requester;
_responder = responder;
}
public async Task Invoke(HttpContext context)
@@ -35,27 +41,15 @@ namespace Ocelot.Library.Middleware
if (downstreamRoute.IsError)
{
context.Response.StatusCode = (int)HttpStatusCode.NotFound;
await _responder.CreateNotFoundResponse(context);
return;
}
var downstreamUrl = _urlReplacer.ReplaceTemplateVariable(downstreamRoute.Data);
var downstreamUrl = _urlReplacer.ReplaceTemplateVariables(downstreamRoute.Data);
using (var httpClient = new HttpClient())
{
var httpMethod = new HttpMethod(context.Request.Method);
var response = await _requester.GetResponse(context.Request.Method, downstreamUrl);
var httpRequestMessage = new HttpRequestMessage(httpMethod, downstreamUrl);
var response = await httpClient.SendAsync(httpRequestMessage);
if (!response.IsSuccessStatusCode)
{
context.Response.StatusCode = (int)response.StatusCode;
return;
}
await context.Response.WriteAsync(await response.Content.ReadAsStringAsync());
}
context = await _responder.CreateSuccessResponse(context, response);
await _next.Invoke(context);
}