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

async refactoring

Browse Source
This commit is contained in:
pavelbannov 2023-05-19 14:42:02 +03:00
parent e74e4489c6
commit 8d7219c0e0
54 changed files with 137 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/ASC.Core.Common/Context/Impl/AuthManager.cs
View File

@ -50,12 +50,12 @@ public class AuthManager
public async Task SetUserPasswordHashAsync(Guid userID, string passwordHash)
{
await _userService.SetUserPasswordHashAsync((await _tenantManager.GetCurrentTenantAsync()).Id, userID, passwordHash);
await _userService.SetUserPasswordHashAsync(await _tenantManager.GetCurrentTenantIdAsync(), userID, passwordHash);
}
public async Task<DateTime> GetUserPasswordStampAsync(Guid userID)
{
return await _userService.GetUserPasswordStampAsync((await _tenantManager.GetCurrentTenantAsync()).Id, userID);
return await _userService.GetUserPasswordStampAsync(await _tenantManager.GetCurrentTenantIdAsync(), userID);
}
public async Task<IAccount> GetAccountByIDAsync(int tenantId, Guid id)
@ -68,7 +68,7 @@ public class AuthManager
var u = await _userManager.GetUsersAsync(id);
return !Users.Constants.LostUser.Equals(u) && u.Status == EmployeeStatus.Active ? (IAccount)ToAccount(tenantId, u) : Configuration.Constants.Guest;
return !Users.Constants.LostUser.Equals(u) && u.Status == EmployeeStatus.Active ? ToAccount(tenantId, u) : Configuration.Constants.Guest;
}
private IUserAccount ToAccount(int tenantId, UserInfo u)

10
common/ASC.Core.Common/Context/Impl/AuthorizationManager.cs
View File

@ -41,7 +41,7 @@ public class AuthorizationManager
public async Task<IEnumerable<AzRecord>> GetAcesAsync(Guid subjectId, Guid actionId)
{
var aces = await _service.GetAcesAsync((await _tenantManager.GetCurrentTenantAsync()).Id, default);
var aces = await _service.GetAcesAsync(await _tenantManager.GetCurrentTenantIdAsync(), default);
return aces
.Where(a => a.Action == actionId && (a.Subject == subjectId || subjectId == Guid.Empty))
@ -50,7 +50,7 @@ public class AuthorizationManager
public async Task<IEnumerable<AzRecord>> GetAcesAsync(Guid subjectId, Guid actionId, ISecurityObjectId objectId)
{
var aces = await _service.GetAcesAsync((await _tenantManager.GetCurrentTenantAsync()).Id, default);
var aces = await _service.GetAcesAsync(await _tenantManager.GetCurrentTenantIdAsync(), default);
return FilterAces(aces, subjectId, actionId, objectId)
.ToList();
@ -64,7 +64,7 @@ public class AuthorizationManager
}
var result = new List<AzRecord>();
var aces = await _service.GetAcesAsync((await _tenantManager.GetCurrentTenantAsync()).Id, default);
var aces = await _service.GetAcesAsync(await _tenantManager.GetCurrentTenantIdAsync(), default);
result.AddRange(FilterAces(aces, subjectId, actionId, objectId));
var inherits = new List<AzRecord>();
@ -83,12 +83,12 @@ public class AuthorizationManager
public async Task AddAceAsync(AzRecord r)
{
await _service.SaveAceAsync((await _tenantManager.GetCurrentTenantAsync()).Id, r);
await _service.SaveAceAsync(await _tenantManager.GetCurrentTenantIdAsync(), r);
}
public async Task RemoveAceAsync(AzRecord r)
{
await _service.RemoveAceAsync((await _tenantManager.GetCurrentTenantAsync()).Id, r);
await _service.RemoveAceAsync(await _tenantManager.GetCurrentTenantIdAsync(), r);
}
public async Task RemoveAllAcesAsync(ISecurityObjectId id)

6
common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
View File

@ -352,7 +352,7 @@ public class CoreConfiguration
public async Task SetSmtpSettingsAsync(SmtpSettings value)
{
await SaveSettingAsync("SmtpSettings", value?.Serialize(), (await _tenantManager.GetCurrentTenantAsync()).Id);
await SaveSettingAsync("SmtpSettings", value?.Serialize(), await _tenantManager.GetCurrentTenantIdAsync());
}
private readonly CoreSettings _coreSettings;
@ -392,7 +392,7 @@ public class CoreConfiguration
public async Task<T> GetSectionAsync<T>(string sectionName) where T : class
{
return await GetSectionAsync<T>((await _tenantManager.GetCurrentTenantAsync()).Id, sectionName);
return await GetSectionAsync<T>(await _tenantManager.GetCurrentTenantIdAsync(), sectionName);
}
public async Task<T> GetSectionAsync<T>(int tenantId, string sectionName) where T : class
@ -408,7 +408,7 @@ public class CoreConfiguration
public async Task SaveSectionAsync<T>(string sectionName, T section) where T : class
{
await SaveSectionAsync((await _tenantManager.GetCurrentTenantAsync()).Id, sectionName, section);
await SaveSectionAsync(await _tenantManager.GetCurrentTenantIdAsync(), sectionName, section);
}
public async Task SaveSectionAsync<T>(T section) where T : class

2
common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs
View File

@ -224,6 +224,6 @@ public class SubscriptionManager
private async Task<int> GetTenantAsync()
{
return (await _tenantManager.GetCurrentTenantAsync()).Id;
return await _tenantManager.GetCurrentTenantIdAsync();
}
}

7
common/ASC.Core.Common/Context/Impl/TenantManager.cs
View File

@ -45,7 +45,7 @@ public class TenantManager
internal CoreBaseSettings CoreBaseSettings { get; set; }
internal CoreSettings CoreSettings { get; set; }
private readonly static SemaphoreSlim _semaphore = new SemaphoreSlim(1);
private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1);
static TenantManager()
{
@ -313,6 +313,11 @@ public class TenantManager
return await GetCurrentTenantAsync(true);
}
public async Task<int> GetCurrentTenantIdAsync()
{
return (await GetCurrentTenantAsync(true)).Id;
}
public Tenant GetCurrentTenant()
{
return GetCurrentTenant(true);

16
common/ASC.Core.Common/Context/Impl/UserManager.cs
View File

@ -206,7 +206,7 @@ public class UserManager
public async Task<UserInfo> GetUserByUserNameAsync(string username)
{
var u = await _userService.GetUserByUserName((await _tenantManager.GetCurrentTenantAsync()).Id, username);
var u = await _userService.GetUserByUserName(await _tenantManager.GetCurrentTenantIdAsync(), username);
return u ?? Constants.LostUser;
}
@ -389,7 +389,7 @@ public class UserManager
public async Task<UserInfo> UpdateUserInfoWithSyncCardDavAsync(UserInfo u)
{
var oldUserData = await _userService.GetUserByUserName((await _tenantManager.GetCurrentTenantAsync()).Id, u.UserName);
var oldUserData = await _userService.GetUserByUserName(await _tenantManager.GetCurrentTenantIdAsync(), u.UserName);
var newUser = await UpdateUserInfoAsync(u);
@ -418,7 +418,7 @@ public class UserManager
}
}
var oldUserData = await _userService.GetUserByUserName((await _tenantManager.GetCurrentTenantAsync()).Id, u.UserName);
var oldUserData = await _userService.GetUserByUserName(await _tenantManager.GetCurrentTenantIdAsync(), u.UserName);
if (oldUserData != null && !Equals(oldUserData, Constants.LostUser))
{
@ -434,7 +434,7 @@ public class UserManager
await _countPaidUserChecker.CheckAppend();
}
var newUser = await _userService.SaveUserAsync((await _tenantManager.GetCurrentTenantAsync()).Id, u);
var newUser = await _userService.SaveUserAsync(await _tenantManager.GetCurrentTenantIdAsync(), u);
if (syncCardDav)
{
await SyncCardDavAsync(u, oldUserData, newUser);
@ -488,7 +488,7 @@ public class UserManager
var cardDavUser = new CardDavItem(u.Id, u.FirstName, u.LastName, u.UserName, u.BirthDate, u.Sex, u.Title, u.Email, u.ContactsList, u.MobilePhone);
try
{
await _cardDavAddressbook.UpdateItemForAllAddBooks(allUserEmails, myUri, cardDavUser, (await _tenantManager.GetCurrentTenantAsync()).Id, oldUserData != null && oldUserData.Email != newUser.Email ? oldUserData.Email : null);
await _cardDavAddressbook.UpdateItemForAllAddBooks(allUserEmails, myUri, cardDavUser, await _tenantManager.GetCurrentTenantIdAsync(), oldUserData != null && oldUserData.Email != newUser.Email ? oldUserData.Email : null);
}
catch (Exception ex)
{
@ -504,7 +504,7 @@ public class UserManager
public async Task<IEnumerable<string>> GetDavUserEmailsAsync()
{
return await _userService.GetDavUserEmailsAsync((await _tenantManager.GetCurrentTenantAsync()).Id);
return await _userService.GetDavUserEmailsAsync(await _tenantManager.GetCurrentTenantIdAsync());
}
public async Task<IEnumerable<int>> GetTenantsWithFeedsAsync(DateTime from)
@ -701,7 +701,7 @@ public class UserManager
var isUser = await this.IsUserAsync(user);
var isPaidUser = await IsPaidUserAsync(user);
await _permissionContext.DemandPermissionsAsync(new UserGroupObject(new UserAccount(user, (await _tenantManager.GetCurrentTenantAsync()).Id, _userFormatter), groupId),
await _permissionContext.DemandPermissionsAsync(new UserGroupObject(new UserAccount(user, await _tenantManager.GetCurrentTenantIdAsync(), _userFormatter), groupId),
Constants.Action_EditGroups);
await _userService.SaveUserGroupRefAsync(Tenant.Id, new UserGroupRef(userId, groupId, UserGroupRefType.Contains));
@ -745,7 +745,7 @@ public class UserManager
var isUserBefore = await this.IsUserAsync(user);
var isPaidUserBefore = await IsPaidUserAsync(user);
await _permissionContext.DemandPermissionsAsync(new UserGroupObject(new UserAccount(user, (await _tenantManager.GetCurrentTenantAsync()).Id, _userFormatter), groupId),
await _permissionContext.DemandPermissionsAsync(new UserGroupObject(new UserAccount(user, await _tenantManager.GetCurrentTenantIdAsync(), _userFormatter), groupId),
Constants.Action_EditGroups);
await _userService.RemoveUserGroupRefAsync(Tenant.Id, userId, groupId, UserGroupRefType.Contains);

14
common/ASC.Core.Common/Context/SecurityContext.cs
View File

@ -89,7 +89,7 @@ public class SecurityContext
ArgumentNullException.ThrowIfNull(login);
ArgumentNullException.ThrowIfNull(passwordHash);
var tenantid = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantid = await _tenantManager.GetCurrentTenantIdAsync();
var u = await _userManager.GetUsersByPasswordHashAsync(tenantid, login, passwordHash);
return await AuthenticateMeAsync(new UserAccount(u, tenantid, _userFormatter), funcLoginEvent);
@ -136,7 +136,7 @@ public class SecurityContext
return false;
}
if (tenant != (await _tenantManager.GetCurrentTenantAsync()).Id)
if (tenant != await _tenantManager.GetCurrentTenantIdAsync())
{
return false;
}
@ -190,7 +190,7 @@ public class SecurityContext
public async Task<string> AuthenticateMeAsync(Guid userId, Func<Task<int>> funcLoginEvent = null, List<Claim> additionalClaims = null)
{
var account = await _authentication.GetAccountByIDAsync((await _tenantManager.GetCurrentTenantAsync()).Id, userId);
var account = await _authentication.GetAccountByIDAsync(await _tenantManager.GetCurrentTenantIdAsync(), userId);
return await AuthenticateMeAsync(account, funcLoginEvent, additionalClaims);
}
@ -208,7 +208,7 @@ public class SecurityContext
loginEventId = await funcLoginEvent();
}
cookie = await _cookieStorage.EncryptCookieAsync((await _tenantManager.GetCurrentTenantAsync()).Id, account.ID, loginEventId);
cookie = await _cookieStorage.EncryptCookieAsync(await _tenantManager.GetCurrentTenantIdAsync(), account.ID, loginEventId);
}
return cookie;
@ -259,7 +259,7 @@ public class SecurityContext
roles.Add(Role.RoomAdministrators);
account = new UserAccount(u, (await _tenantManager.GetCurrentTenantAsync()).Id, _userFormatter);
account = new UserAccount(u, await _tenantManager.GetCurrentTenantIdAsync(), _userFormatter);
}
var claims = new List<Claim>
@ -279,7 +279,7 @@ public class SecurityContext
public async Task AuthenticateMeWithoutCookieAsync(Guid userId, List<Claim> additionalClaims = null)
{
var account = await _authentication.GetAccountByIDAsync((await _tenantManager.GetCurrentTenantAsync()).Id, userId);
var account = await _authentication.GetAccountByIDAsync(await _tenantManager.GetCurrentTenantIdAsync(), userId);
await AuthenticateMeWithoutCookieAsync(account, additionalClaims);
}
@ -291,7 +291,7 @@ public class SecurityContext
public async Task SetUserPasswordHashAsync(Guid userID, string passwordHash)
{
var tenantid = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantid = await _tenantManager.GetCurrentTenantIdAsync();
var u = await _userManager.GetUsersByPasswordHashAsync(tenantid, userID.ToString(), passwordHash);
if (!Equals(u, Users.Constants.LostUser))
{

2
common/ASC.Core.Common/Data/DbLoginEventsManager.cs
View File

@ -128,7 +128,7 @@ public class DbLoginEventsManager
public async Task ResetCacheAsync()
{
var tenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantId = await _tenantManager.GetCurrentTenantIdAsync();
var userId = _authContext.CurrentAccount.ID;
ResetCache(tenantId, userId);
}

2
common/ASC.Core.Common/Notify/Jabber/JabberServiceClient.cs
View File

@ -260,7 +260,7 @@ public class JabberServiceClient
private async Task<int> GetCurrentTenantIdAsync()
{
return (await _tenantManager.GetCurrentTenantAsync()).Id;
return await _tenantManager.GetCurrentTenantIdAsync();
}
private async Task<string> GetCurrentUserNameAsync()

4
common/ASC.Core.Common/Notify/Push/FirebaseHelper.cs
View File

@ -112,7 +112,7 @@ public class FirebaseHelper
public async Task<FireBaseUser> RegisterUserDeviceAsync(string fbDeviceToken, bool isSubscribed, string application)
{
var userId = _authContext.CurrentAccount.ID;
var tenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantId = await _tenantManager.GetCurrentTenantIdAsync();
return await _firebaseDao.RegisterUserDeviceAsync(userId, tenantId, fbDeviceToken, isSubscribed, application);
}
@ -120,7 +120,7 @@ public class FirebaseHelper
public async Task<FireBaseUser> UpdateUserAsync(string fbDeviceToken, bool isSubscribed, string application)
{
var userId = _authContext.CurrentAccount.ID;
var tenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantId = await _tenantManager.GetCurrentTenantIdAsync();
return await _firebaseDao.UpdateUserAsync(userId, tenantId, fbDeviceToken, isSubscribed, application);
}

2
common/ASC.Core.Common/Quota/ITenantQuotaFeatureChecker.cs
View File

@ -53,7 +53,7 @@ public abstract class TenantQuotaFeatureChecker<T, T1> : ITenantQuotaFeatureChec
public async Task CheckAddAsync(T1 newValue)
{
await CheckAddAsync((await _tenantManager.GetCurrentTenantAsync()).Id, newValue);
await CheckAddAsync(await _tenantManager.GetCurrentTenantIdAsync(), newValue);
}
public virtual async Task CheckAddAsync(int tenantId, T1 newValue)

6
common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
View File

@ -70,7 +70,7 @@ public class EmailValidationKeyProvider
public async Task<string> GetEmailKeyAsync(string email)
{
return GetEmailKey((await _tenantManager.GetCurrentTenantAsync()).Id, email);
return GetEmailKey(await _tenantManager.GetCurrentTenantIdAsync(), email);
}
public string GetEmailKey(string email)
@ -114,7 +114,7 @@ public class EmailValidationKeyProvider
public async Task<ValidationResult> ValidateEmailKeyAsync(string email, string key, TimeSpan validInterval)
{
var result = await ValidateEmailKeyInternalAsync(email, key, validInterval);
_logger.DebugValidationResult(result, email, key, validInterval, (await _tenantManager.GetCurrentTenantAsync()).Id);
_logger.DebugValidationResult(result, email, key, validInterval, await _tenantManager.GetCurrentTenantIdAsync());
return result;
}
@ -124,7 +124,7 @@ public class EmailValidationKeyProvider
ArgumentNullOrEmptyException.ThrowIfNullOrEmpty(email);
ArgumentNullException.ThrowIfNull(key);
email = FormatEmail((await _tenantManager.GetCurrentTenantAsync()).Id, email);
email = FormatEmail(await _tenantManager.GetCurrentTenantIdAsync(), email);
var parts = key.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries);
if (parts.Length != 2)
{

12
common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
View File

@ -150,7 +150,7 @@ public class BackupAjaxHandler
var scheduleRequest = new CreateScheduleRequest
{
TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id,
TenantId = await _tenantManager.GetCurrentTenantIdAsync(),
Cron = cronParams.ToString(),
NumberOfBackupsStored = backupsStored,
StorageType = storageType,
@ -217,7 +217,7 @@ public class BackupAjaxHandler
var Schedule = new CreateScheduleRequest
{
TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id,
TenantId = await _tenantManager.GetCurrentTenantIdAsync(),
Cron = schedule.CronParams.ToString(),
NumberOfBackupsStored = schedule.BackupsStored == null ? 0 : (int)schedule.BackupsStored,
StorageType = schedule.StorageType,
@ -299,7 +299,7 @@ public class BackupAjaxHandler
{
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
var quota = await _tenantManager.GetTenantQuotaAsync((await _tenantManager.GetCurrentTenantAsync()).Id);
var quota = await _tenantManager.GetTenantQuotaAsync(await _tenantManager.GetCurrentTenantIdAsync());
if (!SetupInfo.IsVisibleSettings("Restore") ||
(!_coreBaseSettings.Standalone && !quota.AutoBackupRestore))
{
@ -320,7 +320,7 @@ public class BackupAjaxHandler
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
if (!SetupInfo.IsVisibleSettings("AutoBackup") ||
(!_coreBaseSettings.Standalone && !(await _tenantManager.GetTenantQuotaAsync((await _tenantManager.GetCurrentTenantAsync()).Id)).AutoBackupRestore))
(!_coreBaseSettings.Standalone && !(await _tenantManager.GetTenantQuotaAsync(await _tenantManager.GetCurrentTenantIdAsync())).AutoBackupRestore))
{
throw new BillingException(Resource.ErrorNotAllowedOption, "AutoBackup");
}
@ -377,12 +377,12 @@ public class BackupAjaxHandler
private async Task<int> GetCurrentTenantIdAsync()
{
return (await _tenantManager.GetCurrentTenantAsync()).Id;
return await _tenantManager.GetCurrentTenantIdAsync();
}
public async Task<string> GetTmpFilePathAsync()
{
var discStore = await _storageFactory.GetStorageAsync((await _tenantManager.GetCurrentTenantAsync()).Id, BackupTempModule, (IQuotaController)null) as DiscDataStore;
var discStore = await _storageFactory.GetStorageAsync(await _tenantManager.GetCurrentTenantIdAsync(), BackupTempModule, (IQuotaController)null) as DiscDataStore;
var folder = discStore.GetPhysicalPath("", "");
if (!Directory.Exists(folder))

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

@ -201,12 +201,12 @@ public class StorageSettingsHelper
}
return _dataStore = ((IDataStore)_serviceProvider.GetService(DataStoreConsumer(baseStorageSettings).HandlerType))
.Configure((await _tenantManager.GetCurrentTenantAsync()).Id.ToString(), null, null, DataStoreConsumer(baseStorageSettings));
.Configure((await _tenantManager.GetCurrentTenantIdAsync()).ToString(), null, null, DataStoreConsumer(baseStorageSettings));
}
internal async Task ClearDataStoreCacheAsync()
{
var path = TenantPath.CreatePath((await _tenantManager.GetCurrentTenantAsync()).Id);
var path = TenantPath.CreatePath(await _tenantManager.GetCurrentTenantIdAsync());
foreach (var module in _storageFactoryConfig.GetModuleList("", true))
{

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

@ -80,7 +80,7 @@ public class StaticUploader
return null;
}
var tenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantId = await _tenantManager.GetCurrentTenantIdAsync();
var key = GetCacheKey(tenantId.ToString(), relativePath);
lock (_locker)

2
common/ASC.Feed/Data/FeedReadedDataProvider.cs
View File

@ -113,7 +113,7 @@ public class FeedReadedDataProvider
private async Task<int> GetTenantAsync()
{
return (await _tenantManager.GetCurrentTenantAsync()).Id;
return await _tenantManager.GetCurrentTenantIdAsync();
}
private Guid GetUser()

8
common/ASC.MessagingSystem/Core/MessageFactory.cs
View File

@ -49,7 +49,7 @@ public class MessageFactory
Ip = MessageSettings.GetIP(request),
Initiator = initiator,
Date = dateTime.HasValue ? dateTime.Value : DateTime.UtcNow,
TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id,
TenantId = await _tenantManager.GetCurrentTenantIdAsync(),
UserId = _authContext.CurrentAccount.ID,
Page = MessageSettings.GetReferer(request),
Action = action,
@ -73,7 +73,7 @@ public class MessageFactory
var message = new EventMessage
{
Date = DateTime.UtcNow,
TenantId = userData == null ? (await _tenantManager.GetCurrentTenantAsync()).Id : userData.TenantId,
TenantId = userData == null ? await _tenantManager.GetCurrentTenantIdAsync() : userData.TenantId,
UserId = userData == null ? _authContext.CurrentAccount.ID : userData.UserId,
Action = action,
Description = description,
@ -109,7 +109,7 @@ public class MessageFactory
{
Initiator = initiator,
Date = DateTime.UtcNow,
TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id,
TenantId = await _tenantManager.GetCurrentTenantIdAsync(),
Action = action,
Description = description,
Target = target
@ -130,7 +130,7 @@ public class MessageFactory
var message = new EventMessage
{
Date = DateTime.UtcNow,
TenantId = userData == null ? (await _tenantManager.GetCurrentTenantAsync()).Id : userData.TenantId,
TenantId = userData == null ? await _tenantManager.GetCurrentTenantIdAsync() : userData.TenantId,
UserId = userData == null ? _authContext.CurrentAccount.ID : userData.UserId,
Action = action,
Active = true

4
common/ASC.Webhooks.Core/DbWorker.cs
View File

@ -140,7 +140,7 @@ public class DbWorker
public async Task<WebhooksConfig> RemoveWebhookConfigAsync(int id)
{
var tenant = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenant = await _tenantManager.GetCurrentTenantIdAsync();
using var webhooksDbContext = _dbContextFactory.CreateDbContext();
@ -206,7 +206,7 @@ public class DbWorker
public async Task<WebhooksLog> WriteToJournal(WebhooksLog webhook)
{
webhook.TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
webhook.TenantId = await _tenantManager.GetCurrentTenantIdAsync();
webhook.Uid = _authContext.CurrentAccount.ID;
using var webhooksDbContext = _dbContextFactory.CreateDbContext();

2
common/services/ASC.AuditTrail/Repositories/AuditEventsRepository.cs
View File

@ -118,7 +118,7 @@ public class AuditEventsRepository
int limit = 0,
Guid? withoutUserId = null)
{
var tenant = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenant = await _tenantManager.GetCurrentTenantIdAsync();
using var auditTrailContext = _dbContextFactory.CreateDbContext();
var query =
from q in auditTrailContext.AuditEvents

2
common/services/ASC.AuditTrail/Repositories/LoginEventsRepository.cs
View File

@ -51,7 +51,7 @@ public class LoginEventsRepository
int startIndex = 0,
int limit = 0)
{
var tenant = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenant = await _tenantManager.GetCurrentTenantIdAsync();
using var messagesContext = _dbContextFactory.CreateDbContext();
var query =

4
common/services/ASC.ElasticSearch/Core/SearchSettings.cs
View File

@ -130,7 +130,7 @@ public class SearchSettingsHelper
settings.Data = JsonConvert.SerializeObject(items);
await _settingsManager.SaveAsync(settings);
var action = new ReIndexAction() { Tenant = (await _tenantManager.GetCurrentTenantAsync()).Id };
var action = new ReIndexAction() { Tenant = await _tenantManager.GetCurrentTenantIdAsync() };
action.Names.AddRange(toReIndex.Select(r => r.ID).ToList());
_cacheNotify.Publish(action, CacheNotifyAction.Any);
@ -170,7 +170,7 @@ public class SearchSettingsHelper
public async Task<bool> CanSearchByContentAsync(Type t)
{
var tenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantId = await _tenantManager.GetCurrentTenantIdAsync();
if (!await CanIndexByContentAsync(t, tenantId))
{
return false;

8
common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
View File

@ -172,7 +172,7 @@ public class FactoryIndexer<T> : IFactoryIndexer where T : class, ISearchItem
public async Task<bool> CanIndexByContentAsync(T t)
{
return Support(t) && await _searchSettingsHelper.CanIndexByContentAsync<T>((await _tenantManager.GetCurrentTenantAsync()).Id);
return Support(t) && await _searchSettingsHelper.CanIndexByContentAsync<T>(await _tenantManager.GetCurrentTenantIdAsync());
}
public async Task<bool> Index(T data, bool immediately = true)
@ -410,7 +410,7 @@ public class FactoryIndexer<T> : IFactoryIndexer where T : class, ISearchItem
try
{
var tenant = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenant = await _tenantManager.GetCurrentTenantIdAsync();
_indexer.Update(data, expression, tenant, immediately, fields);
}
catch (Exception e)
@ -429,7 +429,7 @@ public class FactoryIndexer<T> : IFactoryIndexer where T : class, ISearchItem
try
{
var tenant = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenant = await _tenantManager.GetCurrentTenantIdAsync();
_indexer.Update(data, expression, tenant, action, fields, immediately);
}
catch (Exception e)
@ -492,7 +492,7 @@ public class FactoryIndexer<T> : IFactoryIndexer where T : class, ISearchItem
return false;
}
var tenant = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenant = await _tenantManager.GetCurrentTenantIdAsync();
return await QueueAsync(() => _indexer.Delete(expression, tenant, immediately));
}

2
products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
View File

@ -121,7 +121,7 @@ public class FilesSpaceUsageStatManager : SpaceUsageStatManager, IUserSpaceUsage
public async Task<long> GetUserSpaceUsageAsync(Guid userId)
{
var tenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantId = await _tenantManager.GetCurrentTenantIdAsync();
var my = await _globalFolder.GetFolderMyAsync(_fileMarker, _daoFactory);
var trash = await _globalFolder.GetFolderTrashAsync(_daoFactory);

12
products/ASC.Files/Core/Core/FileStorageService.cs
View File

@ -893,7 +893,7 @@ public class FileStorageService //: IFileStorageService
file = await fileDao.SaveFileAsync(file, null);
}
int counter = 0;
var counter = 0;
foreach (var size in _thumbnailSettings.Sizes)
{
@ -1954,7 +1954,7 @@ public class FileStorageService //: IFileStorageService
public async Task DeleteDocuSignAsync()
{
await _docuSignToken.DeleteTokenAsync();
await _docuSignToken.DeleteTokenAsync();
}
public async Task<string> SendDocuSignAsync<T>(T fileId, DocuSignData docuSignData)
@ -2698,7 +2698,7 @@ public class FileStorageService //: IFileStorageService
{
File<T> file = null;
var fileDao = _daoFactory.GetFileDao<T>();
if (portalName == (await _tenantManager.GetCurrentTenantAsync()).Id.ToString())
if (portalName == (await _tenantManager.GetCurrentTenantIdAsync()).ToString())
{
file = await fileDao.GetFileAsync(fileId);
}
@ -2751,7 +2751,7 @@ public class FileStorageService //: IFileStorageService
ReferenceData = new FileReferenceData<T>
{
FileKey = file.Id,
InstanceId = (await _tenantManager.GetCurrentTenantAsync()).Id.ToString()
InstanceId = (await _tenantManager.GetCurrentTenantIdAsync()).ToString()
},
Url = await _documentServiceConnector.ReplaceCommunityAdressAsync(await _pathProvider.GetFileStreamUrlAsync(file, lastVersion: true)),
FileType = file.ConvertedExtension.Trim('.')
@ -2913,7 +2913,7 @@ public class FileStorageService //: IFileStorageService
{
await _notifyClient.SendEditorMentions(file, fileLink, recipients, message);
}
catch(Exception ex)
catch (Exception ex)
{
_logger.ErrorWithException(ex);
}
@ -3218,7 +3218,7 @@ public class FileStorageService //: IFileStorageService
{
var (fileIntIds, _) = FileOperationsManager.GetIds(fileIds);
_eventBus.Publish(new ThumbnailRequestedIntegrationEvent(_authContext.CurrentAccount.ID, (await _tenantManager.GetCurrentTenantAsync()).Id)
_eventBus.Publish(new ThumbnailRequestedIntegrationEvent(_authContext.CurrentAccount.ID, await _tenantManager.GetCurrentTenantIdAsync())
{
BaseUrl = _baseCommonLinkUtility.GetFullAbsolutePath(""),
FileIds = fileIntIds

14
products/ASC.Files/Core/Core/Security/FileSecurity.cs
View File

@ -417,7 +417,7 @@ public class FileSecurity : IFileSecurity
EntryType = entry.FileEntryType,
Share = DefaultCommonShare,
Subject = Constants.GroupEveryone.ID,
TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id,
TenantId = await _tenantManager.GetCurrentTenantIdAsync(),
Owner = _authContext.CurrentAccount.ID
}
};
@ -448,7 +448,7 @@ public class FileSecurity : IFileSecurity
EntryType = entry.FileEntryType,
Share = DefaultMyShare,
Subject = entry.RootCreateBy,
TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id,
TenantId = await _tenantManager.GetCurrentTenantIdAsync(),
Owner = entry.RootCreateBy
}
};
@ -472,7 +472,7 @@ public class FileSecurity : IFileSecurity
EntryType = entry.FileEntryType,
Share = DefaultPrivacyShare,
Subject = entry.RootCreateBy,
TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id,
TenantId = await _tenantManager.GetCurrentTenantIdAsync(),
Owner = entry.RootCreateBy
}
};
@ -525,7 +525,7 @@ public class FileSecurity : IFileSecurity
EntryType = entry.FileEntryType,
Share = FileShare.Read,
Subject = Constants.GroupEveryone.ID,
TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id,
TenantId = await _tenantManager.GetCurrentTenantIdAsync(),
Owner = entry.RootCreateBy
}
};
@ -604,7 +604,7 @@ public class FileSecurity : IFileSecurity
var user = await _userManager.GetUsersAsync(userId);
var isOutsider = await _userManager.IsOutsiderAsync(user);
var isUser = await _userManager.IsUserAsync(user);
var isAuthenticated = (await _authManager.GetAccountByIDAsync((await _tenantManager.GetCurrentTenantAsync()).Id, userId)).IsAuthenticated;
var isAuthenticated = (await _authManager.GetAccountByIDAsync(await _tenantManager.GetCurrentTenantIdAsync(), userId)).IsAuthenticated;
var isDocSpaceAdmin = await _fileSecurityCommon.IsDocSpaceAdministratorAsync(userId);
var isCollaborator = await _userManager.IsCollaboratorAsync(user);
@ -645,7 +645,7 @@ public class FileSecurity : IFileSecurity
}
var isUser = await _userManager.IsUserAsync(user);
var isAuthenticated = (await _authManager.GetAccountByIDAsync((await _tenantManager.GetCurrentTenantAsync()).Id, userId)).IsAuthenticated;
var isAuthenticated = (await _authManager.GetAccountByIDAsync(await _tenantManager.GetCurrentTenantIdAsync(), userId)).IsAuthenticated;
var isDocSpaceAdmin = await _fileSecurityCommon.IsDocSpaceAdministratorAsync(userId);
var isCollaborator = await _userManager.IsCollaboratorAsync(user);
@ -1100,7 +1100,7 @@ public class FileSecurity : IFileSecurity
var securityDao = _daoFactory.GetSecurityDao<T>();
var r = new FileShareRecord
{
TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id,
TenantId = await _tenantManager.GetCurrentTenantIdAsync(),
EntryId = entryId,
EntryType = entryType,
Subject = @for,

18
products/ASC.Files/Core/Helpers/Global.cs
View File

@ -259,7 +259,7 @@ public class GlobalStore
public async Task<IDataStore> GetStoreAsync(bool currentTenant = true)
{
return await _storageFactory.GetStorageAsync(currentTenant ? (await _tenantManager.GetCurrentTenantAsync()).Id : null, FileConstant.StorageModule);
return await _storageFactory.GetStorageAsync(currentTenant ? await _tenantManager.GetCurrentTenantIdAsync() : null, FileConstant.StorageModule);
}
@ -373,7 +373,7 @@ public class GlobalFolder
return default;
}
var key = $"vrooms/{(await _tenantManager.GetCurrentTenantAsync()).Id}";
var key = $"vrooms/{await _tenantManager.GetCurrentTenantIdAsync()}";
if (DocSpaceFolderCache.TryGetValue(key, out var result))
{
@ -397,7 +397,7 @@ public class GlobalFolder
return default;
}
var key = $"archive/{(await _tenantManager.GetCurrentTenantAsync()).Id}";
var key = $"archive/{await _tenantManager.GetCurrentTenantIdAsync()}";
if (!DocSpaceFolderCache.TryGetValue(key, out var result))
{
@ -429,7 +429,7 @@ public class GlobalFolder
return default;
}
var cacheKey = $"my/{(await _tenantManager.GetCurrentTenantAsync()).Id}/{_authContext.CurrentAccount.ID}";
var cacheKey = $"my/{await _tenantManager.GetCurrentTenantIdAsync()}/{_authContext.CurrentAccount.ID}";
var myFolderId = UserRootFolderCache.GetOrAdd(cacheKey, (a) => new Lazy<int>(() => GetFolderIdAndProcessFirstVisitAsync(daoFactory, true).Result));
@ -438,13 +438,13 @@ public class GlobalFolder
protected internal async Task SetFolderMyAsync(object value)
{
var cacheKey = string.Format("my/{0}/{1}", (await _tenantManager.GetCurrentTenantAsync()).Id, value);
var cacheKey = string.Format("my/{0}/{1}", await _tenantManager.GetCurrentTenantIdAsync(), value);
UserRootFolderCache.Remove(cacheKey, out _);
}
public async Task<bool> IsFirstVisit(IDaoFactory daoFactory)
{
var cacheKey = string.Format("my/{0}/{1}", (await _tenantManager.GetCurrentTenantAsync()).Id, _authContext.CurrentAccount.ID);
var cacheKey = string.Format("my/{0}/{1}", await _tenantManager.GetCurrentTenantIdAsync(), _authContext.CurrentAccount.ID);
if (!UserRootFolderCache.TryGetValue(cacheKey, out var _))
{
@ -624,7 +624,7 @@ public class GlobalFolder
return 0;
}
var cacheKey = string.Format("privacy/{0}/{1}", (await _tenantManager.GetCurrentTenantAsync()).Id, _authContext.CurrentAccount.ID);
var cacheKey = string.Format("privacy/{0}/{1}", await _tenantManager.GetCurrentTenantIdAsync(), _authContext.CurrentAccount.ID);
if (!PrivacyFolderCache.TryGetValue(cacheKey, out var privacyFolderId))
{
@ -668,7 +668,7 @@ public class GlobalFolder
public async Task SetFolderTrashAsync(object value)
{
var cacheKey = string.Format("trash/{0}/{1}", (await _tenantManager.GetCurrentTenantAsync()).Id, value);
var cacheKey = string.Format("trash/{0}/{1}", await _tenantManager.GetCurrentTenantIdAsync(), value);
TrashFolderCache.Remove(cacheKey);
}
@ -690,7 +690,7 @@ public class GlobalFolder
return id;
}
var tenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantId = await _tenantManager.GetCurrentTenantIdAsync();
var userId = _authContext.CurrentAccount.ID;
var task = new Task(async () => await CreateSampleDocumentsAsync(_serviceProvider, tenantId, userId, id, my),

4
products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
View File

@ -171,7 +171,7 @@ public class ChunkedUploaderHandlerService
if (request.Type(_instanceCrypto) == ChunkedRequestType.Initiate)
{
await _tenantManager.SetCurrentTenantAsync(request.TenantId);
await _securityContext.AuthenticateMeWithoutCookieAsync(await _authManager.GetAccountByIDAsync((await _tenantManager.GetCurrentTenantAsync()).Id, request.AuthKey(_instanceCrypto)));
await _securityContext.AuthenticateMeWithoutCookieAsync(await _authManager.GetAccountByIDAsync(await _tenantManager.GetCurrentTenantIdAsync(), request.AuthKey(_instanceCrypto)));
var cultureInfo = request.CultureInfo(_setupInfo);
if (cultureInfo != null)
{
@ -187,7 +187,7 @@ public class ChunkedUploaderHandlerService
if (uploadSession != null)
{
await _tenantManager.SetCurrentTenantAsync(uploadSession.TenantId);
await _securityContext.AuthenticateMeWithoutCookieAsync(await _authManager.GetAccountByIDAsync((await _tenantManager.GetCurrentTenantAsync()).Id, uploadSession.UserId));
await _securityContext.AuthenticateMeWithoutCookieAsync(await _authManager.GetAccountByIDAsync(await _tenantManager.GetCurrentTenantIdAsync(), uploadSession.UserId));
var culture = _setupInfo.GetPersonalCulture(uploadSession.CultureName).Value;
if (culture != null)
{

2
products/ASC.Files/Core/ThirdPartyApp/Token.cs
View File

@ -100,7 +100,7 @@ public class TokenHelper
App = token.App,
Token = EncryptToken(token),
UserId = _authContext.CurrentAccount.ID,
TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id,
TenantId = await _tenantManager.GetCurrentTenantIdAsync(),
ModifiedOn = DateTime.UtcNow
};

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

@ -481,7 +481,7 @@ public class FileConverter
Result = string.Empty,
Processed = "",
Id = string.Empty,
TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id,
TenantId = await _tenantManager.GetCurrentTenantIdAsync(),
Account = _authContext.CurrentAccount.ID,
Delete = false,
StartDateTime = DateTime.UtcNow,

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

@ -295,7 +295,7 @@ public class FileUploader
uploadSession.Expired = uploadSession.Created + ChunkedUploadSessionHolder.SlidingExpiration;
uploadSession.Location = _filesLinkUtility.GetUploadChunkLocationUrl(uploadSession.Id);
uploadSession.TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
uploadSession.TenantId = await _tenantManager.GetCurrentTenantIdAsync();
uploadSession.UserId = _authContext.CurrentAccount.ID;
uploadSession.FolderId = folderId;
uploadSession.CultureName = CultureInfo.CurrentUICulture.Name;

4
products/ASC.Files/Core/Utils/SocketManager.cs
View File

@ -126,7 +126,7 @@ public class SocketManager : SocketServiceClient
private async Task<string> GetFileRoomAsync<T>(T fileId, Guid? owner = null)
{
var tenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantId = await _tenantManager.GetCurrentTenantIdAsync();
var ownerData = owner.HasValue ? "-" + owner.Value : "";
return $"{tenantId}-FILE-{fileId}{ownerData}";
@ -134,7 +134,7 @@ public class SocketManager : SocketServiceClient
private async Task<string> GetFolderRoomAsync<T>(T folderId, Guid? owner = null)
{
var tenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantId = await _tenantManager.GetCurrentTenantIdAsync();
var ownerData = owner.HasValue ? "-" + owner.Value : "";
return $"{tenantId}-DIR-{folderId}{ownerData}";

2
products/ASC.Files/Server/Helpers/UploadControllerHelper.cs
View File

@ -95,7 +95,7 @@ public class UploadControllerHelper : FilesHelperBase
};
}
var createSessionUrl = _filesLinkUtility.GetInitiateUploadSessionUrl((await _tenantManager.GetCurrentTenantAsync()).Id, file.ParentId, file.Id, file.Title, file.ContentLength, encrypted, _securityContext);
var createSessionUrl = _filesLinkUtility.GetInitiateUploadSessionUrl(await _tenantManager.GetCurrentTenantIdAsync(), file.ParentId, file.Id, file.Title, file.ContentLength, encrypted, _securityContext);
var httpClient = _httpClientFactory.CreateClient();

6
products/ASC.People/Server/Api/UserController.cs
View File

@ -186,7 +186,7 @@ public class UserController : PeopleControllerBase
await UpdateContactsAsync(inDto.Contacts, user);
_cache.Insert("REWRITE_URL" + (await _tenantManager.GetCurrentTenantAsync()).Id, HttpContext.Request.GetUrlRewriter().ToString(), TimeSpan.FromMinutes(5));
_cache.Insert("REWRITE_URL" + await _tenantManager.GetCurrentTenantIdAsync(), HttpContext.Request.GetUrlRewriter().ToString(), TimeSpan.FromMinutes(5));
user = await _userManagerWrapper.AddUserAsync(user, inDto.PasswordHash, true, false, inDto.Type,
false, true, true);
@ -274,7 +274,7 @@ public class UserController : PeopleControllerBase
await UpdateContactsAsync(inDto.Contacts, user, !inDto.FromInviteLink);
_cache.Insert("REWRITE_URL" + (await _tenantManager.GetCurrentTenantAsync()).Id, HttpContext.Request.GetUrlRewriter().ToString(), TimeSpan.FromMinutes(5));
_cache.Insert("REWRITE_URL" + await _tenantManager.GetCurrentTenantIdAsync(), HttpContext.Request.GetUrlRewriter().ToString(), TimeSpan.FromMinutes(5));
user = await _userManagerWrapper.AddUserAsync(user, inDto.PasswordHash, inDto.FromInviteLink, true, inDto.Type,
inDto.FromInviteLink && linkData is { IsCorrect: true }, true, true, byEmail);
@ -1146,7 +1146,7 @@ public class UserController : PeopleControllerBase
{
var usedSpace = Math.Max(0,
(await _quotaService.FindUserQuotaRowsAsync(
(await _tenantManager.GetCurrentTenantAsync()).Id,
await _tenantManager.GetCurrentTenantIdAsync(),
user.Id
))
.Where(r => !string.IsNullOrEmpty(r.Tag)).Sum(r => r.Counter));

4
web/ASC.Web.Api/Api/AuthenticationController.cs
View File

@ -277,7 +277,7 @@ public class AuthenticationController : ControllerBase
var action = viaEmail ? MessageAction.LoginSuccessViaApi : MessageAction.LoginSuccessViaApiSocialAccount;
var token = await _cookiesManager.AuthenticateMeAndSetCookiesAsync(user.Tenant, user.Id, action);
var tenant = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenant = await _tenantManager.GetCurrentTenantIdAsync();
var expires = await _tenantCookieSettingsHelper.GetExpiresTimeAsync(tenant);
return new AuthenticationTokenDto
@ -426,7 +426,7 @@ public class AuthenticationController : ControllerBase
}
else
{
if (!(_coreBaseSettings.Standalone || (await _tenantManager.GetTenantQuotaAsync((await _tenantManager.GetCurrentTenantAsync()).Id)).Oauth))
if (!(_coreBaseSettings.Standalone || (await _tenantManager.GetTenantQuotaAsync(await _tenantManager.GetCurrentTenantIdAsync())).Oauth))
{
throw new Exception(Resource.ErrorNotAllowedOption);
}

2
web/ASC.Web.Api/Api/CapabilitiesController.cs
View File

@ -63,7 +63,7 @@ public class CapabilitiesController : ControllerBase
[AllowNotPayment]
public async Task<CapabilitiesDto> GetPortalCapabilitiesAsync()
{
var quota = await _tenantManager.GetTenantQuotaAsync((await _tenantManager.GetCurrentTenantAsync()).Id);
var quota = await _tenantManager.GetTenantQuotaAsync(await _tenantManager.GetCurrentTenantIdAsync());
var result = new CapabilitiesDto
{
LdapEnabled = false,

8
web/ASC.Web.Api/Api/SecurityController.cs
View File

@ -194,7 +194,7 @@ public class SecurityController : ControllerBase
await DemandAuditPermissionAsync();
var settings = await _settingsManager.LoadAsync<TenantAuditSettings>((await _tenantManager.GetCurrentTenantAsync()).Id);
var settings = await _settingsManager.LoadAsync<TenantAuditSettings>(await _tenantManager.GetCurrentTenantIdAsync());
var to = DateTime.UtcNow;
var from = to.Subtract(TimeSpan.FromDays(settings.LoginHistoryLifeTime));
@ -216,7 +216,7 @@ public class SecurityController : ControllerBase
await DemandAuditPermissionAsync();
var tenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantId = await _tenantManager.GetCurrentTenantIdAsync();
var settings = await _settingsManager.LoadAsync<TenantAuditSettings>(tenantId);
@ -241,7 +241,7 @@ public class SecurityController : ControllerBase
DemandBaseAuditPermission();
return await _settingsManager.LoadAsync<TenantAuditSettings>((await _tenantManager.GetCurrentTenantAsync()).Id);
return await _settingsManager.LoadAsync<TenantAuditSettings>(await _tenantManager.GetCurrentTenantIdAsync());
}
[HttpPost("audit/settings/lifetime")]
@ -261,7 +261,7 @@ public class SecurityController : ControllerBase
throw new ArgumentException("AuditTrailLifeTime");
}
await _settingsManager.SaveAsync(wrapper.Settings, (await _tenantManager.GetCurrentTenantAsync()).Id);
await _settingsManager.SaveAsync(wrapper.Settings, await _tenantManager.GetCurrentTenantIdAsync());
await _messageService.SendAsync(MessageAction.AuditSettingsUpdated);
return wrapper.Settings;

2
web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
View File

@ -92,7 +92,7 @@ public class MessageSettingsController : BaseSettingsController
[HttpGet("cookiesettings")]
public async Task<int> GetCookieSettingsAsync()
{
return await _cookiesManager.GetLifeTimeAsync((await _tenantManager.GetCurrentTenantAsync()).Id);
return await _cookiesManager.GetLifeTimeAsync(await _tenantManager.GetCurrentTenantIdAsync());
}
[HttpPut("cookiesettings")]

4
web/ASC.Web.Api/Api/Settings/RadicaleController.cs
View File

@ -103,7 +103,7 @@ public class RadicaleController : BaseSettingsController
{
try
{
await _dbRadicale.SaveCardDavUserAsync((await _tenantManager.GetCurrentTenantAsync()).Id, currUser.Id);
await _dbRadicale.SaveCardDavUserAsync(await _tenantManager.GetCurrentTenantIdAsync(), currUser.Id);
}
catch (Exception ex)
{
@ -137,7 +137,7 @@ public class RadicaleController : BaseSettingsController
var authorization = _cardDavAddressbook.GetSystemAuthorization();
var myUri = HttpContext.Request.GetUrlRewriter();
var requestUrlBook = _cardDavAddressbook.GetRadicaleUrl(myUri.ToString(), currentUserEmail, true, true);
var tenant = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenant = await _tenantManager.GetCurrentTenantIdAsync();
var davRequest = new DavRequest()
{
Url = requestUrlBook,

2
web/ASC.Web.Api/Api/Settings/SettingsController.cs
View File

@ -686,7 +686,7 @@ public class SettingsController : BaseSettingsController
{
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
var saveAvailable = _coreBaseSettings.Standalone || (await _tenantManager.GetTenantQuotaAsync((await _tenantManager.GetCurrentTenantAsync()).Id)).ThirdParty;
var saveAvailable = _coreBaseSettings.Standalone || (await _tenantManager.GetTenantQuotaAsync(await _tenantManager.GetCurrentTenantIdAsync())).ThirdParty;
if (!SetupInfo.IsVisibleSettings(nameof(ManagementType.ThirdPartyAuthorization))
|| !saveAvailable)
{

2
web/ASC.Web.Api/Api/Settings/StorageController.cs
View File

@ -251,7 +251,7 @@ public class StorageController : BaseSettingsController, IDisposable
},
serverRootPath: serverRootPath,
createBy: _securityContext.CurrentAccount.ID,
tenantId: (await _tenantManager.GetCurrentTenantAsync()).Id
tenantId: await _tenantManager.GetCurrentTenantIdAsync()
));
}

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

@ -94,7 +94,7 @@ public class BruteForceLoginManager
}
user = await _userManager.GetUsersByPasswordHashAsync(
(await _tenantManager.GetCurrentTenantAsync()).Id,
await _tenantManager.GetCurrentTenantIdAsync(),
login,
passwordHash);

6
web/ASC.Web.Core/CookiesManager.cs
View File

@ -137,7 +137,7 @@ public class CookiesManager
if (!session)
{
var tenant = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenant = await _tenantManager.GetCurrentTenantIdAsync();
expires = await _tenantCookieSettingsHelper.GetExpiresTimeAsync(tenant);
}
@ -182,7 +182,7 @@ public class CookiesManager
public async Task ResetUserCookieAsync(Guid? userId = null)
{
var currentUserId = _securityContext.CurrentAccount.ID;
var tenant = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenant = await _tenantManager.GetCurrentTenantIdAsync();
var settings = await _tenantCookieSettingsHelper.GetForUserAsync(userId ?? currentUserId);
settings.Index = settings.Index + 1;
await _tenantCookieSettingsHelper.SetForUserAsync(userId ?? currentUserId, settings);
@ -265,7 +265,7 @@ public class CookiesManager
public async Task<int> GetLoginEventIdAsync(MessageAction action)
{
var tenantId = (await _tenantManager.GetCurrentTenantAsync()).Id;
var tenantId = await _tenantManager.GetCurrentTenantIdAsync();
var userId = _securityContext.CurrentAccount.ID;
var data = new MessageUserData(tenantId, userId);

2
web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
View File

@ -120,7 +120,7 @@ public class SsoHandlerService
throw new SSOException("Single sign-on settings are disabled", MessageKey.SsoSettingsDisabled);
}
if (!(_coreBaseSettings.Standalone || (await _tenantManager.GetTenantQuotaAsync((await _tenantManager.GetCurrentTenantAsync()).Id)).Sso))
if (!(_coreBaseSettings.Standalone || (await _tenantManager.GetTenantQuotaAsync(await _tenantManager.GetCurrentTenantIdAsync())).Sso))
{
throw new SSOException("Single sign-on settings are not paid", MessageKey.ErrorNotAllowedOption);
}

2
web/ASC.Web.Core/Mobile/CachedMobileAppInstallRegistrator.cs
View File

@ -82,6 +82,6 @@ public class CachedMobileAppInstallRegistrator : IMobileAppInstallRegistrator
{
var cacheKey = appType.HasValue ? userEmail + "/" + appType.ToString() : userEmail;
return string.Format("{0}:mobile:{1}", (await _tenantManager.GetCurrentTenantAsync()).Id, cacheKey);
return string.Format("{0}:mobile:{1}", await _tenantManager.GetCurrentTenantIdAsync(), cacheKey);
}
}

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

@ -91,7 +91,7 @@ public class StudioNotifyServiceHelper
{
var item = new NotifyItem
{
TenantId = (await _tenantManager.GetCurrentTenantAsync()).Id,
TenantId = await _tenantManager.GetCurrentTenantIdAsync(),
UserId = _authContext.CurrentAccount.ID.ToString(),
Action = (NotifyAction)action,
CheckSubsciption = checkSubsciption,

2
web/ASC.Web.Core/Sms/SmsManager.cs
View File

@ -139,7 +139,7 @@ public class SmsManager
{
if (await _smsSender.SendSMSAsync(mobilePhone, string.Format(Resource.SmsAuthenticationMessageToUser, key)))
{
await _tenantManager.SetTenantQuotaRowAsync(new TenantQuotaRow { Tenant = (await _tenantManager.GetCurrentTenantAsync()).Id, Path = "/sms", Counter = 1, LastModified = DateTime.UtcNow }, true);
await _tenantManager.SetTenantQuotaRowAsync(new TenantQuotaRow { Tenant = await _tenantManager.GetCurrentTenantIdAsync(), Path = "/sms", Counter = 1, LastModified = DateTime.UtcNow }, true);
}
}

4
web/ASC.Web.Core/StorageHelper.cs
View File

@ -86,7 +86,7 @@ public class StorageHelper
try
{
var store = await _storageFactory.GetStorageAsync((await _tenantManager.GetCurrentTenantAsync()).Id, StorageName);
var store = await _storageFactory.GetStorageAsync(await _tenantManager.GetCurrentTenantIdAsync(), StorageName);
var fileName = Path.GetFileName(logoPath);
@ -103,7 +103,7 @@ public class StorageHelper
private async Task<string> SaveLogoAsync(string fileName, byte[] data)
{
var store = await _storageFactory.GetStorageAsync((await _tenantManager.GetCurrentTenantAsync()).Id, StorageName);
var store = await _storageFactory.GetStorageAsync(await _tenantManager.GetCurrentTenantIdAsync(), StorageName);
using var stream = new MemoryStream(data);
stream.Seek(0, SeekOrigin.Begin);

6
web/ASC.Web.Core/Users/UserPhotoManager.cs
View File

@ -520,7 +520,7 @@ public class UserPhotoManager
}
await _userManager.SaveUserPhotoAsync(idUser, null);
_userPhotoManagerCache.ClearCache(idUser, (await _tenantManager.GetCurrentTenantAsync()).Id);
_userPhotoManagerCache.ClearCache(idUser, await _tenantManager.GetCurrentTenantIdAsync());
}
public async Task SyncPhotoAsync(Guid userID, byte[] data)
@ -683,7 +683,7 @@ public class UserPhotoManager
throw new ImageWeightLimitException();
}
var resizeTask = new ResizeWorkerItem((await _tenantManager.GetCurrentTenantAsync()).Id, userID, data, maxFileSize, size, await GetDataStoreAsync(), await _settingsManager.LoadAsync<UserPhotoThumbnailSettings>(userID));
var resizeTask = new ResizeWorkerItem(await _tenantManager.GetCurrentTenantIdAsync(), userID, data, maxFileSize, size, await GetDataStoreAsync(), await _settingsManager.LoadAsync<UserPhotoThumbnailSettings>(userID));
var key = $"{userID}{size}";
resizeTask["key"] = key;
@ -914,7 +914,7 @@ public class UserPhotoManager
private IDataStore _dataStore;
private async ValueTask<IDataStore> GetDataStoreAsync()
{
return _dataStore ??= await _storageFactory.GetStorageAsync((await _tenantManager.GetCurrentTenantAsync()).Id, "userPhotos");
return _dataStore ??= await _storageFactory.GetStorageAsync(await _tenantManager.GetCurrentTenantIdAsync(), "userPhotos");
}
public static CacheSize ToCache(Size size)

2
web/ASC.Web.Core/Utility/CommonLinkUtility.cs
View File

@ -568,7 +568,7 @@ public class CommonLinkUtility : BaseCommonLinkUtility
public async Task<string> GetConfirmationUrlRelativeAsync(string email, ConfirmType confirmType, object postfix = null, Guid userId = default)
{
return GetConfirmationUrlRelative((await _tenantManager.GetCurrentTenantAsync()).Id, email, confirmType, postfix, userId);
return GetConfirmationUrlRelative(await _tenantManager.GetCurrentTenantIdAsync(), email, confirmType, postfix, userId);
}
public string GetConfirmationUrlRelative(int tenantId, string email, ConfirmType confirmType, object postfix = null, Guid userId = default)

2
web/ASC.Web.Core/Utility/TenantExtra.cs
View File

@ -123,7 +123,7 @@ public class TenantExtra
public async Task<Tariff> GetCurrentTariffAsync(bool withRequestToPaymentSystem = true)
{
return await _tariffService.GetTariffAsync((await _tenantManager.GetCurrentTenantAsync()).Id, withRequestToPaymentSystem);
return await _tariffService.GetTariffAsync(await _tenantManager.GetCurrentTenantIdAsync(), withRequestToPaymentSystem);
}
public async Task<IEnumerable<TenantQuota>> GetTenantQuotasAsync()

4
web/ASC.Web.Core/WebItemSecurity.cs
View File

@ -236,7 +236,7 @@ public class WebItemSecurity
await _authorizationManager.AddAceAsync(a);
}
_webItemSecurityCache.Publish((await _tenantManager.GetCurrentTenantAsync()).Id);
_webItemSecurityCache.Publish(await _tenantManager.GetCurrentTenantIdAsync());
}
public async Task<WebItemSecurityInfo> GetSecurityInfoAsync(string id)
@ -326,7 +326,7 @@ public class WebItemSecurity
await _userManager.RemoveUserFromGroupAsync(userid, productid);
}
_webItemSecurityCache.Publish((await _tenantManager.GetCurrentTenantAsync()).Id);
_webItemSecurityCache.Publish(await _tenantManager.GetCurrentTenantIdAsync());
}
public async Task<bool> IsProductAdministratorAsync(Guid productid, Guid userid)

8
web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
View File

@ -89,7 +89,7 @@ public class TenantInfoSettingsHelper
{
tenantInfoSettings.IsDefault = true;
var store = await _storageFactory.GetStorageAsync((await _tenantManager.GetCurrentTenantAsync()).Id, "logo");
var store = await _storageFactory.GetStorageAsync(await _tenantManager.GetCurrentTenantIdAsync(), "logo");
try
{
await store.DeleteFilesAsync("", "*", false);
@ -104,7 +104,7 @@ public class TenantInfoSettingsHelper
public async Task SetCompanyLogoAsync(string companyLogoFileName, byte[] data, TenantInfoSettings tenantInfoSettings, TenantLogoManager tenantLogoManager)
{
var store = await _storageFactory.GetStorageAsync((await _tenantManager.GetCurrentTenantAsync()).Id, "logo");
var store = await _storageFactory.GetStorageAsync(await _tenantManager.GetCurrentTenantIdAsync(), "logo");
if (!tenantInfoSettings.IsDefault)
{
@ -137,7 +137,7 @@ public class TenantInfoSettingsHelper
return _webImageSupplier.GetAbsoluteWebPath("notifications/logo.png");
}
var store = await _storageFactory.GetStorageAsync((await _tenantManager.GetCurrentTenantAsync()).Id, "logo");
var store = await _storageFactory.GetStorageAsync(await _tenantManager.GetCurrentTenantIdAsync(), "logo");
return (await store.GetUriAsync(tenantInfoSettings.CompanyLogoFileName ?? "")).ToString();
}
@ -151,7 +151,7 @@ public class TenantInfoSettingsHelper
return null;
}
var storage = await _storageFactory.GetStorageAsync((await _tenantManager.GetCurrentTenantAsync()).Id, "logo");
var storage = await _storageFactory.GetStorageAsync(await _tenantManager.GetCurrentTenantIdAsync(), "logo");
if (storage == null)
{

2
web/ASC.Web.Core/WhiteLabel/TenantLogoManager.cs
View File

@ -155,7 +155,7 @@ public class TenantLogoManager
public async Task<bool> GetWhiteLabelPaidAsync()
{
return (await _tenantManager.GetTenantQuotaAsync((await _tenantManager.GetCurrentTenantAsync()).Id)).WhiteLabel;
return (await _tenantManager.GetTenantQuotaAsync(await _tenantManager.GetCurrentTenantIdAsync())).WhiteLabel;
}
private readonly TenantWhiteLabelSettingsHelper _tenantWhiteLabelSettingsHelper;

8
web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
View File

@ -340,7 +340,7 @@ public class TenantWhiteLabelSettingsHelper
try
{
tenantWhiteLabelSettings.SetIsDefault(type, true);
var store = await _storageFactory.GetStorageAsync((await _tenantManager.GetCurrentTenantAsync()).Id, ModuleName);
var store = await _storageFactory.GetStorageAsync(await _tenantManager.GetCurrentTenantIdAsync(), ModuleName);
await DeleteLogoFromStore(tenantWhiteLabelSettings, store, type, false);
await DeleteLogoFromStore(tenantWhiteLabelSettings, store, type, true);
}
@ -357,7 +357,7 @@ public class TenantWhiteLabelSettingsHelper
public async Task SetLogoAsync(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, string logoFileExt, byte[] data, bool dark, IDataStore storage = null)
{
var store = storage ?? await _storageFactory.GetStorageAsync((await _tenantManager.GetCurrentTenantAsync()).Id, ModuleName);
var store = storage ?? await _storageFactory.GetStorageAsync(await _tenantManager.GetCurrentTenantIdAsync(), ModuleName);
#region delete from storage if already exists
@ -608,7 +608,7 @@ public class TenantWhiteLabelSettingsHelper
private async Task<string> GetAbsoluteStorageLogoPath(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, bool dark)
{
var store = await _storageFactory.GetStorageAsync((await _tenantManager.GetCurrentTenantAsync()).Id, ModuleName);
var store = await _storageFactory.GetStorageAsync(await _tenantManager.GetCurrentTenantIdAsync(), ModuleName);
var fileName = BuildLogoFileName(type, tenantWhiteLabelSettings.GetExt(type), dark);
if (await store.IsFileAsync(fileName))
@ -682,7 +682,7 @@ public class TenantWhiteLabelSettingsHelper
private async Task<Stream> GetStorageLogoData(TenantWhiteLabelSettings tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum type, bool dark)
{
var storage = await _storageFactory.GetStorageAsync((await _tenantManager.GetCurrentTenantAsync()).Id, ModuleName);
var storage = await _storageFactory.GetStorageAsync(await _tenantManager.GetCurrentTenantIdAsync(), ModuleName);
if (storage == null)
{