PR feedback

Author: MackinnonBuck

src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj

@@ -10,7 +10,6 @@
     <IsTrimmable>true</IsTrimmable>
     <EnableRequestDelegateGenerator>true</EnableRequestDelegateGenerator>
     <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.AspNetCore.Http.Generated</InterceptorsPreviewNamespaces>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>

src/Identity/Core/src/Passkeys/BufferSource.cs

@@ -122,7 +122,7 @@ public override int GetHashCode()
     /// <summary>
     /// Gets the UTF-8 string representation of the byte buffer.
     /// </summary>
-    public override unsafe string ToString()
+    public override string ToString()
     {
         var span = _bytes.Span;
 
@@ -131,9 +131,6 @@ public override unsafe string ToString()
             return string.Empty;
         }
 
-        fixed (byte* ptr = span)
-        {
-            return Encoding.UTF8.GetString(ptr, span.Length);
-        }
+        return Encoding.UTF8.GetString(span);
     }
 }

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs

@@ -71,9 +71,9 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
         accountGroup.MapPost("/PasskeyRequestOptions", async (
             [FromServices] UserManager<ApplicationUser> userManager,
             [FromServices] SignInManager<ApplicationUser> signInManager,
-            [FromQuery] string? email) =>
+            [FromQuery] string? username) =>
         {
-            var user = string.IsNullOrEmpty(email) ? null : await userManager.FindByEmailAsync(email);
+            var user = string.IsNullOrEmpty(username) ? null : await userManager.FindByNameAsync(username);
             var passkeyRequestArgs = new PasskeyRequestArgs<ApplicationUser>
             {
                 User = user,

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/BlazorWeb-CSharp.lib.module.js

@@ -21,7 +21,7 @@ async function createCredential() {
 }
 
 async function requestCredential(email) {
-    const optionsResponse = await fetchWithErrorHandling(`/Account/PasskeyRequestOptions?email=${email}`, {
+    const optionsResponse = await fetchWithErrorHandling(`/Account/PasskeyRequestOptions?username=${email}`, {
         method: 'POST',
     });
     const optionsJson = await optionsResponse.json();

src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorTemplateTest.cs

@@ -136,7 +136,7 @@ await Task.WhenAll(
             await IncrementCounterAsync(page);
         }
 
-        if (authenticationFeatures.HasFlag(AuthenticationFeatures.Basic))
+        if (authenticationFeatures.HasFlag(AuthenticationFeatures.RegisterAndLogIn))
         {
             await Task.WhenAll(
                 page.WaitForURLAsync("**/Account/Login**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
@@ -214,7 +214,7 @@ await Task.WhenAll(
                 await page.ClickAsync("text=Add a new passkey");
 
                 await page.WaitForSelectorAsync("text=Enter a name for your passkey");
-                await page.FillAsync("[name=\"RenameInput.DisplayName\"]", "My passkey");
+                await page.FillAsync("[name=\"Input.Name\"]", "My passkey");
                 await page.ClickAsync("text=Continue");
 
                 await page.WaitForSelectorAsync("text=Passkey updated successfully");
@@ -300,7 +300,7 @@ protected enum BlazorTemplatePages
     protected enum AuthenticationFeatures
     {
         None = 0,
-        Basic = 1,
+        RegisterAndLogIn = 1,
         Passkeys = 2,
     }
 }

src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWebTemplateTest.cs

@@ -2,10 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
 using Microsoft.AspNetCore.BrowserTesting;
-using Microsoft.AspNetCore.InternalTesting;
 using Templates.Test.Helpers;
 
 namespace BlazorTemplates.Tests;
@@ -20,8 +17,7 @@ public class BlazorWebTemplateTest(ProjectFactoryFixture projectFactory) : Blazo
     [InlineData(BrowserKind.Chromium, "WebAssembly")]
     [InlineData(BrowserKind.Chromium, "Auto")]
     [InlineData(BrowserKind.Chromium, "None", "Individual")]
-    [InlineData(BrowserKind.Chromium, "None", "Individual", true)]
-    public async Task BlazorWebTemplate_Works(BrowserKind browserKind, string interactivityOption, string authOption = "None", bool testPasskeys = false)
+    public async Task BlazorWebTemplate_Works(BrowserKind browserKind, string interactivityOption, string authOption = "None")
     {
         var project = await CreateBuildPublishAsync(
             args: ["-int", interactivityOption, "-au", authOption],
@@ -32,16 +28,42 @@ public async Task BlazorWebTemplate_Works(BrowserKind browserKind, string intera
             ? BlazorTemplatePages.Counter
             : BlazorTemplatePages.None;
 
-        var authenticationFeatures = AuthenticationFeatures.None;
-        if (authOption is not "None")
-        {
-            authenticationFeatures |= AuthenticationFeatures.Basic;
-        }
-        if (testPasskeys)
+        var authenticationFeatures = authOption is "None"
+            ? AuthenticationFeatures.None
+            : AuthenticationFeatures.RegisterAndLogIn;
+
+        await TestProjectCoreAsync(project, browserKind, pagesToExclude, authenticationFeatures);
+
+        bool HasClientProject()
+            => interactivityOption is "WebAssembly" or "Auto";
+
+        Project GetTargetProject(Project rootProject)
         {
-            authenticationFeatures |= AuthenticationFeatures.Passkeys;
+            if (HasClientProject())
+            {
+                // Multiple projects were created, so we need to specifically select the server
+                // project to be used
+                return GetSubProject(rootProject, rootProject.ProjectName, rootProject.ProjectName);
+            }
+
+            // In other cases, just use the root project
+            return rootProject;
         }
+    }
+
+    [Theory]
+    [InlineData(BrowserKind.Chromium)]
+    public async Task BlazorWebTemplate_CanUsePasskeys(BrowserKind browserKind)
+    {
+        var project = await CreateBuildPublishAsync(args: ["-int", "None", "-au", "Individual"]);
+        var pagesToExclude = BlazorTemplatePages.Counter;
+        var authenticationFeatures = AuthenticationFeatures.RegisterAndLogIn | AuthenticationFeatures.Passkeys;
+
+        await TestProjectCoreAsync(project, browserKind, pagesToExclude, authenticationFeatures);
+    }
 
+    private async Task TestProjectCoreAsync(Project project, BrowserKind browserKind, BlazorTemplatePages pagesToExclude, AuthenticationFeatures authenticationFeatures)
+    {
         var appName = project.ProjectName;
 
         // Test the built project
@@ -65,21 +87,5 @@ public async Task BlazorWebTemplate_Works(BrowserKind browserKind, string intera
             await aspNetProcess.AssertStatusCode("/", HttpStatusCode.OK, "text/html");
             await TestBasicInteractionInNewPageAsync(browserKind, aspNetProcess.ListeningUri.AbsoluteUri, appName, pagesToExclude, authenticationFeatures);
         }
-
-        bool HasClientProject()
-            => interactivityOption is "WebAssembly" or "Auto";
-
-        Project GetTargetProject(Project rootProject)
-        {
-            if (HasClientProject())
-            {
-                // Multiple projects were created, so we need to specifically select the server
-                // project to be used
-                return GetSubProject(rootProject, rootProject.ProjectName, rootProject.ProjectName);
-            }
-
-            // In other cases, just use the root project
-            return rootProject;
-        }
     }
 }