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

ApiSystem: fix

Browse Source
This commit is contained in:
pavelbannov 2022-10-11 15:52:45 +03:00
parent dc2cfbc614
commit 0a1ab5c77d
5 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ASC.Web.slnf
View File

@ -21,6 +21,7 @@
"common\\ASC.Notify.Textile\\ASC.Notify.Textile.csproj", "common\\ASC.Notify.Textile\\ASC.Notify.Textile.csproj",
"common\\ASC.Textile\\ASC.Textile.csproj", "common\\ASC.Textile\\ASC.Textile.csproj",
"common\\ASC.Webhooks.Core\\ASC.Webhooks.Core.csproj", "common\\ASC.Webhooks.Core\\ASC.Webhooks.Core.csproj",
"common\\services\\ASC.ApiSystem\\ASC.ApiSystem.csproj",
"common\\services\\ASC.AuditTrail\\ASC.AuditTrail.csproj", "common\\services\\ASC.AuditTrail\\ASC.AuditTrail.csproj",
"common\\services\\ASC.ClearEvents\\ASC.ClearEvents.csproj", "common\\services\\ASC.ClearEvents\\ASC.ClearEvents.csproj",
"common\\services\\ASC.Data.Backup.BackgroundTasks\\ASC.Data.Backup.BackgroundTasks.csproj", "common\\services\\ASC.Data.Backup.BackgroundTasks\\ASC.Data.Backup.BackgroundTasks.csproj",

1
common/services/ASC.ApiSystem/Classes/CommonMethods.cs
View File

@ -139,7 +139,6 @@ public class CommonMethods
language = t.Language, language = t.Language,
name = t.Name == "" ? Resource.PortalName : t.Name, name = t.Name == "" ? Resource.PortalName : t.Name,
ownerId = t.OwnerId, ownerId = t.OwnerId,
partnerId = t.PartnerId,
paymentId = t.PaymentId, paymentId = t.PaymentId,
portalName = t.Alias, portalName = t.Alias,
status = t.Status.ToString(), status = t.Status.ToString(),

11
common/services/ASC.ApiSystem/Controllers/PortalController.cs
View File

@ -222,15 +222,6 @@ public class PortalController : ControllerBase
LimitedControlPanel = model.LimitedControlPanel LimitedControlPanel = model.LimitedControlPanel
}; };
if (!string.IsNullOrEmpty(model.PartnerId))
{
if (Guid.TryParse(model.PartnerId, out _))
{
// valid guid
info.PartnerId = model.PartnerId;
}
}
if (!string.IsNullOrEmpty(model.AffiliateId)) if (!string.IsNullOrEmpty(model.AffiliateId))
{ {
info.AffiliateId = model.AffiliateId; info.AffiliateId = model.AffiliateId;
@ -286,7 +277,7 @@ public class PortalController : ControllerBase
var tariff = new Tariff var tariff = new Tariff
{ {
QuotaId = trialQuotaId, Quotas = new List<Quota> { new Quota(trialQuotaId, 1) },
DueDate = dueDate DueDate = dueDate
}; };
HostedSolution.SetTariff(t.Id, tariff); HostedSolution.SetTariff(t.Id, tariff);

14
common/services/ASC.ApiSystem/Controllers/TariffController.cs
View File

@ -114,7 +114,7 @@ public class TariffController : ControllerBase
var quota = new TenantQuota(tenant.Id) var quota = new TenantQuota(tenant.Id)
{ {
ActiveUsers = 10000, CountManager = 10000,
Features = model.Features ?? "", Features = model.Features ?? "",
MaxFileSize = 1024 * 1024 * 1024, MaxFileSize = 1024 * 1024 * 1024,
MaxTotalSize = 1024L * 1024 * 1024 * 1024 - 1, MaxTotalSize = 1024L * 1024 * 1024 * 1024 - 1,
@ -123,7 +123,7 @@ public class TariffController : ControllerBase
if (model.ActiveUsers != default) if (model.ActiveUsers != default)
{ {
quota.ActiveUsers = model.ActiveUsers; quota.CountManager = model.ActiveUsers;
} }
if (model.MaxTotalSize != default) if (model.MaxTotalSize != default)
@ -139,8 +139,8 @@ public class TariffController : ControllerBase
HostedSolution.SaveTenantQuota(quota); HostedSolution.SaveTenantQuota(quota);
var tariff = new Tariff var tariff = new Tariff
{ {
QuotaId = quota.Tenant, Quotas = new List<Quota> { new Quota(quota.Tenant, 1) },
DueDate = model.DueDate != default ? model.DueDate : DateTime.MaxValue.AddSeconds(-1), DueDate = model.DueDate != default ? model.DueDate : DateTime.MaxValue.AddSeconds(-1),
}; };
@ -184,8 +184,8 @@ public class TariffController : ControllerBase
public IActionResult GetTariffs() public IActionResult GetTariffs()
{ {
var tariffs = HostedSolution.GetTenantQuotas() var tariffs = HostedSolution.GetTenantQuotas()
.Where(q => !q.Trial && !q.Free && !q.Open) .Where(q => !q.Trial && !q.Free)
.OrderBy(q => q.ActiveUsers) .OrderBy(q => q.CountManager)
.ThenByDescending(q => q.Tenant) .ThenByDescending(q => q.Tenant)
.Select(q => ToTariffWrapper(null, q)); .Select(q => ToTariffWrapper(null, q));
@ -216,7 +216,7 @@ public class TariffController : ControllerBase
{ {
return new return new
{ {
activeUsers = q.ActiveUsers, countManager = q.CountManager,
dueDate = t == null ? DateTime.MaxValue : t.DueDate, dueDate = t == null ? DateTime.MaxValue : t.DueDate,
features = q.Features, features = q.Features,
maxFileSize = q.MaxFileSize, maxFileSize = q.MaxFileSize,

5
common/services/ASC.ApiSystem/Models/TenantModel.cs
View File

@ -58,10 +58,7 @@ public class TenantModel : IModel
[StringLength(Web.Core.Utility.PasswordSettings.MaxLength)] [StringLength(Web.Core.Utility.PasswordSettings.MaxLength)]
public string Password { get; set; } public string Password { get; set; }
public string PasswordHash { get; set; } public string PasswordHash { get; set; }
[StringLength(255)]
public string PartnerId { get; set; }
[StringLength(32)] [StringLength(32)]
public string Phone { get; set; } public string Phone { get; set; }