User more modern ASP.NET in Demo

Demo/ConformanceTestController.cs

@@ -40,7 +40,7 @@ public OkObjectResult MakeCredentialOptionsTest([FromBody] TEST_MakeCredentialPa
     {
         var attType = opts.Attestation;
 
-        var username = Array.Empty<byte>();
+        byte[] username = [];
 
         try
         {

Demo/ConformanceTesting.cs

@@ -16,11 +16,10 @@ public static IMetadataService MetadataServiceInstance(string cacheDir, string o
             {
                 if (_instance == null)
                 {
-                    var repos = new List<IMetadataRepository>
-                    {
+                    List<IMetadataRepository> repos = [
                         new ConformanceMetadataRepository(null, origin),
                         new FileSystemMetadataRepository(cacheDir)
-                    };
+                    ];
                     var simpleService = new ConformanceMetadataService(repos);
                     simpleService.InitializeAsync().Wait();
                     _instance = simpleService;

Demo/DemoController.cs

@@ -144,7 +144,7 @@ public ActionResult AssertionOptionsPost([FromForm] string username, [FromForm]
     {
         try
         {
-            var existingCredentials = new List<PublicKeyCredentialDescriptor>();
+            List<PublicKeyCredentialDescriptor> existingCredentials = [];
 
             if (!string.IsNullOrEmpty(username))
             {

Demo/UrlHelperExtensions.cs → Demo/Helpers/UrlHelperExtensions.cs

@@ -6,6 +6,6 @@ public static class UrlHelperExtensions
 {
     public static string ToGithub(this IUrlHelper url, string path)
     {
-        return "https://github.com/passwordless-lib/fido2-net-lib/blob/master/" + path;
+        return "https://github.com/passwordless-lib/fido2-net-lib/blob/main/" + path;
     }
 }

Demo/Pages/_options.cshtml.cs

@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Fido2Demo.Pages
+namespace Fido2Demo.Pages;
+
+public class _optionsModel : PageModel
 {
-    public class _optionsModel : PageModel
+    public void OnGet()
     {
-        public void OnGet()
-        {
-        }
     }
 }

Demo/Pages/custom.cshtml.cs

@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Fido2Demo
+namespace Fido2Demo;
+
+public class CustomModel : PageModel
 {
-    public class CustomModel : PageModel
+    public void OnGet()
     {
-        public void OnGet()
-        {
-        }
     }
 }

Demo/Pages/dashboard.cshtml.cs

@@ -1,14 +1,13 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Fido2Demo.Pages
+namespace Fido2Demo.Pages;
+
+public class dashboardModel : PageModel
 {
-    public class dashboardModel : PageModel
+    public void OnGet(string username)
     {
-        public void OnGet(string username)
-        {
-            this.Username = username;
-        }
-
-        public string Username { get; set; }
+        this.Username = username;
     }
+
+    public string Username { get; set; }
 }

Demo/Pages/mfa.cshtml.cs

@@ -1,15 +1,14 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Fido2Demo
+namespace Fido2Demo;
+
+public class MfaModel : PageModel
 {
-    public class MfaModel : PageModel
+    public void OnGet()
     {
-        public void OnGet()
-        {
-        }
+    }
 
-        public void OnPost()
-        {
-        }
+    public void OnPost()
+    {
     }
 }

Demo/Pages/overview.cshtml.cs

@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Fido2Demo
+namespace Fido2Demo;
+
+public class OverviewModel : PageModel
 {
-    public class OverviewModel : PageModel
+    public void OnGet()
     {
-        public void OnGet()
-        {
-        }
     }
 }

Demo/Pages/passwordless.cshtml.cs

@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Fido2Demo
+namespace Fido2Demo;
+
+public class PasswordLessModel : PageModel
 {
-    public class PasswordLessModel : PageModel
+    public void OnGet()
     {
-        public void OnGet()
-        {
-        }
     }
 }

Demo/Pages/usernameless.cshtml.cs

@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Fido2Demo
+namespace Fido2Demo;
+
+public class UsernameLessModel : PageModel
 {
-    public class UsernameLessModel : PageModel
+    public void OnGet()
     {
-        public void OnGet()
-        {
-        }
     }
 }

Demo/Program.cs

@@ -1,18 +1,74 @@
-namespace Fido2Demo;
+using Fido2Demo;
+using Fido2NetLib;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Rewrite;
 
-public class Program
+var builder = WebApplication.CreateBuilder(args);
+
+// Configure Services
+builder.Services.AddRazorPages(opts =>
 {
-    public static void Main(string[] args)
-    {
-        CreateHostBuilder(args).Build().Run();
-    }
+    // we don't care about antiforgery in the demo
+    opts.Conventions.ConfigureFilter(new IgnoreAntiforgeryTokenAttribute());
+});
+
+// Use the in-memory implementation of IDistributedCache.
+builder.Services.AddMemoryCache();
+builder.Services.AddDistributedMemoryCache();
+
+builder.Services.AddSession(options =>
+{
+    // Set a short timeout for easy testing.
+    options.IdleTimeout = TimeSpan.FromMinutes(2);
+    options.Cookie.HttpOnly = true;
+    // Strict SameSite mode is required because the default mode used
+    // by ASP.NET Core 3 isn't understood by the Conformance Tool
+    // and breaks conformance testing
+    options.Cookie.SameSite = SameSiteMode.Unspecified;
+});
 
-    public static IHostBuilder CreateHostBuilder(string[] args)
+builder.Services.AddFido2(options =>
+{
+    options.ServerDomain = builder.Configuration["fido2:serverDomain"];
+    options.ServerName = "FIDO2 Test";
+    options.Origins = builder.Configuration.GetSection("fido2:origins").Get<HashSet<string>>();
+
+    // Other options available:
+    options.TimestampDriftTolerance = builder.Configuration.GetValue<int>("fido2:timestampDriftTolerance");
+    options.MDSCacheDirPath = builder.Configuration["fido2:MDSCacheDirPath"];
+    options.BackupEligibleCredentialPolicy = builder.Configuration.GetValue<Fido2Configuration.CredentialBackupPolicy>("fido2:backupEligibleCredentialPolicy");
+    options.BackedUpCredentialPolicy = builder.Configuration.GetValue<Fido2Configuration.CredentialBackupPolicy>("fido2:backedUpCredentialPolicy");
+})
+.AddCachedMetadataService(config =>
+{
+    config.AddFidoMetadataRepository(httpClientBuilder =>
     {
-        return Host.CreateDefaultBuilder(args)
-                   .ConfigureWebHostDefaults(webBuilder =>
-                   {
-                       webBuilder.UseStartup<Startup>();
-                   });
-    }
+        //TODO: any specific config you want for accessing the MDS
+    });
+});
+
+var app = builder.Build();
+
+// Configure Pipeline
+if (app.Environment.IsDevelopment())
+{
+    app.UseDeveloperExceptionPage();
+}
+else
+{
+    app.UseExceptionHandler("/Error");
+    app.UseRewriter(new RewriteOptions().AddRedirectToWWwIfPasswordlessDomain());
 }
+
+// Enforce HTTPS redirection for all requests
+app.UseHttpsRedirection();
+
+app.UseSession();
+app.UseStaticFiles();
+app.UseRouting();
+
+app.MapFallbackToPage("/", "/overview");
+app.MapRazorPages();
+app.MapControllers();
+
+app.Run();