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

scope: refactoring

Browse Source
This commit is contained in:
SuhorukovAnton 2020-09-07 15:01:15 +03:00
parent 6d567c4360
commit 80198032a4
28 changed files with 45 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ASC.Core.Common/Tests/TopSubscriptionProviderTest.cs
View File

@ -61,7 +61,7 @@ namespace ASC.Core.Common.Tests
{
using var scope = serviceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<TopSubscriptionProviderTestScope>();
(var tenantManager, var subscriptionManager, var recipientProviderImpl) = scopeClass;
var (tenantManager, subscriptionManager, recipientProviderImpl) = scopeClass;
tenant = new Tenants.Tenant(0, "teamlab");
sourceId = "6045b68c-2c2e-42db-9e53-c272e814c4ad";
actionId = "NewCommentForTask";

2
common/ASC.Core.Common/Tests/UserManagerTest.cs
View File

@ -86,7 +86,7 @@ namespace ASC.Core.Common.Tests
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<UserManagerTestScope>();
(var userManager, var tenantManager) = scopeClass;
var (userManager, tenantManager) = scopeClass;
var tenant = tenantManager.SetCurrentTenant(1024);
var deps = userManager.GetDepartments();

2
common/ASC.Data.Reassigns/ReassignProgressItem.cs
View File

@ -102,7 +102,7 @@ namespace ASC.Data.Reassigns
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<ReassignProgressItemScope>();
(var tenantManager, var coreBaseSettings, var messageService, var studioNotifyService, var securityContext, var userManager, var userPhotoManager, var displayUserSettingsHelper, var messageTarget, var options) = scopeClass;
var (tenantManager, coreBaseSettings, messageService, studioNotifyService, securityContext, userManager, userPhotoManager, displayUserSettingsHelper, messageTarget, options) = scopeClass;
var logger = options.Get("ASC.Web");
var tenant = tenantManager.SetCurrentTenant(_tenantId);

2
common/ASC.Data.Reassigns/RemoveProgressItem.cs
View File

@ -98,7 +98,7 @@ namespace ASC.Data.Reassigns
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<RemoveProgressItemScope>();
(var tenantManager, var coreBaseSettings, var messageService, var studioNotifyService, var securityContext, var userManager, var messageTarget, var webItemManagerSecurity, var storageFactory, var userFormatter, var options) = scopeClass;
var (tenantManager, coreBaseSettings, messageService, studioNotifyService, securityContext, userManager, messageTarget, webItemManagerSecurity, storageFactory, userFormatter, options) = scopeClass;
var logger = options.Get("ASC.Web");
var tenant = tenantManager.SetCurrentTenant(_tenantId);
var userName = userFormatter.GetUserName(User, DisplayUserNameFormat.Default);

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

@ -51,7 +51,7 @@ namespace ASC.Data.Storage.Configuration
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<BaseStorageSettingsListenerScope>();
(var storageSettingsHelper, var settingsManager, var cdnStorageSettings) = scopeClass;
var (storageSettingsHelper, settingsManager, cdnStorageSettings) = scopeClass;
var settings = settingsManager.LoadForTenant<StorageSettings>(i.TenantId);
if (i.Name == settings.Module)
{
@ -238,6 +238,7 @@ namespace ASC.Data.Storage.Configuration
services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
services.TryAddSingleton<BaseStorageSettingsListener>();
services.TryAddScoped<BaseStorageSettingsListenerScope>();
services.TryAddScoped<CdnStorageSettings>();
return services
.AddStorageFactoryConfigService()
.AddPathUtilsService()

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

@ -113,7 +113,7 @@ namespace ASC.Data.Storage
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<StaticUploaderScope>();
(var tenantManager, var staticUploader, var securityContext, var settingsManager, var storageSettingsHelper) = scopeClass;
var(tenantManager, staticUploader, _, _, _) = scopeClass;
tenantManager.SetCurrentTenant(tenantId);
return staticUploader.UploadFile(relativePath, mappedPath, onComplete);
}, TaskCreationOptions.LongRunning);
@ -209,7 +209,7 @@ namespace ASC.Data.Storage
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<StaticUploaderScope>();
(var tenantManager, var staticUploader, var securityContext, var settingsManager, var storageSettingsHelper) = scopeClass;
var (tenantManager, _, securityContext, settingsManager, storageSettingsHelper) = scopeClass;
var tenant = tenantManager.GetTenant(tenantId);
tenantManager.SetCurrentTenant(tenant);
securityContext.AuthenticateMe(tenant.OwnerId);

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

@ -67,7 +67,7 @@ namespace ASC.Data.Storage.DiscStorage
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<StorageHandlerScope>();
(var tenantManager, var securityContext, var storageFactory, var emailValidationKeyProvider) = scopeClass;
var (tenantManager, securityContext, storageFactory, emailValidationKeyProvider) = scopeClass;
if (_checkAuth && !securityContext.IsAuthenticated)
{

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

@ -154,7 +154,7 @@ namespace ASC.Data.Storage
Log.DebugFormat("Tenant: {0}", tenantId);
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<MigrateOperationScope>();
(var tenantManager, var securityContext, var storageFactory, var options, var storageSettingsHelper, var settingsManager) = scopeClass;
var (tenantManager, securityContext, storageFactory, options, storageSettingsHelper, settingsManager) = scopeClass;
var tenant = tenantManager.GetTenant(tenantId);
tenantManager.SetCurrentTenant(tenant);

6
common/services/ASC.Data.Backup/Core/NotifyHelper.cs
View File

@ -70,7 +70,7 @@ namespace ASC.Data.Backup
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<NotifyHelperScope>();
(var userManager, var studioNotifyHelper, var studioNotifySource, var displayUserSettingsHelper) = scopeClass;
var (userManager, studioNotifyHelper, studioNotifySource, displayUserSettingsHelper) = scopeClass;
var client = WorkContext.NotifyContext.NotifyService.RegisterClient(studioNotifySource, scope);
client.SendNoticeToAsync(
@ -103,7 +103,7 @@ namespace ASC.Data.Backup
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<NotifyHelperScope>();
(var userManager, var studioNotifyHelper, var studioNotifySource, var displayUserSettingsHelper) = scopeClass;
var (userManager, studioNotifyHelper, studioNotifySource, displayUserSettingsHelper) = scopeClass;
var client = WorkContext.NotifyContext.NotifyService.RegisterClient(studioNotifySource, scope);
var owner = userManager.GetUsers(tenant.OwnerId);
@ -124,7 +124,7 @@ namespace ASC.Data.Backup
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<NotifyHelperScope>();
(var userManager, var studioNotifyHelper, var studioNotifySource, var displayUserSettingsHelper) = scopeClass;
var (userManager, studioNotifyHelper, studioNotifySource, _) = scopeClass;
var client = WorkContext.NotifyContext.NotifyService.RegisterClient(studioNotifySource, scope);
var users = userManager.GetUsers()

6
common/services/ASC.Data.Backup/Service/BackupWorker.cs
View File

@ -370,7 +370,7 @@ namespace ASC.Data.Backup.Service
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<BackupWorkerScope>();
(var tenantManager, var backupStorageFactory, var notifyHelper, var backupRepository, var backupWorker, var backupPortalTask, var restorePortalTask, var transferPortalTask) = scopeClass;
var (tenantManager, backupStorageFactory, notifyHelper, backupRepository, backupWorker, backupPortalTask, _, _) = scopeClass;
var tenant = tenantManager.GetTenant(TenantId);
var backupName = string.Format("{0}_{1:yyyy-MM-dd_HH-mm-ss}.{2}", tenant.TenantAlias, DateTime.UtcNow, ArchiveFormat);
@ -502,7 +502,7 @@ namespace ASC.Data.Backup.Service
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<BackupWorkerScope>();
(var tenantManager, var backupStorageFactory, var notifyHelper, var backupRepository, var backupWorker, var backupPortalTask, var restorePortalTask, var transferPortalTask) = scopeClass;
var (tenantManager, backupStorageFactory, notifyHelper, _, backupWorker, _, restorePortalTask, _) = scopeClass;
Tenant tenant = null;
var tempFile = PathHelper.GetTempFileName(TempFolder);
try
@ -661,7 +661,7 @@ namespace ASC.Data.Backup.Service
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<BackupWorkerScope>();
(var tenantManager, var backupStorageFactory, var notifyHelper, var backupRepository, var backupWorker, var backupPortalTask, var restorePortalTask, var transferPortalTask) = scopeClass;
var (tenantManager, _, notifyHelper, _, backupWorker, _, _, transferPortalTask) = scopeClass;
var tempFile = PathHelper.GetTempFileName(TempFolder);
var tenant = tenantManager.GetTenant(TenantId);
var alias = tenant.TenantAlias;

2
common/services/ASC.ElasticSearch/Service/Launcher.cs
View File

@ -93,7 +93,7 @@ namespace ASC.ElasticSearch
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<ServiceLauncherScope>();
(var factoryIndexer, var service) = scopeClass;
var (factoryIndexer, service) = scopeClass;
while (!factoryIndexer.CheckState(false))
{
if (CancellationTokenSource.IsCancellationRequested)

2
common/services/ASC.ElasticSearch/Service/Service.cs
View File

@ -88,7 +88,7 @@ namespace ASC.ElasticSearch.Service
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<ServiceScope>();
(var tenantManager, var settingsManager) = scopeClass;
var (tenantManager, settingsManager) = scopeClass;
tenantManager.SetCurrentTenant(tenant);
settingsManager.ClearCache<SearchSettings>();
});

2
common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs
View File

@ -122,7 +122,7 @@ namespace ASC.Feed.Aggregator
var cfg = FeedSettings.GetInstance(Configuration);
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<FeedAggregatorServiceScope>();
(var baseCommonLinkUtility, var tenantManager, var feedAggregateDataProvider, var userManager, var securityContext, var authManager) = scopeClass;
var (baseCommonLinkUtility, tenantManager, feedAggregateDataProvider, userManager, securityContext, authManager) = scopeClass;
baseCommonLinkUtility.Initialize(cfg.ServerRoot);
var start = DateTime.UtcNow;

2
common/services/ASC.Notify/NotifyService.cs
View File

@ -100,7 +100,7 @@ namespace ASC.Notify
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<NotifyServiceScope>();
(var tenantManager, var tenantWhiteLabelSettingsHelper, var settingsManager) = scopeClass;
var (tenantManager, tenantWhiteLabelSettingsHelper, settingsManager) = scopeClass;
tenantManager.SetCurrentTenant(tenant);
tenantWhiteLabelSettingsHelper.Apply(settingsManager.Load<TenantWhiteLabelSettings>(), tenant);
methodInfo.Invoke(instance, parameters);

4
products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs vendored
View File

@ -131,7 +131,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
var fromSelector = GetSelector(fromFileId);
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<ProviderDaoBaseScope>();
(var tenantManager, var folderDao, var fileDao) = scopeClass;
var (tenantManager, _, fileDao) = scopeClass;
tenantManager.SetCurrentTenant(TenantID);
return CrossDao.PerformCrossDaoFileCopy(
@ -156,7 +156,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
var fromSelector = GetSelector(fromFolderId);
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<ProviderDaoBaseScope>();
(var tenantManager, var folderDao, var fileDao) = scopeClass;
var (_, folderDao, fileDao) = scopeClass;
return CrossDao.PerformCrossDaoFolderCopy(
fromFolderId, fromSelector.GetFolderDao(fromFolderId), fromSelector.GetFileDao(fromFolderId), fromSelector.ConvertId,
toRootFolderId, folderDao, fileDao, r => r,

2
products/ASC.Files/Core/Services/DocumentService/DocbuilderReportsUtility.cs
View File

@ -155,7 +155,7 @@ namespace ASC.Web.Files.Services.DocumentService
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<ReportStateScope>();
(var options, var tenantManager, var authContext, var securityContext, var documentServiceConnector) = scopeClass;
var (options, tenantManager, authContext, securityContext, documentServiceConnector) = scopeClass;
var logger = options.CurrentValue;
try
{

8
products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
View File

@ -56,7 +56,7 @@ namespace ASC.Web.Files.Services.NotifyService
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<NotifyClientScope>();
(var notifySource, var securityContext, var filesLinkUtility, var fileUtility, var baseCommonLinkUtility, var daoFactory, var pathProvider, var userManager, var tenantManager) = scopeClass;
var (notifySource, securityContext, filesLinkUtility, fileUtility, baseCommonLinkUtility, _, _, _, _) = scopeClass;
var client = WorkContext.NotifyContext.NotifyService.RegisterClient(notifySource, scope);
var recipient = notifySource.GetRecipientsProvider().GetRecipient(securityContext.CurrentAccount.ID.ToString());
@ -75,7 +75,7 @@ namespace ASC.Web.Files.Services.NotifyService
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<NotifyClientScope>();
(var notifySource, var securityContext, var filesLinkUtility, var fileUtility, var baseCommonLinkUtility, var daoFactory, var pathProvider, var userManager, var tenantManager) = scopeClass;
var (notifySource, securityContext, _, _, _, _, _, _, _) = scopeClass;
var client = WorkContext.NotifyContext.NotifyService.RegisterClient(notifySource, scope);
var recipient = notifySource.GetRecipientsProvider().GetRecipient(securityContext.CurrentAccount.ID.ToString());
@ -114,7 +114,7 @@ namespace ASC.Web.Files.Services.NotifyService
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<NotifyClientScope>();
(var notifySource, var securityContext, var filesLinkUtility, var fileUtility, var baseCommonLinkUtility, var daoFactory, var pathProvider, var userManager, var tenantManager) = scopeClass;
var (notifySource, _, filesLinkUtility, fileUtility, baseCommonLinkUtility, daoFactory, pathProvider, userManager, tenantManager) = scopeClass;
var client = WorkContext.NotifyContext.NotifyService.RegisterClient(notifySource, scope);
var folderDao = daoFactory.GetFolderDao<T>();
@ -156,7 +156,7 @@ namespace ASC.Web.Files.Services.NotifyService
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<NotifyClientScope>();
(var notifySource, var securityContext, var filesLinkUtility, var fileUtility, var baseCommonLinkUtility, var daoFactory, var pathProvider, var userManager, var tenantManager) = scopeClass;
var (notifySource, _, _, _, baseCommonLinkUtility, _, _, userManager, _) = scopeClass;
var client = WorkContext.NotifyContext.NotifyService.RegisterClient(notifySource, scope);
var recipientsProvider = notifySource.GetRecipientsProvider();

4
products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
View File

@ -124,7 +124,7 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
private void DeleteFolders(IEnumerable<T> folderIds, IServiceScope scope)
{
var scopeClass = scope.ServiceProvider.GetService<FileDeleteOperationScope>();
(var fileMarker, var filesMessageService) = scopeClass;
var (fileMarker, filesMessageService) = scopeClass;
foreach (var folderId in folderIds)
{
CancellationToken.ThrowIfCancellationRequested();
@ -208,7 +208,7 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
private void DeleteFiles(IEnumerable<T> fileIds, IServiceScope scope)
{
var scopeClass = scope.ServiceProvider.GetService<FileDeleteOperationScope>();
(var fileMarker, var filesMessageService) = scopeClass;
var (fileMarker, filesMessageService) = scopeClass;
foreach (var fileId in fileIds)
{
CancellationToken.ThrowIfCancellationRequested();

2
products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
View File

@ -85,7 +85,7 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
protected override void Do(IServiceScope scope)
{
var scopeClass = scope.ServiceProvider.GetService<FileMarkAsReadOperationScope>();
(var fileMarker, var globalFolder, var daoFactory) = scopeClass;
var (fileMarker, globalFolder, daoFactory) = scopeClass;
var entries = new List<FileEntry<T>>();
if (Folders.Any())
{

2
products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
View File

@ -355,7 +355,7 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
if (fileIds.Count == 0) return needToMark;
var scopeClass = scope.ServiceProvider.GetService<FileMoveCopyOperationScope>();
(var filesMessageService, var fileMarker, var fileUtility, var global, var entryManager) = scopeClass;
var (filesMessageService, fileMarker, fileUtility, global, entryManager) = scopeClass;
var fileDao = scope.ServiceProvider.GetService<IFileDao<TTo>>();
var toFolderId = toFolder.ID;

2
products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
View File

@ -285,7 +285,7 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<FileOperationScope>();
(var tenantManager, var daoFactory, var fileSecurity, var options) = scopeClass;
var (tenantManager, daoFactory, fileSecurity, options) = scopeClass;
tenantManager.SetCurrentTenant(CurrentTenant);

2
products/ASC.Files/Core/Utils/FileConverter.cs
View File

@ -145,7 +145,7 @@ namespace ASC.Web.Files.Utils
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<FileConverterQueueScope>();
(var options, var tenantManager, var userManager, var securityContext, var daoFactory, var fileSecurity, var pathProvider, var setupInfo, var fileUtility, var documentServiceHelper, var documentServiceConnector, var entryManager, var fileConverter) = scopeClass;
var (options, tenantManager, userManager, securityContext, daoFactory, fileSecurity, pathProvider, setupInfo, fileUtility, documentServiceHelper, documentServiceConnector, entryManager, fileConverter) = scopeClass;
var logger = options.CurrentValue;
try

4
web/ASC.Web.Core/Notify/NotifyConfiguration.cs
View File

@ -133,7 +133,7 @@ namespace ASC.Web.Studio.Core.Notify
(r, p, scope) =>
{
var scopeClass = scope.ServiceProvider.GetService<NotifyConfigurationScope>();
(var tenantManager, var webItemSecurity, var userManager, var options, var tenantExtra, var webItemManagerSecurity, var webItemManager, var configuration, var tenantLogoManager, var additionalWhiteLabelSettingsHelper, var tenantUtil, var coreBaseSettings, var commonLinkUtility, var settingsManager, var studioNotifyHelper) = scopeClass;
var (tenantManager, webItemSecurity, userManager, options, _, _, _, _, _, _, _, _, _, _, _) = scopeClass;
try
{
// culture
@ -262,7 +262,7 @@ namespace ASC.Web.Studio.Core.Notify
}
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<NotifyConfigurationScope>();
(var tenantManager, var webItemSecurity, var userMan, var options, var tenantExtra, var webItemManagerSecurity, var webItemManager, var configuration, var tenantLogoManager, var additionalWhiteLabelSettingsHelper, var tenantUtil, var coreBaseSettings, var commonLinkUtility, var settingsManager, var studioNotifyHelper) = scopeClass;
var (_, webItemSecurity, _, options, tenantExtra, _, webItemManager, configuration, tenantLogoManager, additionalWhiteLabelSettingsHelper, tenantUtil, coreBaseSettings, commonLinkUtility, settingsManager, studioNotifyHelper) = scopeClass;
var log = options.CurrentValue;
commonLinkUtility.GetLocationByRequest(out var product, out var module);

2
web/ASC.Web.Core/Notify/StudioNotifyService.cs
View File

@ -829,7 +829,7 @@ namespace ASC.Web.Studio.Core.Notify
{
var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<StudioNotifyServiceScope>();
(var tenantManager, var studioNotifyServiceHelper) = scopeClass;
var (tenantManager, studioNotifyServiceHelper) = scopeClass;
tenantManager.SetCurrentTenant(tenant);
foreach (var u in users)

14
web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
View File

@ -62,7 +62,7 @@ namespace ASC.Web.Studio.Core.Notify
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<StudioNotifyServiceSenderScope>();
(var tenantManager, var userManager, var securityContext, var authContext, var studioNotifyHelper, var displayUserSettings, var tenantExtra, var coreBaseSettings) = scopeClass;
var (tenantManager, userManager, securityContext, studioNotifyHelper, _, _) = scopeClass;
tenantManager.SetCurrentTenant(item.TenantId);
CultureInfo culture = null;
@ -109,7 +109,7 @@ namespace ASC.Web.Studio.Core.Notify
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<StudioNotifyServiceSenderScope>();
(var tenantManager, var userManager, var securityContext, var authContext, var studioNotifyHelper, var displayUserSettings, var tenantExtra, var coreBaseSettings) = scopeClass;
var (_, _, _, _, tenantExtra, coreBaseSettings) = scopeClass;
if (Configuration["core:notify:tariff"] != "false")
{
if (tenantExtra.Enterprise)
@ -176,27 +176,21 @@ namespace ASC.Web.Studio.Core.Notify
private TenantManager TenantManager { get; }
private UserManager UserManager { get; }
private SecurityContext SecurityContext { get; }
private AuthContext AuthContext { get; }
private StudioNotifyHelper StudioNotifyHelper { get; }
private DisplayUserSettings DisplayUserSettings { get; }
private TenantExtra TenantExtra { get; }
private CoreBaseSettings CoreBaseSettings { get; }
public StudioNotifyServiceSenderScope(TenantManager tenantManager,
UserManager userManager,
SecurityContext securityContext,
AuthContext authContext,
StudioNotifyHelper studioNotifyHelper,
DisplayUserSettings displayUserSettings,
TenantExtra tenantExtra,
CoreBaseSettings coreBaseSettings)
{
TenantManager = tenantManager;
UserManager = userManager;
SecurityContext = securityContext;
AuthContext = authContext;
StudioNotifyHelper = studioNotifyHelper;
DisplayUserSettings = displayUserSettings;
TenantExtra = tenantExtra;
CoreBaseSettings = coreBaseSettings;
}
@ -204,18 +198,14 @@ namespace ASC.Web.Studio.Core.Notify
public void Deconstruct(out TenantManager tenantManager,
out UserManager userManager,
out SecurityContext securityContext,
out AuthContext authContext,
out StudioNotifyHelper studioNotifyHelper,
out DisplayUserSettings displayUserSettings,
out TenantExtra tenantExtra,
out CoreBaseSettings coreBaseSettings)
{
tenantManager = TenantManager;
userManager = UserManager;
securityContext = SecurityContext;
authContext = AuthContext;
studioNotifyHelper = StudioNotifyHelper;
displayUserSettings = DisplayUserSettings;
tenantExtra = TenantExtra;
coreBaseSettings = CoreBaseSettings;
}

8
web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
View File

@ -94,7 +94,7 @@ namespace ASC.Web.Studio.Core.Notify
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<StudioPeriodicNotifyScope>();
(var tenantManager, var userManager, var studioNotifyHelper, var paymentManager, var tenantExtra, var authContext, var commonLinkUtility, var apiSystemHelper, var setupInfo, var dbContextManager, var couponManager, var configuration, var settingsManager, var coreBaseSettings, var displayUserSettingsHelper, var authManager, var securityContext) = scopeClass;
var (tenantManager, userManager, studioNotifyHelper, paymentManager, tenantExtra, authContext, commonLinkUtility, apiSystemHelper, setupInfo, dbContextManager, couponManager, _, _, _, _, _, _) = scopeClass;
tenantManager.SetCurrentTenant(tenant.TenantId);
var client = WorkContext.NotifyContext.NotifyService.RegisterClient(studioNotifyHelper.NotifySource, scope);
@ -543,7 +543,7 @@ namespace ASC.Web.Studio.Core.Notify
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<StudioPeriodicNotifyScope>();
(var tenantManager, var userManager, var studioNotifyHelper, var paymentManager, var tenantExtra, var authContext, var commonLinkUtility, var apiSystemHelper, var setupInfo, var dbContextManager, var couponManager, var configuration, var settingsManager, var coreBaseSettings, var displayUserSettingsHelper, var authManager, var securityContext) = scopeClass;
var (tenantManager, userManager, studioNotifyHelper, paymentManager, tenantExtra, _, commonLinkUtility, _, _, dbContextManager, _, configuration, settingsManager, coreBaseSettings, _, _, _) = scopeClass;
var defaultRebranding = MailWhiteLabelSettings.IsDefault(settingsManager, configuration);
tenantManager.SetCurrentTenant(tenant.TenantId);
var client = WorkContext.NotifyContext.NotifyService.RegisterClient(studioNotifyHelper.NotifySource, scope);
@ -930,7 +930,7 @@ namespace ASC.Web.Studio.Core.Notify
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<StudioPeriodicNotifyScope>();
(var tenantManager, var userManager, var studioNotifyHelper, var paymentManager, var tenantExtra, var authContext, var commonLinkUtility, var apiSystemHelper, var setupInfo, var dbContextManager, var couponManager, var configuration, var settingsManager, var coreBaseSettings, var displayUserSettingsHelper, var authManager, var securityContext) = scopeClass;
var (tenantManager, _, studioNotifyHelper, _, _, _, _, _, _, _, _, _, _, _, displayUserSettingsHelper, _, _) = scopeClass;
tenantManager.SetCurrentTenant(tenant.TenantId);
var client = WorkContext.NotifyContext.NotifyService.RegisterClient(studioNotifyHelper.NotifySource, scope);
@ -1113,7 +1113,7 @@ namespace ASC.Web.Studio.Core.Notify
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<StudioPeriodicNotifyScope>();
(var tenantManager, var userManager, var studioNotifyHelper, var paymentManager, var tenantExtra, var authContext, var commonLinkUtility, var apiSystemHelper, var setupInfo, var dbContextManager, var couponManager, var configuration, var settingsManager, var coreBaseSettings, var displayUserSettingsHelper, var authManager, var securityContext) = scopeClass;
var (tenantManager, userManager, studioNotifyHelper, _, _, _, _, _, _, _, _, _, _, coreBaseSettings, _, authManager, securityContext) = scopeClass;
tenantManager.SetCurrentTenant(tenant.TenantId);
var client = WorkContext.NotifyContext.NotifyService.RegisterClient(studioNotifyHelper.NotifySource, scope);

2
web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
View File

@ -83,7 +83,7 @@ namespace ASC.Web.Studio.Core.Notify
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<StudioWhatsNewNotifyScope>();
(var tenantManager, var paymentManager, var tenantUtil, var studioNotifyHelper, var userManager, var securityContext, var authContext, var authManager, var commonLinkUtility, var displayUserSettingsHelper, var feedAggregateDataProvider, var coreSettings) = scopeClass;
var (tenantManager, paymentManager, tenantUtil, studioNotifyHelper, userManager, securityContext, authContext, authManager, commonLinkUtility, displayUserSettingsHelper, feedAggregateDataProvider, coreSettings) = scopeClass;
var tenant = tenantManager.GetTenant(tenantid);
if (tenant == null ||
tenant.Status != TenantStatus.Active ||

2
web/ASC.Web.Core/QuotaSync.cs
View File

@ -54,7 +54,7 @@ namespace ASC.Web.Studio.Core.Quota
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<QuotaSyncScope>();
(var tenantManager, var storageFactoryConfig, var storageFactory) = scopeClass;
var (tenantManager, storageFactoryConfig, storageFactory) = scopeClass;
tenantManager.SetCurrentTenant(TenantId);
var storageModules = storageFactoryConfig.GetModuleList(string.Empty).ToList();