Add metrics to passkey methods

Author: JamesNK

src/Identity/Core/src/SignInManager.cs

@@ -612,6 +612,22 @@ private void ThrowIfNoPasskeyHandler()
     /// for the sign-in attempt.
     /// </returns>
     public virtual async Task<SignInResult> PasskeySignInAsync(string credentialJson, PasskeyRequestOptions options)
+    {
+        try
+        {
+            var result = await PasskeySignInCoreAsync(credentialJson, options);
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result, SignInType.Passkey, isPersistent: false);
+
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result: null, SignInType.Passkey, isPersistent: false, ex);
+            throw;
+        }
+    }
+
+    private async Task<SignInResult> PasskeySignInCoreAsync(string credentialJson, PasskeyRequestOptions options)
     {
         ArgumentException.ThrowIfNullOrEmpty(credentialJson);
 

src/Identity/Core/src/SignInManagerMetrics.cs

@@ -165,6 +165,7 @@ private static string GetSignInType(SignInType signInType)
             SignInType.TwoFactorAuthenticator => "two_factor_authenticator",
             SignInType.TwoFactor => "two_factor",
             SignInType.External => "external",
+            SignInType.Passkey => "passkey",
             _ => "_UNKNOWN"
         };
     }
@@ -188,5 +189,6 @@ internal enum SignInType
     TwoFactorRecoveryCode,
     TwoFactorAuthenticator,
     TwoFactor,
-    External
+    External,
+    Passkey
 }

src/Identity/Extensions.Core/src/UserManager.cs

@@ -2558,6 +2558,21 @@ public virtual Task<int> CountRecoveryCodesAsync(TUser user)
     /// <param name="passkey">The passkey to add or update.</param>
     /// <returns>Whether the passkey was successfully set.</returns>
     public virtual async Task<IdentityResult> SetPasskeyAsync(TUser user, UserPasskeyInfo passkey)
+    {
+        try
+        {
+            var result = await SetPasskeyCoreAsync(user, passkey).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.SetPasskey);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.SetPasskey, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> SetPasskeyCoreAsync(TUser user, UserPasskeyInfo passkey)
     {
         ThrowIfDisposed();
         var passkeyStore = GetUserPasskeyStore();
@@ -2628,6 +2643,21 @@ public virtual Task<IList<UserPasskeyInfo>> GetPasskeysAsync(TUser user)
     /// of the operation.
     /// </returns>
     public virtual async Task<IdentityResult> RemovePasskeyAsync(TUser user, byte[] credentialId)
+    {
+        try
+        {
+            var result = await RemovePasskeyCoreAsync(user, credentialId).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.RemovePasskey);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.RemovePasskey, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> RemovePasskeyCoreAsync(TUser user, byte[] credentialId)
     {
         ThrowIfDisposed();
         var passkeyStore = GetUserPasskeyStore();

src/Identity/Extensions.Core/src/UserManagerMetrics.cs

@@ -239,6 +239,10 @@ private static string GetUpdateType(UserUpdateType updateType)
             UserUpdateType.SetAuthenticationToken => "set_authentication_token",
             UserUpdateType.RemoveAuthenticationToken => "remove_authentication_token",
             UserUpdateType.ResetAuthenticatorKey => "reset_authenticator_key",
+            UserUpdateType.GenerateNewTwoFactorRecoveryCodes => "generate_new_two_factor_recovery_codes",
+            UserUpdateType.RedeemTwoFactorRecoveryCode => "redeem_two_factor_recovery_code",
+            UserUpdateType.SetPasskey => "set_passkey",
+            UserUpdateType.RemovePasskey => "remove_passkey",
             _ => "_UNKNOWN"
         };
     }
@@ -281,4 +285,6 @@ internal enum UserUpdateType
     ResetAuthenticatorKey,
     GenerateNewTwoFactorRecoveryCodes,
     RedeemTwoFactorRecoveryCode,
+    SetPasskey,
+    RemovePasskey
 }

src/Identity/Identity.slnf

@@ -3,7 +3,10 @@
     "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
+      "src\\Components\\Authorization\\src\\Microsoft.AspNetCore.Components.Authorization.csproj",
       "src\\Components\\Components\\src\\Microsoft.AspNetCore.Components.csproj",
+      "src\\Components\\Endpoints\\src\\Microsoft.AspNetCore.Components.Endpoints.csproj",
+      "src\\Components\\Forms\\src\\Microsoft.AspNetCore.Components.Forms.csproj",
       "src\\Components\\Web\\src\\Microsoft.AspNetCore.Components.Web.csproj",
       "src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
       "src\\DataProtection\\Cryptography.Internal\\src\\Microsoft.AspNetCore.Cryptography.Internal.csproj",
@@ -13,6 +16,8 @@
       "src\\DefaultBuilder\\src\\Microsoft.AspNetCore.csproj",
       "src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
       "src\\Features\\JsonPatch\\src\\Microsoft.AspNetCore.JsonPatch.csproj",
+      "src\\FileProviders\\Embedded\\src\\Microsoft.Extensions.FileProviders.Embedded.csproj",
+      "src\\FileProviders\\Manifest.MSBuildTask\\src\\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj",
       "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
       "src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
       "src\\Hosting\\Server.Abstractions\\src\\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj",
@@ -48,7 +53,9 @@
       "src\\Identity\\test\\Identity.Test\\Microsoft.AspNetCore.Identity.Test.csproj",
       "src\\Identity\\test\\InMemory.Test\\Microsoft.AspNetCore.Identity.InMemory.Test.csproj",
       "src\\Identity\\testassets\\Identity.DefaultUI.WebSite\\Identity.DefaultUI.WebSite.csproj",
+      "src\\JSInterop\\Microsoft.JSInterop\\src\\Microsoft.JSInterop.csproj",
       "src\\Localization\\Abstractions\\src\\Microsoft.Extensions.Localization.Abstractions.csproj",
+      "src\\Localization\\Localization\\src\\Microsoft.Extensions.Localization.csproj",
       "src\\Middleware\\CORS\\src\\Microsoft.AspNetCore.Cors.csproj",
       "src\\Middleware\\Diagnostics.Abstractions\\src\\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj",
       "src\\Middleware\\Diagnostics.EntityFrameworkCore\\src\\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj",
@@ -57,6 +64,7 @@
       "src\\Middleware\\HttpOverrides\\src\\Microsoft.AspNetCore.HttpOverrides.csproj",
       "src\\Middleware\\HttpsPolicy\\src\\Microsoft.AspNetCore.HttpsPolicy.csproj",
       "src\\Middleware\\Localization\\src\\Microsoft.AspNetCore.Localization.csproj",
+      "src\\Middleware\\OutputCaching\\src\\Microsoft.AspNetCore.OutputCaching.csproj",
       "src\\Middleware\\ResponseCaching.Abstractions\\src\\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj",
       "src\\Middleware\\Rewrite\\src\\Microsoft.AspNetCore.Rewrite.csproj",
       "src\\Middleware\\StaticFiles\\src\\Microsoft.AspNetCore.StaticFiles.csproj",
@@ -66,6 +74,7 @@
       "src\\Mvc\\Mvc.Core\\src\\Microsoft.AspNetCore.Mvc.Core.csproj",
       "src\\Mvc\\Mvc.Cors\\src\\Microsoft.AspNetCore.Mvc.Cors.csproj",
       "src\\Mvc\\Mvc.DataAnnotations\\src\\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj",
+      "src\\Mvc\\Mvc.Formatters.Json\\src\\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj",
       "src\\Mvc\\Mvc.Localization\\src\\Microsoft.AspNetCore.Mvc.Localization.csproj",
       "src\\Mvc\\Mvc.NewtonsoftJson\\src\\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj",
       "src\\Mvc\\Mvc.RazorPages\\src\\Microsoft.AspNetCore.Mvc.RazorPages.csproj",
@@ -102,7 +111,9 @@
       "src\\Servers\\Kestrel\\Transport.NamedPipes\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.csproj",
       "src\\Servers\\Kestrel\\Transport.Quic\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj",
       "src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj",
+      "src\\StaticAssets\\src\\Microsoft.AspNetCore.StaticAssets.csproj",
       "src\\Testing\\src\\Microsoft.AspNetCore.InternalTesting.csproj",
+      "src\\Validation\\src\\Microsoft.Extensions.Validation.csproj",
       "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
     ]
   }

src/Identity/test/Identity.Test/SignInManagerTest.cs

@@ -426,14 +426,18 @@ public async Task ExternalSignInRequiresVerificationIfNotBypassed(bool bypass)
     public async Task CanPasskeySignIn()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var authenticate = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.AuthenticateCounterName);
+        using var signInUserPrincipal = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.SignInUserPrincipalCounterName);
+
         var user = new PocoUser { UserName = "Foo" };
         var passkey = new UserPasskeyInfo(null, null, null, default, 0, null, false, false, false, null, null);
         var assertionResult = PasskeyAssertionResult.Success(passkey, user);
         var passkeyHandler = new Mock<IPasskeyHandler<PocoUser>>();
         passkeyHandler
             .Setup(h => h.PerformAssertionAsync(It.IsAny<PasskeyAssertionContext<PocoUser>>()))
             .Returns(Task.FromResult(assertionResult));
-        var manager = SetupUserManager(user);
+        var manager = SetupUserManager(user, meterFactory: testMeterFactory);
         manager
             .Setup(m => m.SetPasskeyAsync(user, passkey))
             .Returns(Task.FromResult(IdentityResult.Success))
@@ -452,6 +456,22 @@ public async Task CanPasskeySignIn()
         Assert.Same(SignInResult.Success, signInResult);
         manager.Verify();
         auth.Verify();
+
+        Assert.Collection(authenticate.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.authentication_scheme", "Identity.Application"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.type", "passkey"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.is_persistent", false),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.result", "success"),
+            ]));
+        Assert.Collection(signInUserPrincipal.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.authentication_scheme", "Identity.Application"),
+            ]));
     }
 
     private class GoodTokenProvider : AuthenticatorTokenProvider<PocoUser>