Remove Ocelot specific Middleware to make Ocelot more compatible with kestrel middleware and get ready for YARP

test/Ocelot.UnitTests/Headers/AddHeadersToRequestClaimToThingTests.cs

@@ -150,7 +150,7 @@ namespace Ocelot.UnitTests.Headers
         private class AnyError : Error
         {
             public AnyError()
-                : base("blahh", OcelotErrorCode.UnknownError)
+                : base("blahh", OcelotErrorCode.UnknownError, 404)
             {
             }
         }

test/Ocelot.UnitTests/Headers/ClaimsToHeadersMiddlewareTests.cs

@@ -1,16 +1,16 @@
-using Ocelot.Middleware;
-
-namespace Ocelot.UnitTests.Headers
+namespace Ocelot.UnitTests.Headers
 {
     using Microsoft.AspNetCore.Http;
     using Moq;
     using Ocelot.Configuration;
     using Ocelot.Configuration.Builder;
     using Ocelot.DownstreamRouteFinder;
+    using Ocelot.DownstreamRouteFinder.Middleware;
     using Ocelot.DownstreamRouteFinder.UrlMatcher;
     using Ocelot.Headers;
     using Ocelot.Headers.Middleware;
     using Ocelot.Logging;
+    using Ocelot.Middleware;
     using Ocelot.Request.Middleware;
     using Ocelot.Responses;
     using System.Collections.Generic;
@@ -26,19 +26,19 @@ namespace Ocelot.UnitTests.Headers
         private Mock<IOcelotLoggerFactory> _loggerFactory;
         private Mock<IOcelotLogger> _logger;
         private ClaimsToHeadersMiddleware _middleware;
-        private DownstreamContext _downstreamContext;
-        private OcelotRequestDelegate _next;
+        private RequestDelegate _next;
+        private HttpContext _httpContext;
 
         public ClaimsToHeadersMiddlewareTests()
         {
+            _httpContext = new DefaultHttpContext();
             _addHeaders = new Mock<IAddHeadersToRequest>();
-            _downstreamContext = new DownstreamContext(new DefaultHttpContext());
             _loggerFactory = new Mock<IOcelotLoggerFactory>();
             _logger = new Mock<IOcelotLogger>();
             _loggerFactory.Setup(x => x.CreateLogger<ClaimsToHeadersMiddleware>()).Returns(_logger.Object);
             _next = context => Task.CompletedTask;
             _middleware = new ClaimsToHeadersMiddleware(_next, _loggerFactory.Object, _addHeaders.Object);
-            _downstreamContext.DownstreamRequest = new DownstreamRequest(new HttpRequestMessage(HttpMethod.Get, "http://test.com"));
+            _httpContext.Items.UpsertDownstreamRequest(new DownstreamRequest(new HttpRequestMessage(HttpMethod.Get, "http://test.com")));
         }
 
         [Fact]
@@ -66,14 +66,16 @@ namespace Ocelot.UnitTests.Headers
 
         private void WhenICallTheMiddleware()
         {
-            _middleware.Invoke(_downstreamContext).GetAwaiter().GetResult();
+            _middleware.Invoke(_httpContext).GetAwaiter().GetResult();
         }
 
         private void GivenTheDownStreamRouteIs(DownstreamRoute downstreamRoute)
         {
             _downstreamRoute = new OkResponse<DownstreamRoute>(downstreamRoute);
-            _downstreamContext.TemplatePlaceholderNameAndValues = downstreamRoute.TemplatePlaceholderNameAndValues;
-            _downstreamContext.DownstreamReRoute = downstreamRoute.ReRoute.DownstreamReRoute[0];
+
+            _httpContext.Items.UpsertTemplatePlaceholderNameAndValues(downstreamRoute.TemplatePlaceholderNameAndValues);
+
+            _httpContext.Items.UpsertDownstreamReRoute(downstreamRoute.ReRoute.DownstreamReRoute[0]);
         }
 
         private void GivenTheAddHeadersToDownstreamRequestReturnsOk()
@@ -92,7 +94,7 @@ namespace Ocelot.UnitTests.Headers
                 .Verify(x => x.SetHeadersOnDownstreamRequest(
                     It.IsAny<List<ClaimToThing>>(),
                     It.IsAny<IEnumerable<System.Security.Claims.Claim>>(),
-                    _downstreamContext.DownstreamRequest), Times.Once);
+                    _httpContext.Items.DownstreamRequest()), Times.Once);
         }
     }
 }

test/Ocelot.UnitTests/Headers/HttpHeadersTransformationMiddlewareTests.cs

@@ -1,119 +1,121 @@
-namespace Ocelot.UnitTests.Headers
-{
-    using Microsoft.AspNetCore.Http;
-    using Moq;
-    using Ocelot.Authorisation.Middleware;
-    using Ocelot.Configuration;
-    using Ocelot.Configuration.Builder;
-    using Ocelot.DownstreamRouteFinder;
-    using Ocelot.Headers;
-    using Ocelot.Headers.Middleware;
-    using Ocelot.Logging;
-    using Ocelot.Middleware;
-    using Ocelot.Request.Middleware;
-    using System.Collections.Generic;
-    using System.Net.Http;
-    using System.Threading.Tasks;
-    using TestStack.BDDfy;
-    using Xunit;
-
-    public class HttpHeadersTransformationMiddlewareTests
-    {
-        private readonly Mock<IHttpContextRequestHeaderReplacer> _preReplacer;
-        private readonly Mock<IHttpResponseHeaderReplacer> _postReplacer;
-        private Mock<IOcelotLoggerFactory> _loggerFactory;
-        private Mock<IOcelotLogger> _logger;
-        private readonly HttpHeadersTransformationMiddleware _middleware;
-        private readonly DownstreamContext _downstreamContext;
-        private OcelotRequestDelegate _next;
-        private readonly Mock<IAddHeadersToResponse> _addHeadersToResponse;
-        private readonly Mock<IAddHeadersToRequest> _addHeadersToRequest;
-
-        public HttpHeadersTransformationMiddlewareTests()
-        {
-            _preReplacer = new Mock<IHttpContextRequestHeaderReplacer>();
-            _postReplacer = new Mock<IHttpResponseHeaderReplacer>();
-            _downstreamContext = new DownstreamContext(new DefaultHttpContext());
-            _loggerFactory = new Mock<IOcelotLoggerFactory>();
-            _logger = new Mock<IOcelotLogger>();
-            _loggerFactory.Setup(x => x.CreateLogger<AuthorisationMiddleware>()).Returns(_logger.Object);
-            _next = context => Task.CompletedTask;
-            _addHeadersToResponse = new Mock<IAddHeadersToResponse>();
-            _addHeadersToRequest = new Mock<IAddHeadersToRequest>();
-            _middleware = new HttpHeadersTransformationMiddleware(
-                _next, _loggerFactory.Object, _preReplacer.Object,
-                _postReplacer.Object, _addHeadersToResponse.Object, _addHeadersToRequest.Object);
-        }
-
-        [Fact]
-        public void should_call_pre_and_post_header_transforms()
-        {
-            this.Given(x => GivenTheFollowingRequest())
-                .And(x => GivenTheDownstreamRequestIs())
-                .And(x => GivenTheReRouteHasPreFindAndReplaceSetUp())
-                .And(x => GivenTheHttpResponseMessageIs())
-                .When(x => WhenICallTheMiddleware())
-                .Then(x => ThenTheIHttpContextRequestHeaderReplacerIsCalledCorrectly())
-                .Then(x => ThenAddHeadersToRequestIsCalledCorrectly())
-                .And(x => ThenTheIHttpResponseHeaderReplacerIsCalledCorrectly())
-                .And(x => ThenAddHeadersToResponseIsCalledCorrectly())
-                .BDDfy();
-        }
-
-        private void ThenAddHeadersToResponseIsCalledCorrectly()
-        {
-            _addHeadersToResponse
-                .Verify(x => x.Add(_downstreamContext.DownstreamReRoute.AddHeadersToDownstream, _downstreamContext.DownstreamResponse), Times.Once);
-        }
-
-        private void ThenAddHeadersToRequestIsCalledCorrectly()
-        {
-            _addHeadersToRequest
-                .Verify(x => x.SetHeadersOnDownstreamRequest(_downstreamContext.DownstreamReRoute.AddHeadersToUpstream, _downstreamContext.HttpContext), Times.Once);
-        }
-
-        private void WhenICallTheMiddleware()
-        {
-            _middleware.Invoke(_downstreamContext).GetAwaiter().GetResult();
-        }
-
-        private void GivenTheDownstreamRequestIs()
-        {
-            _downstreamContext.DownstreamRequest = new DownstreamRequest(new HttpRequestMessage(HttpMethod.Get, "http://test.com"));
-        }
-
-        private void GivenTheHttpResponseMessageIs()
-        {
-            _downstreamContext.DownstreamResponse = new DownstreamResponse(new HttpResponseMessage());
-        }
-
-        private void GivenTheReRouteHasPreFindAndReplaceSetUp()
-        {
-            var fAndRs = new List<HeaderFindAndReplace>();
-            var reRoute = new ReRouteBuilder()
-                .WithDownstreamReRoute(new DownstreamReRouteBuilder().WithUpstreamHeaderFindAndReplace(fAndRs)
-                    .WithDownstreamHeaderFindAndReplace(fAndRs).Build())
-                .Build();
-
-            var dR = new DownstreamRoute(null, reRoute);
-
-            _downstreamContext.TemplatePlaceholderNameAndValues = dR.TemplatePlaceholderNameAndValues;
-            _downstreamContext.DownstreamReRoute = dR.ReRoute.DownstreamReRoute[0];
-        }
-
-        private void ThenTheIHttpContextRequestHeaderReplacerIsCalledCorrectly()
-        {
-            _preReplacer.Verify(x => x.Replace(It.IsAny<HttpContext>(), It.IsAny<List<HeaderFindAndReplace>>()), Times.Once);
-        }
-
-        private void ThenTheIHttpResponseHeaderReplacerIsCalledCorrectly()
-        {
-            _postReplacer.Verify(x => x.Replace(It.IsAny<DownstreamContext>(), It.IsAny<List<HeaderFindAndReplace>>()), Times.Once);
-        }
-
-        private void GivenTheFollowingRequest()
-        {
-            _downstreamContext.HttpContext.Request.Headers.Add("test", "test");
-        }
-    }
+namespace Ocelot.UnitTests.Headers
+{
+    using Microsoft.AspNetCore.Http;
+    using Moq;
+    using Ocelot.Authorisation.Middleware;
+    using Ocelot.Configuration;
+    using Ocelot.Configuration.Builder;
+    using Ocelot.DownstreamRouteFinder;
+    using Ocelot.Headers;
+    using Ocelot.Headers.Middleware;
+    using Ocelot.Logging;
+    using Ocelot.Middleware;
+    using Ocelot.Request.Middleware;
+    using System.Collections.Generic;
+    using System.Net.Http;
+    using System.Threading.Tasks;
+    using Ocelot.Infrastructure.RequestData;
+    using TestStack.BDDfy;
+    using Xunit;
+    using Ocelot.DownstreamRouteFinder.Middleware;
+
+    public class HttpHeadersTransformationMiddlewareTests
+    {
+        private readonly Mock<IHttpContextRequestHeaderReplacer> _preReplacer;
+        private readonly Mock<IHttpResponseHeaderReplacer> _postReplacer;
+        private Mock<IOcelotLoggerFactory> _loggerFactory;
+        private Mock<IOcelotLogger> _logger;
+        private readonly HttpHeadersTransformationMiddleware _middleware;
+        private RequestDelegate _next;
+        private readonly Mock<IAddHeadersToResponse> _addHeadersToResponse;
+        private readonly Mock<IAddHeadersToRequest> _addHeadersToRequest;
+        private HttpContext _httpContext;
+
+        public HttpHeadersTransformationMiddlewareTests()
+        {
+            _httpContext = new DefaultHttpContext();
+            _preReplacer = new Mock<IHttpContextRequestHeaderReplacer>();
+            _postReplacer = new Mock<IHttpResponseHeaderReplacer>();
+            _loggerFactory = new Mock<IOcelotLoggerFactory>();
+            _logger = new Mock<IOcelotLogger>();
+            _loggerFactory.Setup(x => x.CreateLogger<AuthorisationMiddleware>()).Returns(_logger.Object);
+            _next = context => Task.CompletedTask;
+            _addHeadersToResponse = new Mock<IAddHeadersToResponse>();
+            _addHeadersToRequest = new Mock<IAddHeadersToRequest>();
+            _middleware = new HttpHeadersTransformationMiddleware(
+                _next, _loggerFactory.Object, _preReplacer.Object,
+                _postReplacer.Object, _addHeadersToResponse.Object, _addHeadersToRequest.Object);
+        }
+
+        [Fact]
+        public void should_call_pre_and_post_header_transforms()
+        {
+            this.Given(x => GivenTheFollowingRequest())
+                .And(x => GivenTheDownstreamRequestIs())
+                .And(x => GivenTheReRouteHasPreFindAndReplaceSetUp())
+                .And(x => GivenTheHttpResponseMessageIs())
+                .When(x => WhenICallTheMiddleware())
+                .Then(x => ThenTheIHttpContextRequestHeaderReplacerIsCalledCorrectly())
+                .Then(x => ThenAddHeadersToRequestIsCalledCorrectly())
+                .And(x => ThenTheIHttpResponseHeaderReplacerIsCalledCorrectly())
+                .And(x => ThenAddHeadersToResponseIsCalledCorrectly())
+                .BDDfy();
+        }
+
+        private void ThenAddHeadersToResponseIsCalledCorrectly()
+        {
+            _addHeadersToResponse
+                .Verify(x => x.Add(_httpContext.Items.DownstreamReRoute().AddHeadersToDownstream, _httpContext.Items.DownstreamResponse()), Times.Once);
+        }
+
+        private void ThenAddHeadersToRequestIsCalledCorrectly()
+        {
+            _addHeadersToRequest
+                .Verify(x => x.SetHeadersOnDownstreamRequest(_httpContext.Items.DownstreamReRoute().AddHeadersToUpstream, _httpContext), Times.Once);
+        }
+
+        private void WhenICallTheMiddleware()
+        {
+            _middleware.Invoke(_httpContext).GetAwaiter().GetResult();
+        }
+
+        private void GivenTheDownstreamRequestIs()
+        {
+            _httpContext.Items.UpsertDownstreamRequest(new DownstreamRequest(new HttpRequestMessage(HttpMethod.Get, "http://test.com")));
+        }
+
+        private void GivenTheHttpResponseMessageIs()
+        {
+            _httpContext.Items.UpsertDownstreamResponse(new DownstreamResponse(new HttpResponseMessage()));
+        }
+
+        private void GivenTheReRouteHasPreFindAndReplaceSetUp()
+        {
+            var fAndRs = new List<HeaderFindAndReplace>();
+            var reRoute = new ReRouteBuilder()
+                .WithDownstreamReRoute(new DownstreamReRouteBuilder().WithUpstreamHeaderFindAndReplace(fAndRs)
+                    .WithDownstreamHeaderFindAndReplace(fAndRs).Build())
+                .Build();
+
+            var dR = new DownstreamRoute(null, reRoute);
+
+            _httpContext.Items.UpsertTemplatePlaceholderNameAndValues(dR.TemplatePlaceholderNameAndValues);
+            _httpContext.Items.UpsertDownstreamReRoute(dR.ReRoute.DownstreamReRoute[0]);
+        }
+
+        private void ThenTheIHttpContextRequestHeaderReplacerIsCalledCorrectly()
+        {
+            _preReplacer.Verify(x => x.Replace(It.IsAny<HttpContext>(), It.IsAny<List<HeaderFindAndReplace>>()), Times.Once);
+        }
+
+        private void ThenTheIHttpResponseHeaderReplacerIsCalledCorrectly()
+        {
+            _postReplacer.Verify(x => x.Replace(It.IsAny<HttpContext>(), It.IsAny<List<HeaderFindAndReplace>>()), Times.Once);
+        }
+
+        private void GivenTheFollowingRequest()
+        {
+            _httpContext.Request.Headers.Add("test", "test");
+        }
+    }
 }

test/Ocelot.UnitTests/Headers/HttpResponseHeaderReplacerTests.cs

@@ -3,6 +3,7 @@ namespace Ocelot.UnitTests.Headers
     using Microsoft.AspNetCore.Http;
     using Moq;
     using Ocelot.Configuration;
+    using Ocelot.DownstreamRouteFinder.Middleware;
     using Ocelot.Headers;
     using Ocelot.Infrastructure;
     using Ocelot.Infrastructure.RequestData;
@@ -263,8 +264,11 @@ namespace Ocelot.UnitTests.Headers
 
         private void WhenICallTheReplacer()
         {
-            var context = new DownstreamContext(new DefaultHttpContext()) { DownstreamResponse = _response, DownstreamRequest = _request };
-            _result = _replacer.Replace(context, _headerFindAndReplaces);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Items.UpsertDownstreamResponse(_response);
+            httpContext.Items.UpsertDownstreamRequest(_request);
+
+            _result = _replacer.Replace(httpContext, _headerFindAndReplaces);
         }
 
         private void ThenTheHeaderShouldBe(string key, string value)