refactor: Rename SparkApiCredentials -> SparkCredentials
This commit is contained in:
1 parent
f6e0ec3617
commit
d4e5c95fde
5 files changed
+10
-10
No files matched your search
@@ -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; }
|
||||
}
|
||||
|
||||
@@ -21,10 +21,10 @@ namespace Spark.Api.Admin {
|
||||
|
||||
IDisposable? _dispose;
|
||||
|
||||
public AdminClient(AdminService service, IOptions<SparkApiCredentials> credentials)
|
||||
public AdminClient(AdminService service, IOptions<SparkCredentials> 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)
|
||||
|
||||
@@ -124,7 +124,7 @@ public static class SparkApiServices {
|
||||
/// <returns>A reference to this instance after the operation has completed.</returns>
|
||||
public static IServiceCollection AddSparkApi(
|
||||
this IServiceCollection services,
|
||||
Action<SparkApiCredentials> configureApiCredentials,
|
||||
Action<SparkCredentials> configureApiCredentials,
|
||||
Action<MarketDataClientConfig> configureMarketDataClient) =>
|
||||
AddSparkApi(services, true, true, true, true, configureApiCredentials, configureMarketDataClient);
|
||||
|
||||
@@ -144,7 +144,7 @@ public static class SparkApiServices {
|
||||
bool isOrdersEnabled,
|
||||
bool isPositionsEnabled,
|
||||
bool isAdminEnabled,
|
||||
Action<SparkApiCredentials> configureApiCredentials,
|
||||
Action<SparkCredentials> configureApiCredentials,
|
||||
Action<MarketDataClientConfig> 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<SparkApiCredentials>(configurationSection)
|
||||
services.Configure<SparkCredentials>(configurationSection)
|
||||
.AddSingleton<SparkLoginService>()
|
||||
.AddSingleton<ISparkLoginService, SparkLoginService>(sp => sp.GetRequiredService<SparkLoginService>())
|
||||
.AddHostedService(sp => sp.GetRequiredService<SparkLoginService>())
|
||||
|
||||
+1
-1
@@ -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; }
|
||||
}
|
||||
@@ -19,16 +19,16 @@ using System.Threading.Tasks;
|
||||
/// </summary>
|
||||
public class SparkLoginService : IHostedService, ISparkLoginService {
|
||||
readonly ServiceContext serviceContext;
|
||||
readonly SparkApiCredentials config;
|
||||
readonly SparkCredentials config;
|
||||
readonly ISparkConfigLoader sparkConfigLoader;
|
||||
readonly object lockObj = new();
|
||||
LoginResult? loginResult;
|
||||
Task<LoginResult>? loginTask;
|
||||
|
||||
public SparkLoginService(ServiceContext serviceContext, IOptions<SparkApiCredentials> config, ISparkConfigLoader sparkConfigLoader)
|
||||
public SparkLoginService(ServiceContext serviceContext, IOptions<SparkCredentials> 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;
|
||||
|
||||
Reference in new issue
Block a user