pr comments

GladwinJohnson · GladwinJohnson · commit 19bab4b6a33d · 2025-05-22T10:27:41.000-07:00
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/DefaultManagedIdentityHttpClientFactory.cs b/src/Microsoft.Identity.Web.TokenAcquisition/DefaultManagedIdentityHttpClientFactory.cs
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/IManagedIdentityHttpClientFactory.cs b/src/Microsoft.Identity.Web.TokenAcquisition/IManagedIdentityHttpClientFactory.cs
@@ -6,10 +6,9 @@
 namespace Microsoft.Identity.Web
 {
     /// <summary>
-    /// Internal abstraction so unit-tests can supply a custom
-    /// <see cref="IMsalHttpClientFactory"/>.
+    /// **TEST-ONLY.** Allows unit tests to supply a custom <see cref="IMsalHttpClientFactory"/>.
     /// </summary>
-    internal interface IManagedIdentityHttpClientFactory
+    internal interface IManagedIdentityTestHttpClientFactory
     {
         IMsalHttpClientFactory Create();
     }
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net462/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net462/InternalAPI.Unshipped.txt
@@ -1,8 +1,5 @@
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.DefaultManagedIdentityHttpClientFactory(System.Net.Http.IHttpClientFactory! http) -> void
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.GetHttpClient() -> System.Net.Http.HttpClient!
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
 const Microsoft.Identity.Web.IDWebErrorMessage.ExceptionAcquiringTokenForConfidentialClient = "IDW10501: Exception acquiring token for a confidential client: " -> string!
+Microsoft.Identity.Web.ClientInfoJsonContext
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net472/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net472/InternalAPI.Unshipped.txt
@@ -1,8 +1,5 @@
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.DefaultManagedIdentityHttpClientFactory(System.Net.Http.IHttpClientFactory! http) -> void
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.GetHttpClient() -> System.Net.Http.HttpClient!
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
 const Microsoft.Identity.Web.IDWebErrorMessage.ExceptionAcquiringTokenForConfidentialClient = "IDW10501: Exception acquiring token for a confidential client: " -> string!
+Microsoft.Identity.Web.ClientInfoJsonContext
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net6.0/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net6.0/InternalAPI.Unshipped.txt
@@ -1,9 +1,5 @@
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.DefaultManagedIdentityHttpClientFactory(System.Net.Http.IHttpClientFactory! http) -> void
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.GetHttpClient() -> System.Net.Http.HttpClient!
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
 const Microsoft.Identity.Web.IDWebErrorMessage.ExceptionAcquiringTokenForConfidentialClient = "IDW10501: Exception acquiring token for a confidential client: " -> string!
 Microsoft.Identity.Web.ClientInfoJsonContext
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net7.0/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net7.0/InternalAPI.Unshipped.txt
@@ -1,9 +1,5 @@
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.DefaultManagedIdentityHttpClientFactory(System.Net.Http.IHttpClientFactory! http) -> void
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.GetHttpClient() -> System.Net.Http.HttpClient!
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
 const Microsoft.Identity.Web.IDWebErrorMessage.ExceptionAcquiringTokenForConfidentialClient = "IDW10501: Exception acquiring token for a confidential client: " -> string!
 Microsoft.Identity.Web.ClientInfoJsonContext
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net8.0/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net8.0/InternalAPI.Unshipped.txt
@@ -1,9 +1,5 @@
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.DefaultManagedIdentityHttpClientFactory(System.Net.Http.IHttpClientFactory! http) -> void
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.GetHttpClient() -> System.Net.Http.HttpClient!
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
 const Microsoft.Identity.Web.IDWebErrorMessage.ExceptionAcquiringTokenForConfidentialClient = "IDW10501: Exception acquiring token for a confidential client: " -> string!
 Microsoft.Identity.Web.ClientInfoJsonContext
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net9.0/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net9.0/InternalAPI.Unshipped.txt
@@ -1,9 +1,5 @@
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.DefaultManagedIdentityHttpClientFactory(System.Net.Http.IHttpClientFactory! http) -> void
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.GetHttpClient() -> System.Net.Http.HttpClient!
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
 const Microsoft.Identity.Web.IDWebErrorMessage.ExceptionAcquiringTokenForConfidentialClient = "IDW10501: Exception acquiring token for a confidential client: " -> string!
 Microsoft.Identity.Web.ClientInfoJsonContext
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/netstandard2.0/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/netstandard2.0/InternalAPI.Unshipped.txt
@@ -1,8 +1,5 @@
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.DefaultManagedIdentityHttpClientFactory(System.Net.Http.IHttpClientFactory! http) -> void
-Microsoft.Identity.Web.DefaultManagedIdentityHttpClientFactory.GetHttpClient() -> System.Net.Http.HttpClient!
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory
-Microsoft.Identity.Web.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
-Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory
+Microsoft.Identity.Web.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
+Microsoft.Identity.Web.TokenAcquisition.IManagedIdentityTestHttpClientFactory.Create() -> Microsoft.Identity.Client.IMsalHttpClientFactory!
 const Microsoft.Identity.Web.IDWebErrorMessage.ExceptionAcquiringTokenForConfidentialClient = "IDW10501: Exception acquiring token for a confidential client: " -> string!
+Microsoft.Identity.Web.ClientInfoJsonContext
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/TokenAcquisition.ManagedIdentity.cs b/src/Microsoft.Identity.Web.TokenAcquisition/TokenAcquisition.ManagedIdentity.cs
@@ -20,7 +20,7 @@ internal partial class TokenAcquisition
         private readonly ConcurrentDictionary<string, IManagedIdentityApplication> _managedIdentityApplicationsByClientId = new();
         private readonly SemaphoreSlim _managedIdSemaphore = new(1, 1);
         private const string SystemAssignedManagedIdentityKey = "SYSTEM";
-        private readonly IManagedIdentityHttpClientFactory _miHttpFactory;
+        private readonly IManagedIdentityTestHttpClientFactory? _miHttpFactory;
 
         /// <summary>
         /// Gets a cached ManagedIdentityApplication object or builds a new one if not found.
@@ -103,7 +103,10 @@ private IManagedIdentityApplication BuildManagedIdentityApplication(
                 miBuilder.WithClientCapabilities(capabilities);
             }
 
-            miBuilder.WithHttpClientFactory(_miHttpFactory.Create());
+            if (_miHttpFactory != null)
+            {
+                miBuilder.WithHttpClientFactory(_miHttpFactory.Create());
+            }
 
             return miBuilder.Build();
 
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/TokenAcquisition.cs b/src/Microsoft.Identity.Web.TokenAcquisition/TokenAcquisition.cs
@@ -109,8 +109,7 @@ public TokenAcquisition(
             _certificatesObserver = serviceProvider.GetService<ICertificatesObserver>();
             tokenAcquisitionExtensionOptionsMonitor = serviceProvider.GetService<IOptionsMonitor<TokenAcquisitionExtensionOptions>>();
 
-            _miHttpFactory = serviceProvider.GetService<IManagedIdentityHttpClientFactory>()
-                   ?? new DefaultManagedIdentityHttpClientFactory(httpClientFactory);
+            _miHttpFactory = serviceProvider.GetService<IManagedIdentityTestHttpClientFactory>();
         }
 
 #if NET6_0_OR_GREATER
diff --git a/src/Microsoft.Identity.Web/WebApiExtensions/MicrosoftIdentityWebApiServiceCollectionExtensions.cs b/src/Microsoft.Identity.Web/WebApiExtensions/MicrosoftIdentityWebApiServiceCollectionExtensions.cs
@@ -38,10 +38,6 @@ public static MicrosoftIdentityWebApiAuthenticationBuilderWithConfiguration AddM
         {
             AuthenticationBuilder builder = services.AddAuthentication(jwtBearerScheme);
 
-            services.AddHttpClient();
-            services.TryAddSingleton<IManagedIdentityHttpClientFactory,
-                                     DefaultManagedIdentityHttpClientFactory>();
-
             return builder.AddMicrosoftIdentityWebApi(
                 configuration,
                 configSectionName,
diff --git a/tests/Microsoft.Identity.Web.Test/ManagedIdentityCaeTests.cs b/tests/Microsoft.Identity.Web.Test/ManagedIdentityCaeTests.cs
@@ -18,6 +18,8 @@
 using System.Security.Claims;
 using System.Threading;
 using Microsoft.IdentityModel.Tokens;
+using Microsoft.Identity.Client.AppConfig;
+using System.Reflection;
 
 namespace Microsoft.Identity.Web.Tests.Certificateless
 {
@@ -50,7 +52,7 @@ public async Task ManagedIdentity_ReturnsBearerHeader()
                 MockHttpCreator.CreateMsiTokenHandler(accessToken: MockToken));
 
             // Add the mock handler to the DI container
-            factory.Services.AddSingleton<IManagedIdentityHttpClientFactory>(
+            factory.Services.AddSingleton<IManagedIdentityTestHttpClientFactory>(
                 _ => new TestManagedIdentityHttpFactory(mockHttp));
 
             IAuthorizationHeaderProvider headerProvider = factory.Build()
@@ -82,7 +84,7 @@ public async Task ManagedIdentity_WithClaims_HeaderBypassesCache()
             mockedHttp.AddMockHandler(MockHttpCreator.CreateMsiTokenHandler("token1"));
             mockedHttp.AddMockHandler(MockHttpCreator.CreateMsiTokenHandler("token2"));
 
-            tokenAcquirerFactory.Services.AddSingleton<IManagedIdentityHttpClientFactory>(
+            tokenAcquirerFactory.Services.AddSingleton<IManagedIdentityTestHttpClientFactory>(
                 _ => new TestManagedIdentityHttpFactory(mockedHttp));
 
             var headerProvider = tokenAcquirerFactory.Build()
@@ -134,7 +136,7 @@ public async Task UserAssigned_MI_Caching_and_Claims()
             mockHttp.AddMockHandler(MockHttpCreator.CreateMsiTokenHandler("token-2")); // c
             mockHttp.AddMockHandler(MockHttpCreator.CreateMsiTokenHandler("token-3")); // d
 
-            factory.Services.AddSingleton<IManagedIdentityHttpClientFactory>(
+            factory.Services.AddSingleton<IManagedIdentityTestHttpClientFactory>(
                 _ => new TestManagedIdentityHttpFactory(mockHttp));
 
             var provider = factory.Build();
@@ -184,7 +186,7 @@ public async Task SystemAssigned_MSI_Forwards_ClientCapabilities_InQuery()
 
             var mockHttp = new MockHttpClientFactory();
             mockHttp.AddMockHandler(captureHandler);
-            factory.Services.AddSingleton<IManagedIdentityHttpClientFactory>(
+            factory.Services.AddSingleton<IManagedIdentityTestHttpClientFactory>(
                 _ => new TestManagedIdentityHttpFactory(mockHttp));
 
             // Enable capabilities cp1,cp2
diff --git a/tests/Microsoft.Identity.Web.Test/TestManagedIdentityHttpFactory.cs b/tests/Microsoft.Identity.Web.Test/TestManagedIdentityHttpFactory.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Identity.Web.Test
 {
-    internal sealed class TestManagedIdentityHttpFactory : IManagedIdentityHttpClientFactory
+    internal sealed class TestManagedIdentityHttpFactory : IManagedIdentityTestHttpClientFactory
     {
         private readonly IMsalHttpClientFactory _msalHttpClientFactory;
         public TestManagedIdentityHttpFactory(IMsalHttpClientFactory msalHttpClientFactory)

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,9 @@`
`6`	`6`	`namespace Microsoft.Identity.Web`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`		`- /// Internal abstraction so unit-tests can supply a custom`
`10`		`- /// <see cref="IMsalHttpClientFactory"/>.`
	`9`	`+ /// TEST-ONLY. Allows unit tests to supply a custom <see cref="IMsalHttpClientFactory"/>.`
`11`	`10`	`/// </summary>`
`12`		`- internal interface IManagedIdentityHttpClientFactory`
	`11`	`+ internal interface IManagedIdentityTestHttpClientFactory`
`13`	`12`	`{`
`14`	`13`	`IMsalHttpClientFactory Create();`
`15`	`14`	`}`