Update options config

ductran95 · Aug 6, 2022 · 791a075 · 791a075
1 parent b6592d6
commit 791a075
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/JustCSharp.ShopeeSDK/Extensions/ServiceCollectionExtensions.cs b/src/JustCSharp.ShopeeSDK/Extensions/ServiceCollectionExtensions.cs
@@ -11,24 +11,22 @@ public static class ServiceCollectionExtensions
     public static IServiceCollection AddShopeeSDK(this IServiceCollection services,
         IConfigurationSection configurationSection, ServiceLifetime serviceLifetime = ServiceLifetime.Singleton)
     {
-        services.AddShopeeSDKCore(serviceLifetime);
-
-        services.Configure<ShopeeSDKOptions>(configurationSection);
+        services.AddShopeeSDK(configurationSection.Bind, serviceLifetime);
 
         return services;
     }
 
-    public static IServiceCollection AddShopeeSDK(this IServiceCollection services, Action<ShopeeSDKOptions> setupAction, ServiceLifetime serviceLifetime = ServiceLifetime.Singleton)
+    public static IServiceCollection AddShopeeSDK(this IServiceCollection services, Action<ShopeeSDKOptions> configure = null, ServiceLifetime serviceLifetime = ServiceLifetime.Singleton)
     {
-        services.AddShopeeSDKCore(serviceLifetime);
+        var options = new ShopeeSDKOptions();
 
-        services.Configure(setupAction);
+        if (configure != null)
+        {
+            configure.Invoke(options);
+        }
+
+        services.TryAddSingleton(options);
 
-        return services;
-    }
-
-    internal static IServiceCollection AddShopeeSDKCore(this IServiceCollection services, ServiceLifetime serviceLifetime = ServiceLifetime.Singleton)
-    {
         services.TryAdd(new ServiceDescriptor(typeof(IShopeeClient), typeof(ShopeeClient), serviceLifetime));
 
         return services;

diff --git a/src/JustCSharp.ShopeeSDK/ShopeeClient.cs b/src/JustCSharp.ShopeeSDK/ShopeeClient.cs
@@ -24,11 +24,11 @@ public class ShopeeClient : IShopeeClient, IDisposable
     protected readonly ILogger _logger;
     protected readonly ShopeeSDKOptions _shopeeSdkOptions;
 
-    public ShopeeClient(IOptions<ShopeeSDKOptions> shopeeOptions, ILogger<ShopeeClient> logger)
+    public ShopeeClient(ShopeeSDKOptions shopeeSdkOptions, ILogger<ShopeeClient> logger)
     {
         _httpClient = new RestClient(new RestClientOptions()).UseSystemTextJson();
         _logger = logger;
-        _shopeeSdkOptions = shopeeOptions.Value;
+        _shopeeSdkOptions = shopeeSdkOptions;
     }
 
     public T Execute<T>(IShopeeRequest<T> request) where T : IShopeeResponse