implemented adding claims as query strings to downstream route, removed some of the middleware injection optiosn as i have currently have no use case for them, general refactoring to use the OcelotMiddleware a bit more

test/Ocelot.UnitTests/Claims/AddClaimsToRequestTests.cs

@@ -1,19 +1,18 @@
-namespace Ocelot.UnitTests.ClaimsBuilder
-{
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Security.Claims;
-    using Errors;
-    using Microsoft.AspNetCore.Http;
-    using Moq;
-    using Ocelot.ClaimsBuilder;
-    using Ocelot.Configuration;
-    using Ocelot.Infrastructure.Claims.Parser;
-    using Responses;
-    using Shouldly;
-    using TestStack.BDDfy;
-    using Xunit;
+using System.Collections.Generic;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Http;
+using Moq;
+using Ocelot.Claims;
+using Ocelot.Configuration;
+using Ocelot.Errors;
+using Ocelot.Infrastructure.Claims.Parser;
+using Ocelot.Responses;
+using Shouldly;
+using TestStack.BDDfy;
+using Xunit;
 
+namespace Ocelot.UnitTests.Claims
+{
     public class AddClaimsToRequestTests
     {
         private readonly AddClaimsToRequest _addClaimsToRequest;

test/Ocelot.UnitTests/Claims/ClaimsBuilderMiddlewareTests.cs

@@ -1,26 +1,25 @@
-using Ocelot.Infrastructure.RequestData;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Ocelot.Claims;
+using Ocelot.Claims.Middleware;
+using Ocelot.Configuration;
+using Ocelot.Configuration.Builder;
+using Ocelot.DownstreamRouteFinder;
+using Ocelot.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.Infrastructure.RequestData;
+using Ocelot.Responses;
+using TestStack.BDDfy;
+using Xunit;
 
-namespace Ocelot.UnitTests.ClaimsBuilder
+namespace Ocelot.UnitTests.Claims
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Net.Http;
-    using Microsoft.AspNetCore.Hosting;
-    using Microsoft.AspNetCore.Http;
-    using Microsoft.AspNetCore.TestHost;
-    using Microsoft.Extensions.DependencyInjection;
-    using Moq;
-    using Ocelot.ClaimsBuilder;
-    using Ocelot.ClaimsBuilder.Middleware;
-    using Ocelot.Configuration;
-    using Ocelot.Configuration.Builder;
-    using Ocelot.DownstreamRouteFinder;
-    using Ocelot.DownstreamRouteFinder.UrlMatcher;
-    using Responses;
-    using TestStack.BDDfy;
-    using Xunit;
-
     public class ClaimsBuilderMiddlewareTests : IDisposable
     {
         private readonly Mock<IRequestScopedDataRepository> _scopedRepository;

test/Ocelot.UnitTests/Headers/AddHeadersToRequestTests.cs

@@ -6,16 +6,15 @@ using Microsoft.Extensions.Primitives;
 using Moq;
 using Ocelot.Configuration;
 using Ocelot.Errors;
-using Ocelot.HeaderBuilder;
+using Ocelot.Headers;
+using Ocelot.Infrastructure.Claims.Parser;
 using Ocelot.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.HeaderBuilder
+namespace Ocelot.UnitTests.Headers
 {
-    using Ocelot.Infrastructure.Claims.Parser;
-
     public class AddHeadersToRequestTests
     {
         private readonly AddHeadersToRequest _addHeadersToRequest;

test/Ocelot.UnitTests/Headers/HttpRequestHeadersBuilderMiddlewareTests.cs

@@ -11,14 +11,14 @@ using Ocelot.Configuration;
 using Ocelot.Configuration.Builder;
 using Ocelot.DownstreamRouteFinder;
 using Ocelot.DownstreamRouteFinder.UrlMatcher;
-using Ocelot.HeaderBuilder;
-using Ocelot.HeaderBuilder.Middleware;
+using Ocelot.Headers;
+using Ocelot.Headers.Middleware;
 using Ocelot.Infrastructure.RequestData;
 using Ocelot.Responses;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.HeaderBuilder
+namespace Ocelot.UnitTests.Headers
 {
     public class HttpRequestHeadersBuilderMiddlewareTests : IDisposable
     {

test/Ocelot.UnitTests/QueryStrings/AddQueriesToRequestTests.cs

@@ -0,0 +1,153 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Http;
+using Moq;
+using Ocelot.Configuration;
+using Ocelot.Errors;
+using Ocelot.Infrastructure.Claims.Parser;
+using Ocelot.QueryStrings;
+using Ocelot.Responses;
+using Shouldly;
+using TestStack.BDDfy;
+using Xunit;
+
+namespace Ocelot.UnitTests.QueryStrings
+{
+    public class AddQueriesToRequestTests
+    {
+        private readonly AddQueriesToRequest _addQueriesToRequest;
+        private readonly Mock<IClaimsParser> _parser;
+        private List<ClaimToThing> _configuration;
+        private HttpContext _context;
+        private Response _result;
+        private Response<string> _claimValue;
+
+        public AddQueriesToRequestTests()
+        {
+            _parser = new Mock<IClaimsParser>();
+            _addQueriesToRequest = new AddQueriesToRequest(_parser.Object);
+        }
+
+        [Fact]
+        public void should_add_queries_to_context()
+        {
+            var context = new DefaultHttpContext
+            {
+                User = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>
+                {
+                    new Claim("test", "data")
+                }))
+            };
+
+            this.Given(
+                x => x.GivenAClaimToThing(new List<ClaimToThing>
+                {
+                    new ClaimToThing("query-key", "", "", 0)
+                }))
+                .Given(x => x.GivenHttpContext(context))
+                .And(x => x.GivenTheClaimParserReturns(new OkResponse<string>("value")))
+                .When(x => x.WhenIAddQueriesToTheRequest())
+                .Then(x => x.ThenTheResultIsSuccess())
+                .And(x => x.ThenTheQueryIsAdded())
+                .BDDfy();
+        }
+
+        [Fact]
+        public void if_query_exists_should_replace_it()
+        {
+            var context = new DefaultHttpContext
+            {
+                User = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>
+                {
+                    new Claim("test", "data")
+                })),
+            };
+
+            context.Request.QueryString = context.Request.QueryString.Add("query-key", "initial");
+
+            this.Given(
+                x => x.GivenAClaimToThing(new List<ClaimToThing>
+                {
+                    new ClaimToThing("query-key", "", "", 0)
+                }))
+                .Given(x => x.GivenHttpContext(context))
+                .And(x => x.GivenTheClaimParserReturns(new OkResponse<string>("value")))
+                .When(x => x.WhenIAddQueriesToTheRequest())
+                .Then(x => x.ThenTheResultIsSuccess())
+                .And(x => x.ThenTheQueryIsAdded())
+                .BDDfy();
+        }
+
+        [Fact]
+        public void should_return_error()
+        {
+            this.Given(
+               x => x.GivenAClaimToThing(new List<ClaimToThing>
+               {
+                    new ClaimToThing("", "", "", 0)
+               }))
+               .Given(x => x.GivenHttpContext(new DefaultHttpContext()))
+               .And(x => x.GivenTheClaimParserReturns(new ErrorResponse<string>(new List<Error>
+               {
+                   new AnyError()
+               })))
+               .When(x => x.WhenIAddQueriesToTheRequest())
+               .Then(x => x.ThenTheResultIsError())
+               .BDDfy();
+        }
+
+        private void ThenTheQueryIsAdded()
+        {
+            var query = _context.Request.Query.First(x => x.Key == "query-key");
+            query.Value.First().ShouldBe(_claimValue.Data);
+        }
+
+        private void GivenAClaimToThing(List<ClaimToThing> configuration)
+        {
+            _configuration = configuration;
+        }
+
+        private void GivenHttpContext(HttpContext context)
+        {
+            _context = context;
+        }
+
+        private void GivenTheClaimParserReturns(Response<string> claimValue)
+        {
+            _claimValue = claimValue;
+            _parser
+                .Setup(
+                    x =>
+                        x.GetValue(It.IsAny<IEnumerable<Claim>>(), 
+                        It.IsAny<string>(), 
+                        It.IsAny<string>(),
+                        It.IsAny<int>()))
+                .Returns(_claimValue);
+        }
+
+        private void WhenIAddQueriesToTheRequest()
+        {
+            _result = _addQueriesToRequest.SetQueriesOnContext(_configuration, _context);
+        }
+
+        private void ThenTheResultIsSuccess()
+        {
+            _result.IsError.ShouldBe(false);
+        }
+
+        private void ThenTheResultIsError()
+        {
+
+            _result.IsError.ShouldBe(true);
+        }
+
+        class AnyError : Error
+        {
+            public AnyError() 
+                : base("blahh", OcelotErrorCode.UnknownError)
+            {
+            }
+        }
+    }
+}

test/Ocelot.UnitTests/QueryStrings/QueryStringBuilderMiddlewareTests.cs

@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Ocelot.Configuration;
+using Ocelot.Configuration.Builder;
+using Ocelot.DownstreamRouteFinder;
+using Ocelot.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.Infrastructure.RequestData;
+using Ocelot.QueryStrings;
+using Ocelot.QueryStrings.Middleware;
+using Ocelot.Responses;
+using TestStack.BDDfy;
+using Xunit;
+
+namespace Ocelot.UnitTests.QueryStrings
+{
+    public class QueryStringBuilderMiddlewareTests : IDisposable
+    {
+        private readonly Mock<IRequestScopedDataRepository> _scopedRepository;
+        private readonly Mock<IAddQueriesToRequest> _addQueries;
+        private readonly string _url;
+        private readonly TestServer _server;
+        private readonly HttpClient _client;
+        private Response<DownstreamRoute> _downstreamRoute;
+        private HttpResponseMessage _result;
+
+        public QueryStringBuilderMiddlewareTests()
+        {
+            _url = "http://localhost:51879";
+            _scopedRepository = new Mock<IRequestScopedDataRepository>();
+            _addQueries = new Mock<IAddQueriesToRequest>();
+            var builder = new WebHostBuilder()
+              .ConfigureServices(x =>
+              {
+                  x.AddSingleton(_addQueries.Object);
+                  x.AddSingleton(_scopedRepository.Object);
+              })
+              .UseUrls(_url)
+              .UseKestrel()
+              .UseContentRoot(Directory.GetCurrentDirectory())
+              .UseIISIntegration()
+              .UseUrls(_url)
+              .Configure(app =>
+              {
+                  app.UseQueryStringBuilderMiddleware();
+              });
+
+            _server = new TestServer(builder);
+            _client = _server.CreateClient();
+        }
+
+        [Fact]
+        public void happy_path()
+        {
+            var downstreamRoute = new DownstreamRoute(new List<UrlPathPlaceholderNameAndValue>(),
+                new ReRouteBuilder()
+                    .WithDownstreamTemplate("any old string")
+                    .WithClaimsToQueries(new List<ClaimToThing>
+                    {
+                        new ClaimToThing("UserId", "Subject", "", 0)
+                    })
+                    .Build());
+
+            this.Given(x => x.GivenTheDownStreamRouteIs(downstreamRoute))
+                .And(x => x.GivenTheAddHeadersToRequestReturns())
+                .When(x => x.WhenICallTheMiddleware())
+                .Then(x => x.ThenTheAddHeadersToRequestIsCalledCorrectly())
+                .BDDfy();
+        }
+
+        private void GivenTheAddHeadersToRequestReturns()
+        {
+            _addQueries
+                .Setup(x => x.SetQueriesOnContext(It.IsAny<List<ClaimToThing>>(), 
+                It.IsAny<HttpContext>()))
+                .Returns(new OkResponse());
+        }
+
+        private void ThenTheAddHeadersToRequestIsCalledCorrectly()
+        {
+            _addQueries
+                .Verify(x => x.SetQueriesOnContext(It.IsAny<List<ClaimToThing>>(),
+                It.IsAny<HttpContext>()), Times.Once);
+        }
+
+        private void WhenICallTheMiddleware()
+        {
+            _result = _client.GetAsync(_url).Result;
+        }
+
+        private void GivenTheDownStreamRouteIs(DownstreamRoute downstreamRoute)
+        {
+            _downstreamRoute = new OkResponse<DownstreamRoute>(downstreamRoute);
+            _scopedRepository
+                .Setup(x => x.Get<DownstreamRoute>(It.IsAny<string>()))
+                .Returns(_downstreamRoute);
+        }
+
+        public void Dispose()
+        {
+            _client.Dispose();
+            _server.Dispose();
+        }
+    }
+}

test/Ocelot.UnitTests/Request/HttpRequestBuilderMiddlewareTests.cs

@@ -8,14 +8,13 @@ using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Ocelot.Infrastructure.RequestData;
-using Ocelot.RequestBuilder;
-using Ocelot.RequestBuilder.Builder;
-using Ocelot.RequestBuilder.Middleware;
+using Ocelot.Request.Builder;
+using Ocelot.Request.Middleware;
 using Ocelot.Responses;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.RequestBuilder
+namespace Ocelot.UnitTests.Request
 {
     public class HttpRequestBuilderMiddlewareTests : IDisposable
     {
@@ -25,7 +24,7 @@ namespace Ocelot.UnitTests.RequestBuilder
         private readonly TestServer _server;
         private readonly HttpClient _client;
         private HttpResponseMessage _result;
-        private OkResponse<Request> _request;
+        private OkResponse<Ocelot.Request.Request> _request;
         private OkResponse<string> _downstreamUrl;
 
         public HttpRequestBuilderMiddlewareTests()
@@ -58,15 +57,15 @@ namespace Ocelot.UnitTests.RequestBuilder
         public void happy_path()
         {
             this.Given(x => x.GivenTheDownStreamUrlIs("any old string"))
-                .And(x => x.GivenTheRequestBuilderReturns(new Request(new HttpRequestMessage(), new CookieContainer())))
+                .And(x => x.GivenTheRequestBuilderReturns(new Ocelot.Request.Request(new HttpRequestMessage(), new CookieContainer())))
                 .When(x => x.WhenICallTheMiddleware())
                 .Then(x => x.ThenTheScopedDataRepositoryIsCalledCorrectly())
                 .BDDfy();
         }
 
-        private void GivenTheRequestBuilderReturns(Request request)
+        private void GivenTheRequestBuilderReturns(Ocelot.Request.Request request)
         {
-            _request = new OkResponse<Request>(request);
+            _request = new OkResponse<Ocelot.Request.Request>(request);
             _requestBuilder
                 .Setup(x => x.Build(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Stream>(), It.IsAny<IHeaderDictionary>(),
                 It.IsAny<IRequestCookieCollection>(), It.IsAny<QueryString>(), It.IsAny<string>()))

test/Ocelot.UnitTests/Request/RequestBuilderTests.cs

@@ -5,14 +5,13 @@ using System.Net;
 using System.Net.Http;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Internal;
-using Ocelot.RequestBuilder;
-using Ocelot.RequestBuilder.Builder;
+using Ocelot.Request.Builder;
 using Ocelot.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.RequestBuilder
+namespace Ocelot.UnitTests.Request
 {
     public class RequestBuilderTests
     {
@@ -24,7 +23,7 @@ namespace Ocelot.UnitTests.RequestBuilder
         private QueryString _query;
         private string _contentType;
         private readonly IRequestBuilder _requestBuilder;
-        private Response<Request> _result;
+        private Response<Ocelot.Request.Request> _result;
 
         public RequestBuilderTests()
         {

test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs

@@ -8,7 +8,6 @@ using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Ocelot.Infrastructure.RequestData;
-using Ocelot.RequestBuilder;
 using Ocelot.Requester;
 using Ocelot.Requester.Middleware;
 using Ocelot.Responder;
@@ -27,7 +26,7 @@ namespace Ocelot.UnitTests.Requester
         private readonly HttpClient _client;
         private HttpResponseMessage _result;
         private OkResponse<HttpResponseMessage> _response;
-        private OkResponse<Request> _request;
+        private OkResponse<Ocelot.Request.Request> _request;
         private readonly Mock<IHttpResponder> _responder;
 
         public HttpRequesterMiddlewareTests()
@@ -61,7 +60,7 @@ namespace Ocelot.UnitTests.Requester
         [Fact]
         public void happy_path()
         {
-            this.Given(x => x.GivenTheRequestIs(new Request(new HttpRequestMessage(),new CookieContainer())))
+            this.Given(x => x.GivenTheRequestIs(new Ocelot.Request.Request(new HttpRequestMessage(),new CookieContainer())))
                 .And(x => x.GivenTheRequesterReturns(new HttpResponseMessage()))
                 .And(x => x.GivenTheResponderReturns())
                 .When(x => x.WhenICallTheMiddleware())
@@ -73,7 +72,7 @@ namespace Ocelot.UnitTests.Requester
         {
             _response = new OkResponse<HttpResponseMessage>(response);
             _requester
-                .Setup(x => x.GetResponse(It.IsAny<Request>()))
+                .Setup(x => x.GetResponse(It.IsAny<Ocelot.Request.Request>()))
                 .ReturnsAsync(_response);
         }
 
@@ -95,11 +94,11 @@ namespace Ocelot.UnitTests.Requester
             _result = _client.GetAsync(_url).Result;
         }
 
-        private void GivenTheRequestIs(Request request)
+        private void GivenTheRequestIs(Ocelot.Request.Request request)
         {
-            _request = new OkResponse<Request>(request);
+            _request = new OkResponse<Ocelot.Request.Request>(request);
             _scopedRepository
-                .Setup(x => x.Get<Request>(It.IsAny<string>()))
+                .Setup(x => x.Get<Ocelot.Request.Request>(It.IsAny<string>()))
                 .Returns(_request);
         }