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

Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe

Browse Source
This commit is contained in:
Alexey Safronov 2022-09-19 18:40:08 +03:00
commit eeb94810f1
7 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ASC.Core.Common/Billing/License/LicenseReader.cs
View File

@ -198,7 +198,7 @@ public class LicenseReader
var quota = new TenantQuota(-1000)
{
ActiveUsers = _constants.MaxEveryoneCount,
CountUser = _constants.MaxEveryoneCount,
MaxFileSize = defaultQuota.MaxFileSize,
MaxTotalSize = defaultQuota.MaxTotalSize,
Name = "license",

4
common/ASC.Core.Common/Tenants/TenantQuota.cs
View File

@ -34,7 +34,7 @@ public class TenantQuota : IMapFrom<DbQuota>
Name = "Default",
MaxFileSize = 25 * 1024 * 1024, // 25Mb
MaxTotalSize = long.MaxValue,
ActiveUsers = int.MaxValue,
CountUser = int.MaxValue,
CountManager = int.MaxValue,
CountRoom = int.MaxValue
};
@ -84,7 +84,7 @@ public class TenantQuota : IMapFrom<DbQuota>
}
private readonly CountUserFeature _countUserFeature;
public int ActiveUsers
public int CountUser
{
get => _countUserFeature.Value;
set => _countUserFeature.Value = value;

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

@ -32,7 +32,6 @@ public class UserController : PeopleControllerBase
private readonly ICache _cache;
private readonly TenantManager _tenantManager;
private readonly Constants _constants;
private readonly CookiesManager _cookiesManager;
private readonly CoreBaseSettings _coreBaseSettings;
private readonly CustomNamingPeople _customNamingPeople;
@ -61,12 +60,11 @@ public class UserController : PeopleControllerBase
private readonly IDaoFactory _daoFactory;
private readonly EmailValidationKeyProvider _validationKeyProvider;
private readonly CountManagerChecker _countManagerChecker;
private readonly CountUserChecker _activeUsersChecker;
private readonly CountUserChecker _countUserChecker;
public UserController(
ICache cache,
TenantManager tenantManager,
Constants constants,
CookiesManager cookiesManager,
CoreBaseSettings coreBaseSettings,
CustomNamingPeople customNamingPeople,
@ -105,8 +103,7 @@ public class UserController : PeopleControllerBase
: base(userManager, permissionContext, apiContext, userPhotoManager, httpClientFactory, httpContextAccessor)
{
_cache = cache;
_tenantManager = tenantManager;
_constants = constants;
_tenantManager = tenantManager;
_cookiesManager = cookiesManager;
_coreBaseSettings = coreBaseSettings;
_customNamingPeople = customNamingPeople;
@ -135,7 +132,7 @@ public class UserController : PeopleControllerBase
_daoFactory = daoFactory;
_validationKeyProvider = validationKeyProvider;
_countManagerChecker = countManagerChecker;
_activeUsersChecker = activeUsersChecker;
_countUserChecker = activeUsersChecker;
}
[HttpPost("active")]
@ -966,7 +963,8 @@ public class UserController : PeopleControllerBase
var canBeGuestFlag = !user.IsOwner(Tenant) && !_userManager.IsAdmin(user) && user.GetListAdminModules(_webItemSecurity, _webItemManager).Count == 0 && !user.IsMe(_authContext);
if (inDto.IsVisitor && !_userManager.IsVisitor(user) && canBeGuestFlag)
{
{
await _countUserChecker.CheckUsed();
_userManager.AddUserIntoGroup(user.Id, Constants.GroupUser.ID);
_webItemSecurityCache.ClearCache(Tenant.Id);
}
@ -1017,7 +1015,7 @@ public class UserController : PeopleControllerBase
}
else
{
await _activeUsersChecker.CheckUsed();
await _countUserChecker.CheckUsed();
}
user.Status = EmployeeStatus.Active;
@ -1066,7 +1064,7 @@ public class UserController : PeopleControllerBase
_webItemSecurityCache.ClearCache(Tenant.Id);
break;
case EmployeeType.Visitor:
await _activeUsersChecker.CheckUsed();
await _countUserChecker.CheckUsed();
_userManager.AddUserIntoGroup(user.Id, Constants.GroupUser.ID);
_webItemSecurityCache.ClearCache(Tenant.Id);
break;

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

@ -215,7 +215,7 @@ public class PortalController : ControllerBase
return _tenantManager.GetTenantQuotas().OrderBy(r => r.Price)
.FirstOrDefault(quota =>
quota.ActiveUsers > needUsersCount
quota.CountUser > needUsersCount
&& quota.MaxTotalSize > usedSpace);
}

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

@ -155,7 +155,7 @@ public class LicenseController : BaseSettingsController
var quota = new TenantQuota(-1000)
{
Name = "apirequest",
ActiveUsers = curQuota.ActiveUsers,
CountUser = curQuota.CountUser,
MaxFileSize = curQuota.MaxFileSize,
MaxTotalSize = curQuota.MaxTotalSize,
Features = curQuota.Features

2
web/ASC.Web.Api/ApiModels/ResponseDto/QuotaUsageDto.cs
View File

@ -77,7 +77,7 @@ public class QuotaUsageManager
UsedSize = (ulong)Math.Max(0, quotaRows.Sum(r => r.Counter)),
MaxUsersCount = quota.CountManager,
UsersCount = _coreBaseSettings.Personal ? 1 : await _countManagerStatistic.GetValue(),
MaxVisitors = _coreBaseSettings.Standalone ? -1 : quota.ActiveUsers,
MaxVisitors = _coreBaseSettings.Standalone ? -1 : quota.CountUser,
VisitorsCount = _coreBaseSettings.Personal ? 0 : await _activeUsersStatistic.GetValue(),
StorageUsage = quotaRows

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

@ -138,9 +138,9 @@ public class TenantExtra
var needUsersCount = await _countManagerStatistic.GetValue();
var quotas = GetTenantQuotas();
return quotas.OrderBy(q => q.ActiveUsers)
return quotas.OrderBy(q => q.CountUser)
.FirstOrDefault(q =>
q.ActiveUsers > needUsersCount
q.CountUser > needUsersCount
&& q.MaxTotalSize > usedSpace
&& !q.Free
&& !q.Trial);