From 157737ef01b33ba784814392d080d442e273a808 Mon Sep 17 00:00:00 2001
From: EL Aisati Ahmed <a.elaisati@ringring.be>
Date: Tue, 4 Feb 2020 18:11:38 +0100
Subject: [PATCH] Revert "Merge branch 'feature/issue#1088'"

This reverts commit 914a386b0e79612a832a0ddc4c1b7fda7e8cf4a2.
---
 samples/AdministrationApi/AdministrationApi.csproj  |  9 ++++-----
 samples/AdministrationApi/Program.cs                | 13 +++++++++----
 ...IdentityServerMiddlewareConfigurationProvider.cs |  8 +-------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/samples/AdministrationApi/AdministrationApi.csproj b/samples/AdministrationApi/AdministrationApi.csproj
index 7f8a351c..3fcf5dc8 100644
--- a/samples/AdministrationApi/AdministrationApi.csproj
+++ b/samples/AdministrationApi/AdministrationApi.csproj
@@ -3,12 +3,11 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Folder Include="wwwroot\" />
+    <Folder Include="wwwroot\"/>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Ocelot" Version="14.0.3" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Ocelot.Administration\Ocelot.Administration.csproj" />
+    <PackageReference Include="Microsoft.AspNetCore.App"/>
+    <PackageReference Include="Ocelot" Version="12.0.1"/>
+    <PackageReference Include="Ocelot.Administration" Version="0.1.0"/>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/AdministrationApi/Program.cs b/samples/AdministrationApi/Program.cs
index a69f1dc6..a5e46fda 100644
--- a/samples/AdministrationApi/Program.cs
+++ b/samples/AdministrationApi/Program.cs
@@ -1,14 +1,19 @@
-using Microsoft.AspNetCore.Hosting;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using Ocelot.Administration;
 using Ocelot.DependencyInjection;
 using Ocelot.Middleware;
-using System.IO;
+using Ocelot.Administration;
 
 namespace AdministrationApi
 {
-    public class Program
+  public class Program
 {
     public static void Main(string[] args)
     {
diff --git a/src/Ocelot.Administration/IdentityServerMiddlewareConfigurationProvider.cs b/src/Ocelot.Administration/IdentityServerMiddlewareConfigurationProvider.cs
index 0d263463..b4b8994a 100644
--- a/src/Ocelot.Administration/IdentityServerMiddlewareConfigurationProvider.cs
+++ b/src/Ocelot.Administration/IdentityServerMiddlewareConfigurationProvider.cs
@@ -27,13 +27,7 @@
                     }
 
                     app.UseAuthentication();
-                    app.UseRouting();
-                    app.UseAuthorization();
-                    app.UseEndpoints(endpoints =>
-                    {
-                        endpoints.MapDefaultControllerRoute();
-                        endpoints.MapControllers();
-                    });
+                    app.UseMvc();
                 });
             }