Merge pull request #951 from sitkoru/grpc/client/grpc-providers

fix: get generic grpc token\metadata provider
sitkoru · May 22, 2024 · 8676141 · 8676141
2 parents 36844cf + 69ef0e7
commit 8676141
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/Sitko.Core.Grpc.Client/GrpcClientModuleOptions.cs b/src/Sitko.Core.Grpc.Client/GrpcClientModuleOptions.cs
@@ -80,7 +80,7 @@ public GrpcClientModuleOptions<TClient> AddMetadataProvider<TMetadataProvider>()
         configureServicesActions.Add(services =>
         {
             services.AddTransient<IGrpcMetadataProviderFactory<TClient>, GrpcMetadataProviderFactory<TClient, TMetadataProvider>>();
-            services.TryAddTransient<IGrpcMetadataProvider, TMetadataProvider>();
+            services.AddTransient<IGrpcMetadataProvider, TMetadataProvider>();
         });
         return this;
     }
@@ -91,7 +91,7 @@ public GrpcClientModuleOptions<TClient> AddTokenAuth<TTokenProvider>()
         configureServicesActions.Add(services =>
         {
             services.AddTransient<IGrpcTokenProviderFactory<TClient>, GrpcTokenProviderFactory<TClient, TTokenProvider>>();
-            services.TryAddTransient<IGrpcTokenProvider, TTokenProvider>();
+            services.AddTransient<IGrpcTokenProvider, TTokenProvider>();
         });
         return this;
     }

diff --git a/src/Sitko.Core.Grpc.Client/IGrpcMetadataProviderFactory.cs b/src/Sitko.Core.Grpc.Client/IGrpcMetadataProviderFactory.cs
@@ -8,9 +8,12 @@ internal interface IGrpcMetadataProviderFactory<TClient> where TClient : ClientB
     public IGrpcMetadataProvider GetProvider(IServiceProvider serviceProvider);
 }
 
-internal class GrpcMetadataProviderFactory<TClient, TMetadataProvider> : IGrpcMetadataProviderFactory<TClient> where TClient : ClientBase<TClient>
+internal class GrpcMetadataProviderFactory<TClient, TMetadataProvider> : IGrpcMetadataProviderFactory<TClient>
+    where TClient : ClientBase<TClient>
     where TMetadataProvider : class, IGrpcMetadataProvider
 
 {
-    public IGrpcMetadataProvider GetProvider(IServiceProvider serviceProvider) => serviceProvider.GetService<TMetadataProvider>()!;
+    public IGrpcMetadataProvider GetProvider(IServiceProvider serviceProvider) =>
+        serviceProvider.GetServices<IGrpcMetadataProvider>().OfType<TMetadataProvider>().FirstOrDefault() ??
+        throw new InvalidDataException($"Service {typeof(TMetadataProvider)} is not register");
 }
diff --git a/src/Sitko.Core.Grpc.Client/IGrpcTokenProviderFactory.cs b/src/Sitko.Core.Grpc.Client/IGrpcTokenProviderFactory.cs
@@ -8,9 +8,12 @@ public interface IGrpcTokenProviderFactory<TClient> where TClient : ClientBase<T
     public IGrpcTokenProvider GetProvider(IServiceProvider serviceProvider);
 }
 
-internal class GrpcTokenProviderFactory<TClient, TTokenProvider> : IGrpcTokenProviderFactory<TClient> where TClient : ClientBase<TClient>
+internal class GrpcTokenProviderFactory<TClient, TTokenProvider> : IGrpcTokenProviderFactory<TClient>
+    where TClient : ClientBase<TClient>
     where TTokenProvider : class, IGrpcTokenProvider
 
 {
-    public IGrpcTokenProvider GetProvider(IServiceProvider serviceProvider) => serviceProvider.GetService<TTokenProvider>()!;
+    public IGrpcTokenProvider GetProvider(IServiceProvider serviceProvider) =>
+        serviceProvider.GetServices<IGrpcTokenProvider>().OfType<TTokenProvider>().FirstOrDefault() ??
+        throw new InvalidDataException($"Service {typeof(TTokenProvider)} is not register");
 }