Use MSAL's recent UserFIC API for agentic flows

src/Microsoft.Identity.Web.AgentIdentities/AgentIdentitiesExtension.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Identity.Abstractions;
-using Microsoft.Identity.Web.AgentIdentities;
 
 namespace Microsoft.Identity.Web
 {
@@ -26,12 +25,6 @@ public static IServiceCollection AddAgentIdentities(this IServiceCollection serv
             // Register the OidcFic services for agent applications to work.
             services.AddOidcFic();
 
-            // Register a callback to process the agent user identity before acquiring a token.
-            services.Configure<TokenAcquisitionExtensionOptions>(options =>
-            {
-                options.OnBeforeTokenAcquisitionForTestUserAsync += AgentUserIdentityMsalAddIn.OnBeforeUserFicForAgentUserIdentityAsync;
-            });
-
             return services;
         }
 

src/Microsoft.Identity.Web.TokenAcquisition/LoggingEventId.cs

@@ -38,6 +38,14 @@ internal static class LoggingEventId
         public static readonly EventId AuthorityIgnored = new EventId(500, "AuthorityIgnored");
         public static readonly EventId AuthorityUsedConsiderInstanceTenantId = new EventId(501, "AuthorityUsedConsiderInstanceTenantId");
 
+        // Agent User FIC EventIds 600+
+        public static readonly EventId AgentUserFicFlowDetected = new EventId(600, "AgentUserFicFlowDetected");
+        public static readonly EventId AgentUserFicSilentSuccess = new EventId(601, "AgentUserFicSilentSuccess");
+        public static readonly EventId AgentUserFicSilentFailure = new EventId(602, "AgentUserFicSilentFailure");
+        public static readonly EventId AgentUserFicAcquisitionComplete = new EventId(603, "AgentUserFicAcquisitionComplete");
+        public static readonly EventId AgentCcaCreated = new EventId(604, "AgentCcaCreated");
+        public static readonly EventId AgentCcaEviction = new EventId(605, "AgentCcaEviction");
+
 #pragma warning restore IDE1006 // Naming Styles
     }
 }

src/Microsoft.Identity.Web.TokenAcquisition/TokenAcquisition.Logger.cs

@@ -81,6 +81,62 @@ public static void TokenAcquisitionMsalAuthenticationResultTime(
                     cacheRefreshReason,
                     ex);
             }
+
+            // --- Agent User FIC logging ---
+
+            private static readonly Action<ILogger, string, string, Exception?> s_agentUserFicFlowDetected =
+                LoggerMessage.Define<string, string>(
+                    LogLevel.Information,
+                    LoggingEventId.AgentUserFicFlowDetected,
+                    "[MsIdWeb] Agent User FIC flow detected for agent '{AgentAppId}' with user identifier type '{IdentifierType}'.");
+
+            private static readonly Action<ILogger, string, string, Exception?> s_agentUserFicSilentSuccess =
+                LoggerMessage.Define<string, string>(
+                    LogLevel.Debug,
+                    LoggingEventId.AgentUserFicSilentSuccess,
+                    "[MsIdWeb] Agent User FIC silent token acquisition succeeded for agent '{AgentAppId}' in tenant '{TenantId}'.");
+
+            private static readonly Action<ILogger, string, string, string, Exception?> s_agentUserFicSilentFailure =
+                LoggerMessage.Define<string, string, string>(
+                    LogLevel.Information,
+                    LoggingEventId.AgentUserFicSilentFailure,
+                    "[MsIdWeb] Agent User FIC silent token acquisition failed for agent '{AgentAppId}' in tenant '{TenantId}': {Reason}. Falling back to 3-leg acquisition.");
+
+            private static readonly Action<ILogger, string, string, Exception?> s_agentUserFicAcquisitionComplete =
+                LoggerMessage.Define<string, string>(
+                    LogLevel.Information,
+                    LoggingEventId.AgentUserFicAcquisitionComplete,
+                    "[MsIdWeb] Agent User FIC 3-leg acquisition complete for agent '{AgentAppId}', token source: {TokenSource}.");
+
+            private static readonly Action<ILogger, string, Exception?> s_agentCcaCreated =
+                LoggerMessage.Define<string>(
+                    LogLevel.Information,
+                    LoggingEventId.AgentCcaCreated,
+                    "[MsIdWeb] Created new agent CCA for cache key '{CcaCacheKey}'.");
+
+            private static readonly Action<ILogger, int, Exception?> s_agentCcaEviction =
+                LoggerMessage.Define<int>(
+                    LogLevel.Information,
+                    LoggingEventId.AgentCcaEviction,
+                    "[MsIdWeb] CCA dictionary cleared ({EvictedCount} entries exceeded size threshold).");
+
+            public static void AgentUserFicFlowDetected(ILogger logger, string agentAppId, string identifierType)
+                => s_agentUserFicFlowDetected(logger, agentAppId, identifierType, null);
+
+            public static void AgentUserFicSilentSuccess(ILogger logger, string agentAppId, string tenantId)
+                => s_agentUserFicSilentSuccess(logger, agentAppId, tenantId, null);
+
+            public static void AgentUserFicSilentFailure(ILogger logger, string agentAppId, string tenantId, string reason, Exception? ex)
+                => s_agentUserFicSilentFailure(logger, agentAppId, tenantId, reason, ex);
+
+            public static void AgentUserFicAcquisitionComplete(ILogger logger, string agentAppId, string tokenSource)
+                => s_agentUserFicAcquisitionComplete(logger, agentAppId, tokenSource, null);
+
+            public static void AgentCcaCreated(ILogger logger, string ccaCacheKey)
+                => s_agentCcaCreated(logger, ccaCacheKey, null);
+
+            public static void AgentCcaEviction(ILogger logger, int evictedCount)
+                => s_agentCcaEviction(logger, evictedCount, null);
         }
     }
 }