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

fix license

Browse Source
This commit is contained in:
pavelbannov 2023-07-21 18:41:16 +03:00
parent e32679287c
commit b4502b6fba
3 changed files with 19 additions and 12 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

@ -221,7 +221,7 @@ public class LicenseReader
DueDate = license.DueDate,
};
await _tariffService.SetTariffAsync(-2, tariff, new List<TenantQuota> { quota });
await _tariffService.SetTariffAsync(Tenant.DefaultTenant, tariff, new List<TenantQuota> { quota });
}
private void LogError(Exception error)

27
common/ASC.Core.Common/Billing/TariffService.cs
View File

@ -305,7 +305,7 @@ public class TariffService : ITariffService
Id = 1000
};
await SetTariffAsync(-1, tariff, new List<TenantQuota> { quota });
await SetTariffAsync(Tenant.DefaultTenant, tariff, new List<TenantQuota> { quota });
UpdateCache(tariff.Id);
}
}
@ -395,7 +395,7 @@ public class TariffService : ITariffService
ArgumentNullException.ThrowIfNull(tariff);
if (tariff.Quotas == null ||
(quotas ??= await tariff.Quotas.ToAsyncEnumerable().SelectAwait(async q => await _quotaService.GetTenantQuotaAsync(q.Id)).ToListAsync()).Any(q => q == null))
(quotas ??= await tariff.Quotas.ToAsyncEnumerable().SelectAwait(async q => await _quotaService.GetTenantQuotaAsync(q.Id)).ToListAsync()).Any(q => q == null))
{
return;
}
@ -405,11 +405,14 @@ public class TariffService : ITariffService
if (quotas.Any(q => q.Trial))
{
// reset trial date
var tenant = await _tenantService.GetTenantAsync(tenantId);
if (tenant != null)
if (tenantId != Tenant.DefaultTenant)
{
tenant.VersionChanged = DateTime.UtcNow;
await _tenantService.SaveTenantAsync(_coreSettings, tenant);
var tenant = await _tenantService.GetTenantAsync(tenantId);
if (tenant != null)
{
tenant.VersionChanged = DateTime.UtcNow;
await _tenantService.SaveTenantAsync(_coreSettings, tenant);
}
}
}
}
@ -791,12 +794,16 @@ public class TariffService : ITariffService
if (inserted)
{
var t = await _tenantService.GetTenantAsync(tenant);
if (t != null)
if (tenant != Tenant.DefaultTenant)
{
// update tenant.LastModified to flush cache in documents
await _tenantService.SaveTenantAsync(_coreSettings, t);
var t = await _tenantService.GetTenantAsync(tenant);
if (t != null)
{
// update tenant.LastModified to flush cache in documents
await _tenantService.SaveTenantAsync(_coreSettings, t);
}
}
ClearCache(tenant);
await NotifyWebSocketAsync(currentTariff, tariffInfo);

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

@ -170,7 +170,7 @@ public class LicenseController : BaseSettingsController
DueDate = DateTime.Today.AddDays(DEFAULT_TRIAL_PERIOD)
};
await _tariffService.SetTariffAsync(-2, tariff, new List<TenantQuota>() { quota });
await _tariffService.SetTariffAsync(Tenant.DefaultTenant, tariff, new List<TenantQuota>() { quota });
await _messageService.SendAsync(MessageAction.LicenseKeyUploaded);