PasskeyOptions -> IdentityPasskeyOptions

Author: MackinnonBuck

src/Identity/Core/src/PasskeyOptions.cs renamed to src/Identity/Core/src/IdentityPasskeyOptions.cs

@@ -6,7 +6,7 @@ namespace Microsoft.AspNetCore.Identity;
 /// <summary>
 /// Specifies options for passkey requirements.
 /// </summary>
-public class PasskeyOptions
+public class IdentityPasskeyOptions
 {
     /// <summary>
     /// Gets or sets the time that the browser should wait for the authenticator to provide a passkey.

src/Identity/Core/src/PasskeyHandler.cs

@@ -18,14 +18,14 @@ public sealed class PasskeyHandler<TUser> : IPasskeyHandler<TUser>
     where TUser : class
 {
     private readonly UserManager<TUser> _userManager;
-    private readonly PasskeyOptions _options;
+    private readonly IdentityPasskeyOptions _options;
 
     /// <summary>
     /// 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 PasskeyHandler(UserManager<TUser> userManager, IOptions<PasskeyOptions> options)
+    public PasskeyHandler(UserManager<TUser> userManager, IOptions<IdentityPasskeyOptions> options)
     {
         ArgumentNullException.ThrowIfNull(userManager);
         ArgumentNullException.ThrowIfNull(options);

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

@@ -1,4 +1,26 @@
 #nullable enable
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.AttestationConveyancePreference.get -> string?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.AttestationConveyancePreference.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.AuthenticatorAttachment.get -> string?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.AuthenticatorAttachment.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.AuthenticatorTimeout.get -> System.TimeSpan
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.AuthenticatorTimeout.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ChallengeSize.get -> int
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ChallengeSize.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.IdentityPasskeyOptions() -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.IsAllowedAlgorithm.get -> System.Func<int, bool>?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.IsAllowedAlgorithm.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ResidentKeyRequirement.get -> string?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ResidentKeyRequirement.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ServerDomain.get -> string?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ServerDomain.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.UserVerificationRequirement.get -> string?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.UserVerificationRequirement.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ValidateOrigin.get -> System.Func<Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext!, System.Threading.Tasks.ValueTask<bool>>?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ValidateOrigin.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.VerifyAttestationStatement.get -> System.Func<Microsoft.AspNetCore.Identity.PasskeyAttestationStatementVerificationContext!, System.Threading.Tasks.ValueTask<bool>>?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.VerifyAttestationStatement.set -> void
 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!>!
@@ -51,31 +73,9 @@ Microsoft.AspNetCore.Identity.PasskeyException.PasskeyException(string! message,
 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>.PasskeyHandler(Microsoft.AspNetCore.Identity.UserManager<TUser!>! userManager, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Identity.IdentityPasskeyOptions!>! 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
-Microsoft.AspNetCore.Identity.PasskeyOptions.AuthenticatorAttachment.get -> string?
-Microsoft.AspNetCore.Identity.PasskeyOptions.AuthenticatorAttachment.set -> void
-Microsoft.AspNetCore.Identity.PasskeyOptions.AuthenticatorTimeout.get -> System.TimeSpan
-Microsoft.AspNetCore.Identity.PasskeyOptions.AuthenticatorTimeout.set -> void
-Microsoft.AspNetCore.Identity.PasskeyOptions.ChallengeSize.get -> int
-Microsoft.AspNetCore.Identity.PasskeyOptions.ChallengeSize.set -> void
-Microsoft.AspNetCore.Identity.PasskeyOptions.IsAllowedAlgorithm.get -> System.Func<int, bool>?
-Microsoft.AspNetCore.Identity.PasskeyOptions.IsAllowedAlgorithm.set -> void
-Microsoft.AspNetCore.Identity.PasskeyOptions.PasskeyOptions() -> void
-Microsoft.AspNetCore.Identity.PasskeyOptions.ResidentKeyRequirement.get -> string?
-Microsoft.AspNetCore.Identity.PasskeyOptions.ResidentKeyRequirement.set -> void
-Microsoft.AspNetCore.Identity.PasskeyOptions.ServerDomain.get -> string?
-Microsoft.AspNetCore.Identity.PasskeyOptions.ServerDomain.set -> void
-Microsoft.AspNetCore.Identity.PasskeyOptions.UserVerificationRequirement.get -> string?
-Microsoft.AspNetCore.Identity.PasskeyOptions.UserVerificationRequirement.set -> void
-Microsoft.AspNetCore.Identity.PasskeyOptions.ValidateOrigin.get -> System.Func<Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext!, System.Threading.Tasks.ValueTask<bool>>?
-Microsoft.AspNetCore.Identity.PasskeyOptions.ValidateOrigin.set -> void
-Microsoft.AspNetCore.Identity.PasskeyOptions.VerifyAttestationStatement.get -> System.Func<Microsoft.AspNetCore.Identity.PasskeyAttestationStatementVerificationContext!, System.Threading.Tasks.ValueTask<bool>>?
-Microsoft.AspNetCore.Identity.PasskeyOptions.VerifyAttestationStatement.set -> void
 Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext
 Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext.CrossOrigin.get -> bool
 Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext.CrossOrigin.init -> void

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

@@ -246,8 +246,8 @@ static ValueTask<bool> ValidateOriginAsync(PasskeyOriginValidationContext contex
     return ValueTask.FromResult(uri.Host == "localhost" && uri.Port == 7020);
 }
 
-static IOptions<PasskeyOptions> GetPasskeyOptionsFromCreationRequest(ServerPublicKeyCredentialCreationOptionsRequest request)
-    => Options.Create(new PasskeyOptions()
+static IOptions<IdentityPasskeyOptions> GetPasskeyOptionsFromCreationRequest(ServerPublicKeyCredentialCreationOptionsRequest request)
+    => Options.Create(new IdentityPasskeyOptions()
     {
         ValidateOrigin = ValidateOriginAsync,
         AttestationConveyancePreference = request.Attestation,
@@ -256,8 +256,8 @@ static IOptions<PasskeyOptions> GetPasskeyOptionsFromCreationRequest(ServerPubli
         UserVerificationRequirement = request.AuthenticatorSelection?.UserVerification,
     });
 
-static IOptions<PasskeyOptions> GetPasskeyOptionsFromGetRequest(ServerPublicKeyCredentialGetOptionsRequest request)
-    => Options.Create(new PasskeyOptions()
+static IOptions<IdentityPasskeyOptions> GetPasskeyOptionsFromGetRequest(ServerPublicKeyCredentialGetOptionsRequest request)
+    => Options.Create(new IdentityPasskeyOptions()
     {
         ValidateOrigin = ValidateOriginAsync,
         UserVerificationRequirement = request.UserVerification,

src/Identity/test/Identity.Test/PasskeyOptionsTest.cs renamed to src/Identity/test/Identity.Test/IdentityPasskeyOptionsTest.cs

@@ -3,12 +3,12 @@
 
 namespace Microsoft.AspNetCore.Identity.Test;
 
-public class PasskeyOptionsTest
+public class IdentityPasskeyOptionsTest
 {
     [Fact]
     public void VerifyDefaultOptions()
     {
-        var options = new PasskeyOptions();
+        var options = new IdentityPasskeyOptions();
 
         Assert.Equal(TimeSpan.FromMinutes(5), options.AuthenticatorTimeout);
         Assert.Equal(32, options.ChallengeSize);

src/Identity/test/Identity.Test/Passkeys/PasskeyHandlerAssertionTest.cs

@@ -980,7 +980,7 @@ private sealed class AssertionTest : PasskeyScenarioTest<PasskeyAssertionResult<
     {
         private static readonly byte[] _defaultCredentialId = [1, 2, 3, 4, 5, 6, 7, 8];
 
-        public PasskeyOptions PasskeyOptions { get; } = new();
+        public IdentityPasskeyOptions PasskeyOptions { get; } = new();
         public string Origin { get; set; } = "https://example.com";
         public PocoUser User { get; set; } = new()
         {

src/Identity/test/Identity.Test/Passkeys/PasskeyHandlerAttestationTest.cs

@@ -978,7 +978,7 @@ private sealed class AttestationTest : PasskeyScenarioTest<PasskeyAttestationRes
         private static readonly byte[] _defaultAaguid = new byte[16];
         private static readonly byte[] _defaultAttestationStatement = [0xA0]; // Empty CBOR map
 
-        public PasskeyOptions PasskeyOptions { get; } = new();
+        public IdentityPasskeyOptions PasskeyOptions { get; } = new();
         public string? UserId { get; set; } = "df0a3af4-bd65-440f-82bd-5b839e300dcd";
         public string? UserName { get; set; } = "johndoe";
         public string? UserDisplayName { get; set; } = "John Doe";