DefaultPasskeyHandler -> PasskeyHandler

Author: MackinnonBuck

src/Identity/Core/src/IdentityBuilderExtensions.cs

@@ -41,7 +41,7 @@ public static IdentityBuilder AddDefaultTokenProviders(this IdentityBuilder buil
     private static void AddSignInManagerDeps(this IdentityBuilder builder)
     {
         builder.Services.AddHttpContextAccessor();
-        builder.Services.AddScoped(typeof(IPasskeyHandler<>).MakeGenericType(builder.UserType), typeof(DefaultPasskeyHandler<>).MakeGenericType(builder.UserType));
+        builder.Services.AddScoped(typeof(IPasskeyHandler<>).MakeGenericType(builder.UserType), typeof(PasskeyHandler<>).MakeGenericType(builder.UserType));
         builder.Services.AddScoped(typeof(ISecurityStampValidator), typeof(SecurityStampValidator<>).MakeGenericType(builder.UserType));
         builder.Services.AddScoped(typeof(ITwoFactorSecurityStampValidator), typeof(TwoFactorSecurityStampValidator<>).MakeGenericType(builder.UserType));
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<SecurityStampValidatorOptions>, PostConfigureSecurityStampValidatorOptions>());

src/Identity/Core/src/IdentityServiceCollectionExtensions.cs

@@ -102,7 +102,7 @@ public static class IdentityServiceCollectionExtensions
         services.TryAddScoped<ITwoFactorSecurityStampValidator, TwoFactorSecurityStampValidator<TUser>>();
         services.TryAddScoped<IUserClaimsPrincipalFactory<TUser>, UserClaimsPrincipalFactory<TUser, TRole>>();
         services.TryAddScoped<IUserConfirmation<TUser>, DefaultUserConfirmation<TUser>>();
-        services.TryAddScoped<IPasskeyHandler<TUser>, DefaultPasskeyHandler<TUser>>();
+        services.TryAddScoped<IPasskeyHandler<TUser>, PasskeyHandler<TUser>>();
         services.TryAddScoped<UserManager<TUser>>();
         services.TryAddScoped<SignInManager<TUser>>();
         services.TryAddScoped<RoleManager<TRole>>();

src/Identity/Core/src/DefaultPasskeyHandler.cs renamed to src/Identity/Core/src/PasskeyHandler.cs

@@ -14,18 +14,18 @@ namespace Microsoft.AspNetCore.Identity;
 /// <summary>
 /// The default passkey handler.
 /// </summary>
-public sealed class DefaultPasskeyHandler<TUser> : IPasskeyHandler<TUser>
+public sealed class PasskeyHandler<TUser> : IPasskeyHandler<TUser>
     where TUser : class
 {
     private readonly UserManager<TUser> _userManager;
     private readonly PasskeyOptions _options;
 
     /// <summary>
-    /// Constructs a new <see cref="DefaultPasskeyHandler{TUser}"/> instance.
+    /// Constructs a new <see cref="PasskeyHandler{TUser}"/> instance.
     /// </summary>
     /// <param name="userManager">The <see cref="UserManager{TUser}"/>.</param>
     /// <param name="options">The <see cref="IdentityOptions"/>.</param>
-    public DefaultPasskeyHandler(UserManager<TUser> userManager, IOptions<PasskeyOptions> options)
+    public PasskeyHandler(UserManager<TUser> userManager, IOptions<PasskeyOptions> options)
     {
         ArgumentNullException.ThrowIfNull(userManager);
         ArgumentNullException.ThrowIfNull(options);

src/Identity/Core/src/PublicAPI.Unshipped.txt

@@ -1,10 +1,4 @@
 #nullable enable
-Microsoft.AspNetCore.Identity.DefaultPasskeyHandler<TUser>
-Microsoft.AspNetCore.Identity.DefaultPasskeyHandler<TUser>.DefaultPasskeyHandler(Microsoft.AspNetCore.Identity.UserManager<TUser!>! userManager, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Identity.PasskeyOptions!>! options) -> void
-Microsoft.AspNetCore.Identity.DefaultPasskeyHandler<TUser>.MakeCreationOptionsAsync(Microsoft.AspNetCore.Identity.PasskeyUserEntity! userEntity, Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyCreationOptionsResult!>!
-Microsoft.AspNetCore.Identity.DefaultPasskeyHandler<TUser>.MakeRequestOptionsAsync(TUser? user, Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyRequestOptionsResult!>!
-Microsoft.AspNetCore.Identity.DefaultPasskeyHandler<TUser>.PerformAssertionAsync(Microsoft.AspNetCore.Identity.PasskeyAssertionContext! context) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyAssertionResult<TUser!>!>!
-Microsoft.AspNetCore.Identity.DefaultPasskeyHandler<TUser>.PerformAttestationAsync(Microsoft.AspNetCore.Identity.PasskeyAttestationContext! context) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyAttestationResult!>!
 Microsoft.AspNetCore.Identity.IPasskeyHandler<TUser>
 Microsoft.AspNetCore.Identity.IPasskeyHandler<TUser>.MakeCreationOptionsAsync(Microsoft.AspNetCore.Identity.PasskeyUserEntity! userEntity, Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyCreationOptionsResult!>!
 Microsoft.AspNetCore.Identity.IPasskeyHandler<TUser>.MakeRequestOptionsAsync(TUser? user, Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyRequestOptionsResult!>!
@@ -54,6 +48,12 @@ Microsoft.AspNetCore.Identity.PasskeyCreationOptionsResult.PasskeyCreationOption
 Microsoft.AspNetCore.Identity.PasskeyException
 Microsoft.AspNetCore.Identity.PasskeyException.PasskeyException(string! message) -> void
 Microsoft.AspNetCore.Identity.PasskeyException.PasskeyException(string! message, System.Exception? innerException) -> void
+Microsoft.AspNetCore.Identity.PasskeyHandler<TUser>
+Microsoft.AspNetCore.Identity.PasskeyHandler<TUser>.MakeCreationOptionsAsync(Microsoft.AspNetCore.Identity.PasskeyUserEntity! userEntity, Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyCreationOptionsResult!>!
+Microsoft.AspNetCore.Identity.PasskeyHandler<TUser>.MakeRequestOptionsAsync(TUser? user, Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyRequestOptionsResult!>!
+Microsoft.AspNetCore.Identity.PasskeyHandler<TUser>.PasskeyHandler(Microsoft.AspNetCore.Identity.UserManager<TUser!>! userManager, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Identity.PasskeyOptions!>! options) -> void
+Microsoft.AspNetCore.Identity.PasskeyHandler<TUser>.PerformAssertionAsync(Microsoft.AspNetCore.Identity.PasskeyAssertionContext! context) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyAssertionResult<TUser!>!>!
+Microsoft.AspNetCore.Identity.PasskeyHandler<TUser>.PerformAttestationAsync(Microsoft.AspNetCore.Identity.PasskeyAttestationContext! context) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyAttestationResult!>!
 Microsoft.AspNetCore.Identity.PasskeyOptions
 Microsoft.AspNetCore.Identity.PasskeyOptions.AttestationConveyancePreference.get -> string?
 Microsoft.AspNetCore.Identity.PasskeyOptions.AttestationConveyancePreference.set -> void

src/Identity/samples/IdentitySample.PasskeyConformance/Program.cs

@@ -60,7 +60,7 @@
         Name = request.Username,
         DisplayName = request.DisplayName
     };
-    var passkeyHandler = new DefaultPasskeyHandler<PocoUser>(userManager, passkeyOptions);
+    var passkeyHandler = new PasskeyHandler<PocoUser>(userManager, passkeyOptions);
     var result = await passkeyHandler.MakeCreationOptionsAsync(userEntity, context);
     var response = new ServerPublicKeyCredentialOptionsResponse(result.CreationOptionsJson);
     var state = new PasskeyAttestationState
@@ -94,7 +94,7 @@
     }
 
     var passkeyOptions = GetPasskeyOptionsFromCreationRequest(state.Request);
-    var passkeyHandler = new DefaultPasskeyHandler<PocoUser>(userManager, passkeyOptions);
+    var passkeyHandler = new PasskeyHandler<PocoUser>(userManager, passkeyOptions);
 
     var attestationResult = await passkeyHandler.PerformAttestationAsync(new()
     {
@@ -148,7 +148,7 @@
     }
 
     var passkeyOptions = GetPasskeyOptionsFromGetRequest(request);
-    var passkeyHandler = new DefaultPasskeyHandler<PocoUser>(userManager, passkeyOptions);
+    var passkeyHandler = new PasskeyHandler<PocoUser>(userManager, passkeyOptions);
 
     var result = await passkeyHandler.MakeRequestOptionsAsync(user, context);
     var response = new ServerPublicKeyCredentialOptionsResponse(result.RequestOptionsJson);
@@ -181,7 +181,7 @@
     }
 
     var passkeyOptions = GetPasskeyOptionsFromGetRequest(state.Request);
-    var passkeyHandler = new DefaultPasskeyHandler<PocoUser>(userManager, passkeyOptions);
+    var passkeyHandler = new PasskeyHandler<PocoUser>(userManager, passkeyOptions);
 
     var assertionResult = await passkeyHandler.PerformAssertionAsync(new()
     {

src/Identity/test/Identity.Test/Passkeys/DefaultPasskeyHandlerAssertionTest.cs renamed to src/Identity/test/Identity.Test/Passkeys/PasskeyHandlerAssertionTest.cs

@@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Identity.Test;
 using static JsonHelpers;
 using static CredentialHelpers;
 
-public class DefaultPasskeyHandlerAssertionTest
+public class PasskeyHandlerAssertionTest
 {
     [Fact]
     public async Task CanSucceed()
@@ -1044,7 +1044,7 @@ protected override async Task<PasskeyAssertionResult<PocoUser>> RunCoreAsync()
             }
 
             var passkeyOptions = Options.Create(PasskeyOptions);
-            var handler = new DefaultPasskeyHandler<PocoUser>(userManager.Object, passkeyOptions);
+            var handler = new PasskeyHandler<PocoUser>(userManager.Object, passkeyOptions);
 
             var requestOptionsResult = await handler.MakeRequestOptionsAsync(
                 IsUserIdentified ? User : null,

src/Identity/test/Identity.Test/Passkeys/DefaultPasskeyHandlerAttestationTest.cs renamed to src/Identity/test/Identity.Test/Passkeys/PasskeyHandlerAttestationTest.cs

@@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Identity.Test;
 using static JsonHelpers;
 using static CredentialHelpers;
 
-public class DefaultPasskeyHandlerAttestationTest
+public class PasskeyHandlerAttestationTest
 {
     [Fact]
     public async Task CanSucceed()
@@ -1020,7 +1020,7 @@ protected override async Task<PasskeyAttestationResult> RunCoreAsync()
             }
 
             var passkeyOptions = Options.Create(PasskeyOptions);
-            var handler = new DefaultPasskeyHandler<PocoUser>(userManager.Object, passkeyOptions);
+            var handler = new PasskeyHandler<PocoUser>(userManager.Object, passkeyOptions);
             var userEntity = new PasskeyUserEntity()
             {
                 Id = UserId!,