removed idserver4 (#547)

src/Ocelot/Authorisation/ScopesAuthoriser.cs

@@ -1,5 +1,4 @@
-using IdentityModel;
+using Ocelot.Responses;
-using Ocelot.Responses;
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Linq;
@@ -11,6 +10,7 @@ namespace Ocelot.Authorisation
     public class ScopesAuthoriser : IScopesAuthoriser
     {
         private readonly IClaimsParser _claimsParser;
+        private readonly string _scope = "scope";
 
         public ScopesAuthoriser(IClaimsParser claimsParser)
         {
@@ -24,7 +24,7 @@ namespace Ocelot.Authorisation
                 return new OkResponse<bool>(true);
             }
 
-            var values = _claimsParser.GetValuesByClaimType(claimsPrincipal.Claims, JwtClaimTypes.Scope);
+            var values = _claimsParser.GetValuesByClaimType(claimsPrincipal.Claims, _scope);
 
             if (values.IsError)
             {

src/Ocelot/DependencyInjection/IOcelotBuilder.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Net.Http;
-using IdentityServer4.AccessTokenValidation;
 using Ocelot.Middleware.Multiplexer;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Configuration;
@@ -13,10 +12,6 @@ namespace Ocelot.DependencyInjection
 
         IConfiguration Configuration { get; }
 
-        IOcelotAdministrationBuilder AddAdministration(string path, string secret);
-
-        IOcelotAdministrationBuilder AddAdministration(string path, Action<IdentityServerAuthenticationOptions> configOptions);
-
         IOcelotBuilder AddDelegatingHandler<T>(bool global = false)
             where T : DelegatingHandler;
 

src/Ocelot/DependencyInjection/OcelotBuilder.cs

@@ -1,6 +1,5 @@
 namespace Ocelot.DependencyInjection
 {
-    using IdentityServer4.Models;
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
@@ -31,10 +30,8 @@ namespace Ocelot.DependencyInjection
     using Ocelot.ServiceDiscovery;
     using System;
     using System.Collections.Generic;
-    using System.IdentityModel.Tokens.Jwt;
     using System.Reflection;
     using System.Security.Cryptography.X509Certificates;
-    using IdentityServer4.AccessTokenValidation;
     using Microsoft.AspNetCore.Builder;
     using Ocelot.Configuration;
     using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -141,35 +138,6 @@ namespace Ocelot.DependencyInjection
             Services.TryAddSingleton<IFrameworkDescription, FrameworkDescription>();
         }
 
-        public IOcelotAdministrationBuilder AddAdministration(string path, string secret)
-        {
-            var administrationPath = new AdministrationPath(path);
-
-            //add identity server for admin area
-            var identityServerConfiguration = IdentityServerConfigurationCreator.GetIdentityServerConfiguration(secret);
-
-            if (identityServerConfiguration != null)
-            {
-                AddIdentityServer(identityServerConfiguration, administrationPath);
-            }
-
-            Services.AddSingleton<IAdministrationPath>(administrationPath);
-            return new OcelotAdministrationBuilder(Services, Configuration);
-        }
-
-        public IOcelotAdministrationBuilder AddAdministration(string path, Action<IdentityServerAuthenticationOptions> configureOptions)
-        {
-            var administrationPath = new AdministrationPath(path);
-
-            if (configureOptions != null)
-            {
-                AddIdentityServer(configureOptions);
-            }
-
-            Services.AddSingleton<IAdministrationPath>(administrationPath);
-            return new OcelotAdministrationBuilder(Services, Configuration);
-        }
-
         public IOcelotBuilder AddSingletonDefinedAggregator<T>() 
             where T : class, IDefinedAggregator
         {
@@ -202,88 +170,5 @@ namespace Ocelot.DependencyInjection
 
             return this;
         }
-
-        private void AddIdentityServer(Action<IdentityServerAuthenticationOptions> configOptions)
-        {
-            Services
-                .AddAuthentication(IdentityServerAuthenticationDefaults.AuthenticationScheme)
-                .AddIdentityServerAuthentication(configOptions);
-        }
-
-        private void AddIdentityServer(IIdentityServerConfiguration identityServerConfiguration, IAdministrationPath adminPath) 
-        {
-            Services.TryAddSingleton<IIdentityServerConfiguration>(identityServerConfiguration);
-            var identityServerBuilder = Services
-                .AddIdentityServer(o => {
-                    o.IssuerUri = "Ocelot";
-                })
-                .AddInMemoryApiResources(Resources(identityServerConfiguration))
-                .AddInMemoryClients(Client(identityServerConfiguration));
-
-            var urlFinder = new BaseUrlFinder(Configuration);
-            var baseSchemeUrlAndPort = urlFinder.Find();
-            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();            
-
-            Services.AddAuthentication(IdentityServerAuthenticationDefaults.AuthenticationScheme)
-                .AddIdentityServerAuthentication(o =>
-                {
-                    o.Authority = baseSchemeUrlAndPort + adminPath.Path;
-                    o.ApiName = identityServerConfiguration.ApiName;
-                    o.RequireHttpsMetadata = identityServerConfiguration.RequireHttps;
-                    o.SupportedTokens = SupportedTokens.Both;
-                    o.ApiSecret = identityServerConfiguration.ApiSecret;
-                });
-
-                //todo - refactor naming..
-                if (string.IsNullOrEmpty(identityServerConfiguration.CredentialsSigningCertificateLocation) || string.IsNullOrEmpty(identityServerConfiguration.CredentialsSigningCertificatePassword))
-                {
-                    identityServerBuilder.AddDeveloperSigningCredential();
-                }
-                else
-                {
-                    //todo - refactor so calls method?
-                    var cert = new X509Certificate2(identityServerConfiguration.CredentialsSigningCertificateLocation, identityServerConfiguration.CredentialsSigningCertificatePassword);
-                    identityServerBuilder.AddSigningCredential(cert);
-                }
-        }
-
-        private List<ApiResource> Resources(IIdentityServerConfiguration identityServerConfiguration)
-        {
-            return new List<ApiResource>
-            {
-                new ApiResource(identityServerConfiguration.ApiName, identityServerConfiguration.ApiName)
-                {
-                    ApiSecrets = new List<Secret>
-                    {
-                        new Secret
-                        {
-                            Value = identityServerConfiguration.ApiSecret.Sha256()
-                        }
-                    }
-                },
-            };
-        }
-
-        private List<Client> Client(IIdentityServerConfiguration identityServerConfiguration) 
-        {
-            return new List<Client>
-            {
-                new Client
-                {
-                    ClientId = identityServerConfiguration.ApiName,
-                    AllowedGrantTypes = GrantTypes.ClientCredentials,
-                    ClientSecrets = new List<Secret> {new Secret(identityServerConfiguration.ApiSecret.Sha256())},
-                    AllowedScopes = { identityServerConfiguration.ApiName }
-                }
-            };
-        }
-
-        private static bool UsingEurekaServiceDiscoveryProvider(IConfiguration configurationRoot)
-        {
-            var type = configurationRoot.GetValue<string>("GlobalConfiguration:ServiceDiscoveryProvider:Type",
-                string.Empty);
-
-            return type.ToLower() == "eureka";
-        }
     }
 }

src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs

@@ -37,8 +37,6 @@
         {
             var configuration = await CreateConfiguration(builder);
 
-            CreateAdministrationArea(builder, configuration);
-
             ConfigureDiagnosticListener(builder);
 
             return CreateOcelotPipeline(builder, pipelineConfiguration);
@@ -153,25 +151,6 @@
             throw new Exception($"Unable to start Ocelot, errors are: {string.Join(",", config.Errors.Select(x => x.ToString()))}");
         }
 
-        private static void CreateAdministrationArea(IApplicationBuilder builder, IInternalConfiguration configuration)
-        {
-            if (!string.IsNullOrEmpty(configuration.AdministrationPath))
-            {
-                builder.Map(configuration.AdministrationPath, app =>
-                {
-                    //todo - hack so we know that we are using internal identity server
-                    var identityServerConfiguration = builder.ApplicationServices.GetService<IIdentityServerConfiguration>();
-                    if (identityServerConfiguration != null)
-                    {
-                        app.UseIdentityServer();
-                    }
-
-                    app.UseAuthentication();
-                    app.UseMvc();
-                });
-            }
-        }
-
         private static void ConfigureDiagnosticListener(IApplicationBuilder builder)
         {
             var env = builder.ApplicationServices.GetService<IHostingEnvironment>();

src/Ocelot/Ocelot.csproj

@@ -27,7 +27,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="7.6.104" />
-    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.1.1" />
@@ -47,6 +46,5 @@
     </PackageReference>
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
     <PackageReference Include="Polly" Version="6.0.1" />
-    <PackageReference Include="IdentityServer4" Version="2.2.0" />
   </ItemGroup>
 </Project>

test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj

@@ -52,5 +52,7 @@
     <PackageReference Include="TestStack.BDDfy" Version="4.3.2" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="Butterfly.Client.AspNetCore" Version="0.0.8" />
+    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
+    <PackageReference Include="IdentityServer4" Version="2.2.0" />
   </ItemGroup>
 </Project>

test/Ocelot.IntegrationTests/AdministrationTests.cs

@@ -1,837 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Security.Claims;
-using IdentityServer4.AccessTokenValidation;
-using IdentityServer4.Models;
-using IdentityServer4.Test;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Ocelot.Cache;
-using Ocelot.Configuration.File;
-using Ocelot.DependencyInjection;
-using Ocelot.Middleware;
-using Shouldly;
-using TestStack.BDDfy;
-using Xunit;
-
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
-namespace Ocelot.IntegrationTests
-{
-    public class AdministrationTests : IDisposable
-    {
-        private HttpClient _httpClient;
-        private readonly HttpClient _httpClientTwo;
-        private HttpResponseMessage _response;
-        private IWebHost _builder;
-        private IWebHostBuilder _webHostBuilder;
-        private string _ocelotBaseUrl;
-        private BearerToken _token;
-        private IWebHostBuilder _webHostBuilderTwo;
-        private IWebHost _builderTwo;
-        private IWebHost _identityServerBuilder;
-        private IWebHost _fooServiceBuilder;
-        private IWebHost _barServiceBuilder;
-
-        public AdministrationTests()
-        {
-            _httpClient = new HttpClient();
-            _httpClientTwo = new HttpClient();
-            _ocelotBaseUrl = "http://localhost:5000";
-            _httpClient.BaseAddress = new Uri(_ocelotBaseUrl);
-        }
-
-        [Fact]
-        public void should_return_response_401_with_call_re_routes_controller()
-        {
-            var configuration = new FileConfiguration();
-
-            this.Given(x => GivenThereIsAConfiguration(configuration))
-                .And(x => GivenOcelotIsRunning())
-                .When(x => WhenIGetUrlOnTheApiGateway("/administration/configuration"))
-                .Then(x => ThenTheStatusCodeShouldBe(HttpStatusCode.Unauthorized))
-                .BDDfy();
-        }
-
-         [Fact]
-         public void should_return_response_200_with_call_re_routes_controller()
-         {
-            var configuration = new FileConfiguration();
-
-             this.Given(x => GivenThereIsAConfiguration(configuration))
-                 .And(x => GivenOcelotIsRunning())
-                 .And(x => GivenIHaveAnOcelotToken("/administration"))
-                 .And(x => GivenIHaveAddedATokenToMyRequest())
-                 .When(x => WhenIGetUrlOnTheApiGateway("/administration/configuration"))
-                 .Then(x => ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-                 .BDDfy();
-         }
-
-        [Fact]
-        public void should_return_response_200_with_call_re_routes_controller_using_base_url_added_in_file_config()
-        {
-            _httpClient = new HttpClient();
-            _ocelotBaseUrl = "http://localhost:5011";
-            _httpClient.BaseAddress = new Uri(_ocelotBaseUrl);
-
-            var configuration = new FileConfiguration
-            {
-                GlobalConfiguration = new FileGlobalConfiguration
-                {
-                    BaseUrl = _ocelotBaseUrl
-                }
-            };
-
-            this.Given(x => GivenThereIsAConfiguration(configuration))
-                .And(x => GivenOcelotIsRunningWithNoWebHostBuilder(_ocelotBaseUrl))
-                .And(x => GivenIHaveAnOcelotToken("/administration"))
-                .And(x => GivenIHaveAddedATokenToMyRequest())
-                .When(x => WhenIGetUrlOnTheApiGateway("/administration/configuration"))
-                .Then(x => ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-                .BDDfy();
-        }
-
-        [Fact]
-        public void should_be_able_to_use_token_from_ocelot_a_on_ocelot_b()
-        {
-            var configuration = new FileConfiguration();
-
-            this.Given(x => GivenThereIsAConfiguration(configuration))
-                .And(x => GivenIdentityServerSigningEnvironmentalVariablesAreSet())
-                .And(x => GivenOcelotIsRunning())
-                .And(x => GivenIHaveAnOcelotToken("/administration"))
-                .And(x => GivenAnotherOcelotIsRunning("http://localhost:5007"))
-                .When(x => WhenIGetUrlOnTheSecondOcelot("/administration/configuration"))
-                .Then(x => ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-                .BDDfy();
-        }
-
-        [Fact]
-        public void should_return_file_configuration()
-        {
-            var configuration = new FileConfiguration
-            {
-                GlobalConfiguration = new FileGlobalConfiguration
-                {
-                    RequestIdKey = "RequestId",
-                    ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
-                    {
-                        Host = "127.0.0.1",
-                    }
-                },
-                ReRoutes = new List<FileReRoute>()
-                {
-                    new FileReRoute()
-                    {
-                        DownstreamHostAndPorts = new List<FileHostAndPort>
-                        {
-                            new FileHostAndPort
-                            {
-                                Host = "localhost",
-                                Port = 80,
-                            }
-                        },
-                        DownstreamScheme = "https",
-                        DownstreamPathTemplate = "/",
-                        UpstreamHttpMethod = new List<string> { "get" },
-                        UpstreamPathTemplate = "/",
-                        FileCacheOptions = new FileCacheOptions
-                        {
-                            TtlSeconds = 10,
-                            Region = "Geoff"
-                        }
-                    },
-                    new FileReRoute()
-                    {
-                        DownstreamHostAndPorts = new List<FileHostAndPort>
-                        {
-                            new FileHostAndPort
-                            {
-                                Host = "localhost",
-                                Port = 80,
-                            }
-                        },
-                        DownstreamScheme = "https",
-                        DownstreamPathTemplate = "/",
-                        UpstreamHttpMethod = new List<string> { "get" },
-                        UpstreamPathTemplate = "/test",
-                        FileCacheOptions = new FileCacheOptions
-                        {
-                            TtlSeconds = 10,
-                            Region = "Dave"
-                        }
-                    }
-                }
-            };
-
-            this.Given(x => GivenThereIsAConfiguration(configuration))
-                .And(x => GivenOcelotIsRunning())
-                .And(x => GivenIHaveAnOcelotToken("/administration"))
-                .And(x => GivenIHaveAddedATokenToMyRequest())
-                .When(x => WhenIGetUrlOnTheApiGateway("/administration/configuration"))
-                .Then(x => ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-                .And(x => ThenTheResponseShouldBe(configuration))
-                .BDDfy();
-        }
-
-        [Fact]
-        public void should_get_file_configuration_edit_and_post_updated_version()
-        {
-            var initialConfiguration = new FileConfiguration
-            {
-                GlobalConfiguration = new FileGlobalConfiguration
-                {
-                },
-                ReRoutes = new List<FileReRoute>()
-                {
-                    new FileReRoute()
-                    {
-                        DownstreamHostAndPorts = new List<FileHostAndPort>
-                        {
-                            new FileHostAndPort
-                            {
-                                Host = "localhost",
-                                Port = 80,
-                            }
-                        },
-                        DownstreamScheme = "https",
-                        DownstreamPathTemplate = "/",
-                        UpstreamHttpMethod = new List<string> { "get" },
-                        UpstreamPathTemplate = "/"
-                    },
-                    new FileReRoute()
-                    {
-                        DownstreamHostAndPorts = new List<FileHostAndPort>
-                        {
-                            new FileHostAndPort
-                            {
-                                Host = "localhost",
-                                Port = 80,
-                            }
-                        },
-                        DownstreamScheme = "https",
-                        DownstreamPathTemplate = "/",
-                        UpstreamHttpMethod = new List<string> { "get" },
-                        UpstreamPathTemplate = "/test"
-                    }
-                }
-            };
-
-             var updatedConfiguration = new FileConfiguration
-            {
-                GlobalConfiguration = new FileGlobalConfiguration
-                {
-                },
-                ReRoutes = new List<FileReRoute>()
-                {
-                    new FileReRoute()
-                    {
-                        DownstreamHostAndPorts = new List<FileHostAndPort>
-                        {
-                            new FileHostAndPort
-                            {
-                                Host = "localhost",
-                                Port = 80,
-                            }
-                        },
-                        DownstreamScheme = "http",
-                        DownstreamPathTemplate = "/geoffrey",
-                        UpstreamHttpMethod = new List<string> { "get" },
-                        UpstreamPathTemplate = "/"
-                    },
-                    new FileReRoute()
-                    {
-                        DownstreamHostAndPorts = new List<FileHostAndPort>
-                        {
-                            new FileHostAndPort
-                            {
-                                Host = "123.123.123",
-                                Port = 443,
-                            }
-                        },
-                        DownstreamScheme = "https",
-                        DownstreamPathTemplate = "/blooper/{productId}",
-                        UpstreamHttpMethod = new List<string> { "post" },
-                        UpstreamPathTemplate = "/test"
-                    }
-                }
-            };
-
-            this.Given(x => GivenThereIsAConfiguration(initialConfiguration))
-                .And(x => GivenOcelotIsRunning())
-                .And(x => GivenIHaveAnOcelotToken("/administration"))
-                .And(x => GivenIHaveAddedATokenToMyRequest())
-                .When(x => WhenIGetUrlOnTheApiGateway("/administration/configuration"))
-                .When(x => WhenIPostOnTheApiGateway("/administration/configuration", updatedConfiguration))
-                .Then(x => ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-                .And(x => ThenTheResponseShouldBe(updatedConfiguration))
-                .When(x => WhenIGetUrlOnTheApiGateway("/administration/configuration"))
-                .And(x => ThenTheResponseShouldBe(updatedConfiguration))
-                .And(_ => ThenTheConfigurationIsSavedCorrectly(updatedConfiguration))
-                .BDDfy();
-        }
-
-        private void ThenTheConfigurationIsSavedCorrectly(FileConfiguration expected)
-        {
-            var ocelotJsonPath = $"{AppContext.BaseDirectory}ocelot.json";
-            var resultText = File.ReadAllText(ocelotJsonPath);
-            var expectedText = JsonConvert.SerializeObject(expected, Formatting.Indented);
-            resultText.ShouldBe(expectedText);
-
-            var environmentSpecificPath = $"{AppContext.BaseDirectory}/ocelot.Production.json";
-            resultText = File.ReadAllText(environmentSpecificPath);
-            expectedText = JsonConvert.SerializeObject(expected, Formatting.Indented);
-            resultText.ShouldBe(expectedText);
-        }
-
-        [Fact]
-        public void should_get_file_configuration_edit_and_post_updated_version_redirecting_reroute()
-        {
-            var fooPort = 47689;
-            var barPort = 47690;
-
-            var initialConfiguration = new FileConfiguration
-            {
-                ReRoutes = new List<FileReRoute>()
-                {
-                    new FileReRoute()
-                    {
-                        DownstreamHostAndPorts = new List<FileHostAndPort>
-                        {
-                            new FileHostAndPort
-                            {
-                                Host = "localhost",
-                                Port = fooPort,
-                            }
-                        },
-                        DownstreamScheme = "http",
-                        DownstreamPathTemplate = "/foo",
-                        UpstreamHttpMethod = new List<string> { "get" },
-                        UpstreamPathTemplate = "/foo"
-                    }
-                }
-            };
-
-             var updatedConfiguration = new FileConfiguration
-            {
-                GlobalConfiguration = new FileGlobalConfiguration
-                {
-                },
-                ReRoutes = new List<FileReRoute>()
-                {
-                    new FileReRoute()
-                    {
-                        DownstreamHostAndPorts = new List<FileHostAndPort>
-                        {
-                            new FileHostAndPort
-                            {
-                                Host = "localhost",
-                                Port = barPort,
-                            }
-                        },
-                        DownstreamScheme = "http",
-                        DownstreamPathTemplate = "/bar",
-                        UpstreamHttpMethod = new List<string> { "get" },
-                        UpstreamPathTemplate = "/foo"
-                    }
-                }
-            };
-
-            this.Given(x => GivenThereIsAConfiguration(initialConfiguration))
-                .And(x => GivenThereIsAFooServiceRunningOn($"http://localhost:{fooPort}"))
-                .And(x => GivenThereIsABarServiceRunningOn($"http://localhost:{barPort}"))
-                .And(x => GivenOcelotIsRunning())
-                .And(x => WhenIGetUrlOnTheApiGateway("/foo"))
-                .Then(x => ThenTheResponseBodyShouldBe("foo"))
-                .And(x => GivenIHaveAnOcelotToken("/administration"))
-                .And(x => GivenIHaveAddedATokenToMyRequest())
-                .When(x => WhenIPostOnTheApiGateway("/administration/configuration", updatedConfiguration))
-                .Then(x => ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-                .And(x => ThenTheResponseShouldBe(updatedConfiguration))
-                .And(x => WhenIGetUrlOnTheApiGateway("/foo"))
-                .Then(x => ThenTheResponseBodyShouldBe("bar"))
-                .When(x => WhenIPostOnTheApiGateway("/administration/configuration", initialConfiguration))
-                .Then(x => ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-                .And(x => ThenTheResponseShouldBe(initialConfiguration))
-                .And(x => WhenIGetUrlOnTheApiGateway("/foo"))
-                .Then(x => ThenTheResponseBodyShouldBe("foo"))
-                .BDDfy();
-        }
-
-        [Fact]
-        public void should_clear_region()
-        {
-            var initialConfiguration = new FileConfiguration
-            {
-                GlobalConfiguration = new FileGlobalConfiguration
-                {
-                },
-                ReRoutes = new List<FileReRoute>()
-                {
-                    new FileReRoute()
-                    {
-                        DownstreamHostAndPorts = new List<FileHostAndPort>
-                        {
-                            new FileHostAndPort
-                            {
-                                Host = "localhost",
-                                Port = 80,
-                            }
-                        },
-                        DownstreamScheme = "https",
-                        DownstreamPathTemplate = "/",
-                        UpstreamHttpMethod = new List<string> { "get" },
-                        UpstreamPathTemplate = "/",
-                        FileCacheOptions = new FileCacheOptions
-                        {
-                            TtlSeconds = 10
-                        }
-                    },
-                    new FileReRoute()
-                    {
-                        DownstreamHostAndPorts = new List<FileHostAndPort>
-                        {
-                            new FileHostAndPort
-                            {
-                                Host = "localhost",
-                                Port = 80,
-                            }
-                        },
-                        DownstreamScheme = "https",
-                        DownstreamPathTemplate = "/",
-                        UpstreamHttpMethod = new List<string> { "get" },
-                        UpstreamPathTemplate = "/test",
-                        FileCacheOptions = new FileCacheOptions
-                        {
-                            TtlSeconds = 10
-                        }
-                    }
-                }
-            };
-
-            var regionToClear = "gettest";
-
-            this.Given(x => GivenThereIsAConfiguration(initialConfiguration))
-                .And(x => GivenOcelotIsRunning())
-                .And(x => GivenIHaveAnOcelotToken("/administration"))
-                .And(x => GivenIHaveAddedATokenToMyRequest())
-                .When(x => WhenIDeleteOnTheApiGateway($"/administration/outputcache/{regionToClear}"))
-                .Then(x => ThenTheStatusCodeShouldBe(HttpStatusCode.NoContent))
-                .BDDfy();
-        }
-
-         [Fact]
-         public void should_return_response_200_with_call_re_routes_controller_when_using_own_identity_server_to_secure_admin_area()
-         {
-            var configuration = new FileConfiguration();
-
-            var identityServerRootUrl = "http://localhost:5123";
-
-            Action<IdentityServerAuthenticationOptions> options = o => {
-                o.Authority = identityServerRootUrl;
-                o.ApiName = "api";
-                o.RequireHttpsMetadata = false;
-                o.SupportedTokens = SupportedTokens.Both;
-                o.ApiSecret = "secret";
-            };
-
-             this.Given(x => GivenThereIsAConfiguration(configuration))
-                 .And(x => GivenThereIsAnIdentityServerOn(identityServerRootUrl, "api"))
-                 .And(x => GivenOcelotIsRunningWithIdentityServerSettings(options))
-                 .And(x => GivenIHaveAToken(identityServerRootUrl))
-                 .And(x => GivenIHaveAddedATokenToMyRequest())
-                 .When(x => WhenIGetUrlOnTheApiGateway("/administration/configuration"))
-                 .Then(x => ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-                 .BDDfy();
-         }
-
-        private void GivenIHaveAToken(string url)
-        {
-            var formData = new List<KeyValuePair<string, string>>
-            {
-                new KeyValuePair<string, string>("client_id", "api"),
-                new KeyValuePair<string, string>("client_secret", "secret"),
-                new KeyValuePair<string, string>("scope", "api"),
-                new KeyValuePair<string, string>("username", "test"),
-                new KeyValuePair<string, string>("password", "test"),
-                new KeyValuePair<string, string>("grant_type", "password")
-            };
-            var content = new FormUrlEncodedContent(formData);
-
-            using (var httpClient = new HttpClient())
-            {
-                var response = httpClient.PostAsync($"{url}/connect/token", content).Result;
-                var responseContent = response.Content.ReadAsStringAsync().Result;
-                response.EnsureSuccessStatusCode();
-                _token = JsonConvert.DeserializeObject<BearerToken>(responseContent);
-            }
-        }
-
-          private void GivenThereIsAnIdentityServerOn(string url, string apiName)
-        {
-            _identityServerBuilder = new WebHostBuilder()
-                .UseUrls(url)
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .ConfigureServices(services =>
-                {
-                    services.AddLogging();
-                    services.AddIdentityServer()
-                    .AddDeveloperSigningCredential()
-                        .AddInMemoryApiResources(new List<ApiResource>
-                        {
-                            new ApiResource
-                            {
-                                Name = apiName,
-                                Description = apiName,
-                                Enabled = true,
-                                DisplayName = apiName,
-                                Scopes = new List<Scope>()
-                                {
-                                    new Scope(apiName)
-                                }
-                            }
-                        })
-                        .AddInMemoryClients(new List<Client>
-                        {
-                            new Client
-                            {
-                                ClientId = apiName,
-                                AllowedGrantTypes = GrantTypes.ResourceOwnerPassword,
-                                ClientSecrets = new List<Secret> {new Secret("secret".Sha256())},
-                                AllowedScopes = new List<string> { apiName },
-                                AccessTokenType = AccessTokenType.Jwt,
-                                Enabled = true
-                            }
-                        })
-                        .AddTestUsers(new List<TestUser>
-                        {
-                            new TestUser
-                            {
-                                Username = "test",
-                                Password = "test",
-                                SubjectId = "1231231"
-                            }
-                        });
-                })
-                .Configure(app =>
-                {
-                    app.UseIdentityServer();
-                })
-                .Build();
-
-                _identityServerBuilder.Start();
-
-                using (var httpClient = new HttpClient())
-                {
-                    var response = httpClient.GetAsync($"{url}/.well-known/openid-configuration").Result;
-                    response.EnsureSuccessStatusCode();
-                }        
-            }
-
-        private void GivenAnotherOcelotIsRunning(string baseUrl)
-        {
-            _httpClientTwo.BaseAddress = new Uri(baseUrl);
-
-            _webHostBuilderTwo = new WebHostBuilder()
-               .UseUrls(baseUrl)
-               .UseKestrel()
-               .UseContentRoot(Directory.GetCurrentDirectory())
-               .ConfigureAppConfiguration((hostingContext, config) =>
-               {
-                   config.SetBasePath(hostingContext.HostingEnvironment.ContentRootPath);
-                   var env = hostingContext.HostingEnvironment;
-                   config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: false)
-                       .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: false);
-                   config.AddJsonFile("ocelot.json", false, false);
-                   config.AddEnvironmentVariables();
-               })
-               .ConfigureServices(x =>
-               {
-                   x.AddOcelot()
-                       .AddAdministration("/administration", "secret");
-               })
-               .Configure(app =>
-               {
-                   app.UseOcelot().Wait();
-               });
-
-            _builderTwo = _webHostBuilderTwo.Build();
-
-            _builderTwo.Start();
-        }
-
-        private void GivenIdentityServerSigningEnvironmentalVariablesAreSet()
-        {
-            Environment.SetEnvironmentVariable("OCELOT_CERTIFICATE", "idsrv3test.pfx");
-            Environment.SetEnvironmentVariable("OCELOT_CERTIFICATE_PASSWORD", "idsrv3test");
-        }
-
-        private void WhenIGetUrlOnTheSecondOcelot(string url)
-        {
-            _httpClientTwo.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", _token.AccessToken);
-            _response = _httpClientTwo.GetAsync(url).Result;
-        }
-
-        private void WhenIPostOnTheApiGateway(string url, FileConfiguration updatedConfiguration)
-        {
-            var json = JsonConvert.SerializeObject(updatedConfiguration);
-            var content = new StringContent(json);
-            content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
-            _response = _httpClient.PostAsync(url, content).Result;
-        }
-
-        private void ThenTheResponseShouldBe(List<string> expected)
-        {
-            var content = _response.Content.ReadAsStringAsync().Result;
-            var result = JsonConvert.DeserializeObject<Regions>(content);
-            result.Value.ShouldBe(expected);
-        }
-
-        private void ThenTheResponseBodyShouldBe(string expected)
-        {
-            var content = _response.Content.ReadAsStringAsync().Result;
-            content.ShouldBe(expected);
-        }
-
-        private void ThenTheResponseShouldBe(FileConfiguration expecteds)
-        {
-            var response = JsonConvert.DeserializeObject<FileConfiguration>(_response.Content.ReadAsStringAsync().Result);
-
-            response.GlobalConfiguration.RequestIdKey.ShouldBe(expecteds.GlobalConfiguration.RequestIdKey);
-            response.GlobalConfiguration.ServiceDiscoveryProvider.Host.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Host);
-            response.GlobalConfiguration.ServiceDiscoveryProvider.Port.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Port);
-
-            for (var i = 0; i < response.ReRoutes.Count; i++)
-            {
-                for (var j = 0; j < response.ReRoutes[i].DownstreamHostAndPorts.Count; j++)
-                {
-                    var result = response.ReRoutes[i].DownstreamHostAndPorts[j];
-                    var expected = expecteds.ReRoutes[i].DownstreamHostAndPorts[j];
-                    result.Host.ShouldBe(expected.Host);
-                    result.Port.ShouldBe(expected.Port);
-                }
-
-                response.ReRoutes[i].DownstreamPathTemplate.ShouldBe(expecteds.ReRoutes[i].DownstreamPathTemplate);
-                response.ReRoutes[i].DownstreamScheme.ShouldBe(expecteds.ReRoutes[i].DownstreamScheme);
-                response.ReRoutes[i].UpstreamPathTemplate.ShouldBe(expecteds.ReRoutes[i].UpstreamPathTemplate);
-                response.ReRoutes[i].UpstreamHttpMethod.ShouldBe(expecteds.ReRoutes[i].UpstreamHttpMethod);
-            }
-        }
-
-        private void GivenIHaveAddedATokenToMyRequest()
-        {
-            _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", _token.AccessToken);
-        }
-
-        private void GivenIHaveAnOcelotToken(string adminPath)
-        {
-            var tokenUrl = $"{adminPath}/connect/token";
-            var formData = new List<KeyValuePair<string, string>>
-            {
-                new KeyValuePair<string, string>("client_id", "admin"),
-                new KeyValuePair<string, string>("client_secret", "secret"),
-                new KeyValuePair<string, string>("scope", "admin"),
-                new KeyValuePair<string, string>("grant_type", "client_credentials")
-            };
-            var content = new FormUrlEncodedContent(formData);
-
-            var response = _httpClient.PostAsync(tokenUrl, content).Result;
-            var responseContent = response.Content.ReadAsStringAsync().Result;
-            response.EnsureSuccessStatusCode();
-            _token = JsonConvert.DeserializeObject<BearerToken>(responseContent);
-            var configPath = $"{adminPath}/.well-known/openid-configuration";
-            response = _httpClient.GetAsync(configPath).Result;
-            response.EnsureSuccessStatusCode();
-        }
-
-        private void GivenOcelotIsRunningWithIdentityServerSettings(Action<IdentityServerAuthenticationOptions> configOptions)
-        {
-            _webHostBuilder = new WebHostBuilder()
-                .UseUrls(_ocelotBaseUrl)
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .ConfigureAppConfiguration((hostingContext, config) =>
-                {
-                    config.SetBasePath(hostingContext.HostingEnvironment.ContentRootPath);
-                    var env = hostingContext.HostingEnvironment;
-                    config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: false)
-                        .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: false);
-                    config.AddJsonFile("ocelot.json", false, false);
-                    config.AddEnvironmentVariables();
-                })
-                .ConfigureServices(x => {
-                    x.AddSingleton(_webHostBuilder);
-                    x.AddOcelot()
-                    .AddAdministration("/administration", configOptions);
-                    })
-                    .Configure(app => {
-                        app.UseOcelot().Wait();
-                    });
-
-              _builder = _webHostBuilder.Build();
-
-            _builder.Start();
-        }
-
-        private void GivenOcelotIsRunning()
-        {
-            _webHostBuilder = new WebHostBuilder()
-                .UseUrls(_ocelotBaseUrl)
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .ConfigureAppConfiguration((hostingContext, config) =>
-                {
-                    config.SetBasePath(hostingContext.HostingEnvironment.ContentRootPath);
-                    var env = hostingContext.HostingEnvironment;
-                    config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: false)
-                        .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: false);
-                    config.AddJsonFile("ocelot.json", false, false);
-                    config.AddEnvironmentVariables();
-                })
-                .ConfigureServices(x =>
-                {
-                    x.AddOcelot()
-                        .AddAdministration("/administration", "secret");
-                })
-                .Configure(app =>
-                {
-                    app.UseOcelot().Wait();
-                });
-
-            _builder = _webHostBuilder.Build();
-
-            _builder.Start();
-        }
-
-        private void GivenOcelotIsRunningWithNoWebHostBuilder(string baseUrl)
-        {
-            _webHostBuilder = new WebHostBuilder()
-                .UseUrls(_ocelotBaseUrl)
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .ConfigureAppConfiguration((hostingContext, config) =>
-                {
-                    config.SetBasePath(hostingContext.HostingEnvironment.ContentRootPath);
-                    var env = hostingContext.HostingEnvironment;
-                    config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: false)
-                        .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: false);
-                    config.AddJsonFile("ocelot.json", false, false);
-                    config.AddEnvironmentVariables();
-                })
-                .ConfigureServices(x => {
-                    x.AddSingleton(_webHostBuilder);
-                    x.AddOcelot()
-                        .AddAdministration("/administration", "secret");
-                })
-                .Configure(app => {
-                    app.UseOcelot().Wait();
-                });
-
-            _builder = _webHostBuilder.Build();
-
-            _builder.Start();
-        }
-
-        private void GivenThereIsAConfiguration(FileConfiguration fileConfiguration)
-        {
-            var configurationPath = $"{Directory.GetCurrentDirectory()}/ocelot.json";
-
-            var jsonConfiguration = JsonConvert.SerializeObject(fileConfiguration);
-
-            if (File.Exists(configurationPath))
-            {
-                File.Delete(configurationPath);
-            }
-
-            File.WriteAllText(configurationPath, jsonConfiguration);
-
-            var text = File.ReadAllText(configurationPath);
-
-            configurationPath = $"{AppContext.BaseDirectory}/ocelot.json";
-
-            if (File.Exists(configurationPath))
-            {
-                File.Delete(configurationPath);
-            }
-
-            File.WriteAllText(configurationPath, jsonConfiguration);
-
-            text = File.ReadAllText(configurationPath);
-        }
-
-        private void WhenIGetUrlOnTheApiGateway(string url)
-        {
-            _response = _httpClient.GetAsync(url).Result;
-        }
-
-        private void WhenIDeleteOnTheApiGateway(string url)
-        {
-            _response = _httpClient.DeleteAsync(url).Result;
-        }
-
-        private void ThenTheStatusCodeShouldBe(HttpStatusCode expectedHttpStatusCode)
-        {
-            _response.StatusCode.ShouldBe(expectedHttpStatusCode);
-        }
-
-        public void Dispose()
-        {
-            Environment.SetEnvironmentVariable("OCELOT_CERTIFICATE", "");
-            Environment.SetEnvironmentVariable("OCELOT_CERTIFICATE_PASSWORD", "");
-            _builder?.Dispose();
-            _httpClient?.Dispose();
-            _identityServerBuilder?.Dispose();
-        }
-
-        private void GivenThereIsAFooServiceRunningOn(string baseUrl)
-        {
-            _fooServiceBuilder = new WebHostBuilder()
-                .UseUrls(baseUrl)
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
-                .Configure(app =>
-                {
-                    app.UsePathBase("/foo");
-                    app.Run(async context =>
-                    {   
-                        context.Response.StatusCode = 200;
-                        await context.Response.WriteAsync("foo");
-                    });
-                })
-                .Build();
-
-            _fooServiceBuilder.Start();
-        }
-
-        private void GivenThereIsABarServiceRunningOn(string baseUrl)
-        {
-            _barServiceBuilder = new WebHostBuilder()
-                .UseUrls(baseUrl)
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
-                .Configure(app =>
-                {
-                    app.UsePathBase("/bar");
-                    app.Run(async context =>
-                    {   
-                        context.Response.StatusCode = 200;
-                        await context.Response.WriteAsync("bar");
-                    });
-                })
-                .Build();
-
-            _barServiceBuilder.Start();
-        }
-    }
-}

test/Ocelot.IntegrationTests/BearerToken.cs

@@ -1,16 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Ocelot.IntegrationTests
-{
-    class BearerToken
-    {
-        [JsonProperty("access_token")]
-        public string AccessToken { get; set; }
-
-        [JsonProperty("expires_in")]
-        public int ExpiresIn { get; set; }
-
-        [JsonProperty("token_type")]
-        public string TokenType { get; set; }
-    }
-}

test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj

@@ -39,7 +39,6 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
     <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="IdentityServer4" Version="2.2.0" />
     <PackageReference Include="Shouldly" Version="3.0.0" />
     <PackageReference Include="TestStack.BDDfy" Version="4.3.2" />
     <PackageReference Include="Microsoft.Data.SQLite" Version="2.1.0" />

test/Ocelot.IntegrationTests/ThreadSafeHeadersTests.cs

@@ -111,8 +111,7 @@ namespace Ocelot.IntegrationTests
                 })
                 .ConfigureServices(x =>
                 {
-                    x.AddOcelot()
+                    x.AddOcelot();
-                        .AddAdministration("/administration", "secret");
                 })
                 .Configure(app =>
                 {

test/Ocelot.ManualTest/Program.cs

@@ -8,7 +8,6 @@
     using Ocelot.DependencyInjection;
     using Ocelot.Middleware;
     using System;
-    using IdentityServer4.AccessTokenValidation;
     using System.Net.Http;
     using System.Threading.Tasks;
     using System.Threading;
@@ -38,17 +37,17 @@
                         });
 
                     s.AddOcelot()
-                        .AddDelegatingHandler<FakeHandler>(true)
+                        .AddDelegatingHandler<FakeHandler>(true);
                         // .AddCacheManager(x =>
                         // {
                         //     x.WithDictionaryHandle();
                         // })
-                      /*.AddOpenTracing(option =>
+                        // .AddOpenTracing(option =>
-                      {
+                        // {
-                          option.CollectorUrl = "http://localhost:9618";
+                        //     option.CollectorUrl = "http://localhost:9618";
-                          option.Service = "Ocelot.ManualTest";
+                        //     option.Service = "Ocelot.ManualTest";
-                      })*/
+                        // })
-                    .AddAdministration("/administration", "secret");
+                        // .AddAdministration("/administration", "secret");
                 })
                 .ConfigureLogging((hostingContext, logging) =>
                 {

test/Ocelot.UnitTests/DependencyInjection/OcelotBuilderTests.cs

@@ -13,7 +13,6 @@ namespace Ocelot.UnitTests.DependencyInjection
     using Ocelot.Requester;
     using Ocelot.UnitTests.Requester;
     using Shouldly;
-    using IdentityServer4.AccessTokenValidation;
     using TestStack.BDDfy;
     using Xunit;
     using static Ocelot.UnitTests.Middleware.UserDefinedResponseAggregatorTests;
@@ -75,28 +74,6 @@ namespace Ocelot.UnitTests.DependencyInjection
                 .BDDfy();
         }
 
-        [Fact]
-        public void should_set_up_administration_with_identity_server_options()
-        {
-            Action<IdentityServerAuthenticationOptions> options = o => {};
-
-            this.Given(x => WhenISetUpOcelotServices())
-                .When(x => WhenISetUpAdministration(options))
-                .Then(x => ThenAnExceptionIsntThrown())
-                .Then(x => ThenTheCorrectAdminPathIsRegitered())
-                .BDDfy();
-        }
-
-        [Fact]
-        public void should_set_up_administration()
-        {
-            this.Given(x => WhenISetUpOcelotServices())
-                .When(x => WhenISetUpAdministration())
-                .Then(x => ThenAnExceptionIsntThrown())
-                .Then(x => ThenTheCorrectAdminPathIsRegitered())
-                .BDDfy();
-        }
-
         [Fact]
         public void should_use_logger_factory()
         {
@@ -167,16 +144,6 @@ namespace Ocelot.UnitTests.DependencyInjection
             first.ShouldNotBe(second);
         }
 
-        private void WhenISetUpAdministration()
-        {
-            _ocelotBuilder.AddAdministration("/administration", "secret");
-        }
-
-        private void WhenISetUpAdministration(Action<IdentityServerAuthenticationOptions> options)
-        {
-            _ocelotBuilder.AddAdministration("/administration", options);
-        }
-
         private void AddTransientGlobalDelegatingHandler<T>()
             where T : DelegatingHandler
         {
@@ -189,13 +156,6 @@ namespace Ocelot.UnitTests.DependencyInjection
             _ocelotBuilder.AddDelegatingHandler<T>();
         }
 
-        private void ThenTheCorrectAdminPathIsRegitered()
-        {
-            _serviceProvider = _services.BuildServiceProvider();
-            var path = _serviceProvider.GetService<IAdministrationPath>();
-            path.Path.ShouldBe("/administration");
-        }
-
         private void ThenTheProviderIsRegisteredAndReturnsHandlers<TOne, TWo>()
         {
             _serviceProvider = _services.BuildServiceProvider();