Initial .NET Core 3 hack

Author: scottbrady91

src/Host/Host.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="IdentityServer4" Version="2.4.0" />
+    <!--<PackageReference Include="IdentityServer4" Version="2.4.0" />-->
   </ItemGroup>
 
   <ItemGroup>

src/Host/Program.cs

@@ -1,19 +1,22 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace Host
 {
     public class Program
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateHostBuilder(args).Build().Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                //.UseStartup<StartupWithIdentityServer>()
-                .Build();
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.UseStartup<Startup>();
+                    // webBuilder.UseStartup<StartupWithIdentityServer>()
+                });
     }
 }

src/Host/Properties/launchSettings.json

@@ -1,23 +1,8 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:5000/",
-      "sslPort": 0
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "Host": {
       "commandName": "Project",
-      "launchBrowser": true,
+      /*"launchBrowser": true,*/
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },

src/Host/Startup.cs

@@ -2,7 +2,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using Host.InMemory;
-using IdentityManager2.Configuration;
+using IdentityManager2.Assets;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.FileProviders;
 
 namespace Host
 {
@@ -23,9 +25,24 @@ public void Configure(IApplicationBuilder app)
         {
             app.UseDeveloperExceptionPage();
 
-            app.UseIdentityManager();
+            app.UseRouting();
 
-            app.UseMvcWithDefaultRoute();
+            app.UseStaticFiles();
+
+            app.UseAuthentication();
+            app.UseAuthorization();
+
+            app.UseFileServer(new FileServerOptions
+            {
+                RequestPath = new PathString("/assets"),
+                FileProvider = new EmbeddedFileProvider(typeof(EmbeddedHtmlResult).Assembly, "IdentityManager2.Assets")
+            });
+
+            app.UseEndpoints(x =>
+            {
+                //x.MapIdentityManager("/idm");
+                x.MapDefaultControllerRoute();
+            });
         }
     }
 }

src/Host/StartupWithIdentityServer.cs

@@ -20,7 +20,6 @@ public PageController(IdentityManagerOptions config)
         }
 
         [HttpGet]
-        [Authorize(IdentityManagerConstants.IdMgrAuthPolicy)]
         [Route("", Name = IdentityManagerConstants.RouteNames.Home)]
         public IActionResult Index()
         {
@@ -30,12 +29,7 @@ public IActionResult Index()
                 Model = JsonConvert.SerializeObject(new
                 {
                     PathBase = Request.PathBase,
-                    ShowLoginButton = config.SecurityConfiguration.ShowLoginButton,
-                    oauthSettings = new
-                    {
-                        authorization_endpoint = Request.PathBase + Constants.AuthorizePath,
-                        client_id = Constants.IdMgrClientId
-                    }
+                    ShowLoginButton = User.Identity.IsAuthenticated
                 })
             });
         }
@@ -60,7 +54,10 @@ public async Task<IActionResult> Login(string returnUrl)
         [Route("logout", Name = IdentityManagerConstants.RouteNames.Logout)]
         public async Task<IActionResult> Logout()
         {
+            await HttpContext.SignOutAsync(IdentityManagerConstants.LocalApiScheme);
+
             await config.SecurityConfiguration.SignOut(HttpContext);
+
             return RedirectToRoute(IdentityManagerConstants.RouteNames.Home, null);
         }
     }

src/IdentityManager2/Api/Controllers/PageController.cs

@@ -24,11 +24,6 @@ public RolesController(IIdentityManagerService service)
         {
             this.service = service ?? throw new ArgumentNullException(nameof(service));
         }
-        
-        public IActionResult MethodNotAllowed()
-        {
-            return StatusCode(405);
-        }
 
         private IdentityManagerMetadata metadata;
 
@@ -232,5 +227,10 @@ private void ValidateUpdateProperty(RoleMetadata roleMetadata, string type, stri
                 }
             }
         }
+
+        private IActionResult MethodNotAllowed()
+        {
+            return StatusCode(405);
+        }
     }
 }

src/IdentityManager2/Api/Controllers/RolesController.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -32,11 +32,6 @@ public UsersController(IIdentityManagerService service, IUrlHelperFactory urlHel
             this.actionContextAccessor = actionContextAccessor ?? throw new ArgumentNullException(nameof(actionContextAccessor));
         }
 
-        public IActionResult MethodNotAllowed()
-        {
-            return StatusCode(405);
-        }
-
         public async Task<IdentityManagerMetadata> GetMetadataAsync()
         {
             if (metadata == null)
@@ -351,5 +346,10 @@ private void ValidateUpdateProperty(UserMetadata userMetadata, string type, stri
                 }
             }
         }
+
+        private IActionResult MethodNotAllowed()
+        {
+            return StatusCode(405);
+        }
     }
 }

src/IdentityManager2/Api/Controllers/UsersController.cs

@@ -58,5 +58,4 @@ private static IDictionary<string, object> Map(object values)
             return dictionary;
         }
     }
-}
-
+}

src/IdentityManager2/Assets/AssetManager.cs

@@ -7,7 +7,8 @@
 
 namespace IdentityManager2.Assets
 {
-    internal class EmbeddedHtmlResult : IActionResult
+    // TODO: internal
+    public class EmbeddedHtmlResult : IActionResult
     {
         private readonly string path;
         private readonly string file;