From d4e5c95fdef76583a6646a24f87d7d7cc8bc3bf2 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 27 Feb 2026 18:13:52 +0000 Subject: [PATCH] refactor: Rename SparkApiCredentials -> SparkCredentials --- src/client/spark_sdk/samples/SdkSampleConfig.cs | 2 +- src/cs/Bts.Spark.Api/Admin/AdminClient.cs | 4 ++-- src/cs/Bts.Spark.Api/Services/SparkApiServices.cs | 6 +++--- .../{SparkApiCredentials.cs => SparkCredentials.cs} | 2 +- src/cs/Bts.Spark.Api/Services/SparkLoginService.cs | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) rename src/cs/Bts.Spark.Api/Services/{SparkApiCredentials.cs => SparkCredentials.cs} (78%) diff --git a/src/client/spark_sdk/samples/SdkSampleConfig.cs b/src/client/spark_sdk/samples/SdkSampleConfig.cs index 2be018362..076632f70 100644 --- a/src/client/spark_sdk/samples/SdkSampleConfig.cs +++ b/src/client/spark_sdk/samples/SdkSampleConfig.cs @@ -6,7 +6,7 @@ using bts.api; using Spark.Api.Services; public class SdkSampleConfig { - public SparkApiCredentials? Credentials { get; set; } + public SparkCredentials? Credentials { get; set; } public SdkMarketDataSampleConfig? MarketData { get; set; } public SdkOrderSampleConfig? Order { get; set; } } diff --git a/src/cs/Bts.Spark.Api/Admin/AdminClient.cs b/src/cs/Bts.Spark.Api/Admin/AdminClient.cs index 30070b480..a32149fe5 100644 --- a/src/cs/Bts.Spark.Api/Admin/AdminClient.cs +++ b/src/cs/Bts.Spark.Api/Admin/AdminClient.cs @@ -21,10 +21,10 @@ namespace Spark.Api.Admin { IDisposable? _dispose; - public AdminClient(AdminService service, IOptions credentials) + public AdminClient(AdminService service, IOptions credentials) : this(service, credentials.Value) { } - public AdminClient(AdminService service, SparkApiCredentials credentials) + public AdminClient(AdminService service, SparkCredentials credentials) : this(service, credentials.User ?? string.Empty) { } public AdminClient(AdminService service, UserTuple user) diff --git a/src/cs/Bts.Spark.Api/Services/SparkApiServices.cs b/src/cs/Bts.Spark.Api/Services/SparkApiServices.cs index ac5133831..0959d925f 100644 --- a/src/cs/Bts.Spark.Api/Services/SparkApiServices.cs +++ b/src/cs/Bts.Spark.Api/Services/SparkApiServices.cs @@ -124,7 +124,7 @@ public static class SparkApiServices { /// A reference to this instance after the operation has completed. public static IServiceCollection AddSparkApi( this IServiceCollection services, - Action configureApiCredentials, + Action configureApiCredentials, Action configureMarketDataClient) => AddSparkApi(services, true, true, true, true, configureApiCredentials, configureMarketDataClient); @@ -144,7 +144,7 @@ public static class SparkApiServices { bool isOrdersEnabled, bool isPositionsEnabled, bool isAdminEnabled, - Action configureApiCredentials, + Action configureApiCredentials, Action configureMarketDataClient ) { if (!services.Any(s => s.ServiceType == typeof(ISparkConfigLoader))) { @@ -188,7 +188,7 @@ public static class SparkApiServices { } public static IServiceCollection AddSparkLogin(this IServiceCollection services, IConfiguration configurationSection) => - services.Configure(configurationSection) + services.Configure(configurationSection) .AddSingleton() .AddSingleton(sp => sp.GetRequiredService()) .AddHostedService(sp => sp.GetRequiredService()) diff --git a/src/cs/Bts.Spark.Api/Services/SparkApiCredentials.cs b/src/cs/Bts.Spark.Api/Services/SparkCredentials.cs similarity index 78% rename from src/cs/Bts.Spark.Api/Services/SparkApiCredentials.cs rename to src/cs/Bts.Spark.Api/Services/SparkCredentials.cs index 165bed73d..cbeb114fc 100644 --- a/src/cs/Bts.Spark.Api/Services/SparkApiCredentials.cs +++ b/src/cs/Bts.Spark.Api/Services/SparkCredentials.cs @@ -1,7 +1,7 @@ #nullable enable namespace Spark.Api.Services; -public class SparkApiCredentials { +public class SparkCredentials { public string? User { get; set; } public string? Password { get; set; } } diff --git a/src/cs/Bts.Spark.Api/Services/SparkLoginService.cs b/src/cs/Bts.Spark.Api/Services/SparkLoginService.cs index 84cff4aeb..51ead0afc 100644 --- a/src/cs/Bts.Spark.Api/Services/SparkLoginService.cs +++ b/src/cs/Bts.Spark.Api/Services/SparkLoginService.cs @@ -19,16 +19,16 @@ using System.Threading.Tasks; /// public class SparkLoginService : IHostedService, ISparkLoginService { readonly ServiceContext serviceContext; - readonly SparkApiCredentials config; + readonly SparkCredentials config; readonly ISparkConfigLoader sparkConfigLoader; readonly object lockObj = new(); LoginResult? loginResult; Task? loginTask; - public SparkLoginService(ServiceContext serviceContext, IOptions config, ISparkConfigLoader sparkConfigLoader) + public SparkLoginService(ServiceContext serviceContext, IOptions config, ISparkConfigLoader sparkConfigLoader) : this(serviceContext, config.Value, sparkConfigLoader) { } - public SparkLoginService(ServiceContext serviceContext, SparkApiCredentials config, ISparkConfigLoader sparkConfigLoader) { + public SparkLoginService(ServiceContext serviceContext, SparkCredentials config, ISparkConfigLoader sparkConfigLoader) { this.serviceContext = serviceContext; this.config = config; this.sparkConfigLoader = sparkConfigLoader;