IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
pavelbannov 2020-10-12 20:20:19 +03:00
parent 43b9c33979
commit 5e14bbb8cc
4 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

@ -51,7 +51,7 @@ dotnet_style_operator_placement_when_wrapping = beginning_of_line
dotnet_style_prefer_auto_properties = true:warning
dotnet_style_prefer_compound_assignment = true:warning
dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion
dotnet_style_prefer_conditional_expression_over_return = true:warning
dotnet_style_prefer_conditional_expression_over_return = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
dotnet_style_prefer_inferred_tuple_names = true:warning
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning

33
common/ASC.Data.Storage/Configuration/StorageSettings.cs
View File

@ -229,39 +229,18 @@ namespace ASC.Data.Storage.Configuration
public static class StorageSettingsExtension
{
public static DIHelper AddBaseStorageSettingsService(this DIHelper services)
{
_ = services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
_ = services.TryAddSingleton<BaseStorageSettingsListener>();
_ = services.TryAddScoped<BaseStorageSettingsListenerScope>();
_ = services.TryAddScoped<CdnStorageSettings>();
return services
.AddStorageFactoryConfigService()
.AddPathUtilsService()
.AddEmailValidationKeyProviderService();
}
public static DIHelper AddCdnStorageSettingsService(this DIHelper services)
{
if (services.TryAddScoped<StorageSettingsHelper>())
{
return services
.AddSettingsManagerService()
.AddBaseStorageSettingsService()
.AddConsumerFactoryService();
}
return services;
}
public static DIHelper AddStorageSettingsService(this DIHelper services)
{
if (services.TryAddScoped<StorageSettingsHelper>())
{
_ = services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
_ = services.TryAddScoped<BaseStorageSettingsListenerScope>();
_ = services.TryAddScoped<CdnStorageSettings>();
return services
.AddSettingsManagerService()
.AddBaseStorageSettingsService()
.AddConsumerFactoryService();
.AddConsumerFactoryService()
.AddStorageFactoryConfigService()
.AddPathUtilsService();
}
return services;

2
common/ASC.Data.Storage/StaticUploader.cs
View File

@ -323,7 +323,7 @@ namespace ASC.Data.Storage
_ = services.TryAddScoped<StaticUploaderScope>();
return services
.AddTenantManagerService()
.AddCdnStorageSettingsService();
.AddStorageSettingsService();
}
return services;

3
common/ASC.Data.Storage/WebPath.cs
View File

@ -250,10 +250,9 @@ namespace ASC.Data.Storage
{
if (services.TryAddScoped<WebPath>())
{
return services
.AddStaticUploaderService()
.AddCdnStorageSettingsService()
.AddStorageSettingsService()
.AddWebPathSettingsService()
.AddCoreBaseSettingsService();
}