From 2d4fe7741bd3028cc38be919f64f24d54d58c52e Mon Sep 17 00:00:00 2001
From: Whit Waldo <whit.waldo@innovian.net>
Date: Wed, 15 May 2024 00:38:54 -0500
Subject: [PATCH 1/2] Added overload for DaprClient DI registration allowing
 the consumer to easily use values from injected services (e.g.
 IConfiguration).

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
---
 .../DaprServiceCollectionExtensions.cs        | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/Dapr.AspNetCore/DaprServiceCollectionExtensions.cs b/src/Dapr.AspNetCore/DaprServiceCollectionExtensions.cs
index 8491cb9b2..388015b80 100644
--- a/src/Dapr.AspNetCore/DaprServiceCollectionExtensions.cs
+++ b/src/Dapr.AspNetCore/DaprServiceCollectionExtensions.cs
@@ -31,18 +31,32 @@ public static class DaprServiceCollectionExtensions
         /// <param name="configure"></param>
         public static void AddDaprClient(this IServiceCollection services, Action<DaprClientBuilder> configure = null)
         {
-            if (services is null)
-            {
-                throw new ArgumentNullException(nameof(services));
-            }
+            ArgumentNullException.ThrowIfNull(services, nameof(services));
 
             services.TryAddSingleton(_ =>
             {
                 var builder = new DaprClientBuilder();
-                if (configure != null)
-                {
-                    configure.Invoke(builder);
-                }
+                configure?.Invoke(builder);
+
+                return builder.Build();
+            });
+        }
+        
+        /// <summary>
+        /// Adds Dapr client services to the provided <see cref="IServiceCollection"/>. This does not include integration
+        /// with ASP.NET Core MVC. Use the <c>AddDapr()</c> extension method on <c>IMvcBuilder</c> to register MVC integration. 
+        /// </summary>
+        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+        /// <param name="configure"></param>
+        public static void AddDaprClient(this IServiceCollection services,
+            Action<IServiceProvider, DaprClientBuilder> configure)
+        {
+            ArgumentNullException.ThrowIfNull(services, nameof(services));
+
+            services.TryAddSingleton(serviceProvider =>
+            {
+                var builder = new DaprClientBuilder();
+                configure?.Invoke(serviceProvider, builder);
 
                 return builder.Build();
             });

From 990bf35616462cd861f4a49d2d89a892a7335ccd Mon Sep 17 00:00:00 2001
From: Whit Waldo <whit.waldo@innovian.net>
Date: Wed, 15 May 2024 01:26:42 -0500
Subject: [PATCH 2/2] Added supporting unit test

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
---
 .../DaprServiceCollectionExtensionsTest.cs    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/test/Dapr.AspNetCore.Test/DaprServiceCollectionExtensionsTest.cs b/test/Dapr.AspNetCore.Test/DaprServiceCollectionExtensionsTest.cs
index 614faf5e4..a82948cf3 100644
--- a/test/Dapr.AspNetCore.Test/DaprServiceCollectionExtensionsTest.cs
+++ b/test/Dapr.AspNetCore.Test/DaprServiceCollectionExtensionsTest.cs
@@ -48,6 +48,31 @@ public void AddDaprClient_RegistersDaprClientOnlyOnce()
             Assert.True(daprClient.JsonSerializerOptions.PropertyNameCaseInsensitive);
         }
 
+        [Fact]
+        public void AddDaprClient_RegistersUsingDependencyFromIServiceProvider()
+        {
+            
+            var services = new ServiceCollection();
+            services.AddSingleton<TestConfigurationProvider>();
+            services.AddDaprClient((provider, builder) =>
+            {
+                var configProvider = provider.GetRequiredService<TestConfigurationProvider>();
+                var caseSensitivity = configProvider.GetCaseSensitivity();
+
+                builder.UseJsonSerializationOptions(new JsonSerializerOptions
+                {
+                    PropertyNameCaseInsensitive = caseSensitivity
+                });
+            });
+
+            var serviceProvider = services.BuildServiceProvider();
+            
+            DaprClientGrpc client = serviceProvider.GetRequiredService<DaprClient>() as DaprClientGrpc;
+            
+            //Registers with case-insensitive as true by default, but we set as false above
+            Assert.False(client.JsonSerializerOptions.PropertyNameCaseInsensitive);
+        }
+
 #if NET8_0_OR_GREATER
         [Fact]
         public void AddDaprClient_WithKeyedServices()
@@ -65,5 +90,10 @@ public void AddDaprClient_WithKeyedServices()
             Assert.NotNull(daprClient);
         }
 #endif
+        
+        private class TestConfigurationProvider
+        {
+            public bool GetCaseSensitivity() => false;
+        }
     }
 }