From fa40b99b3ddce85c006193092e9b2d05670fa713 Mon Sep 17 00:00:00 2001 From: Anders Revsgaard Date: Fri, 4 Oct 2024 16:39:12 +0200 Subject: [PATCH 01/87] Remove EnableKeyVault from plan in control --- .../Models/ViewModels/Master/PlanViewModel.cs | 3 --- src/FoxIDs.ControlClient/Pages/Settings/Plans.razor | 1 - src/FoxIDs.ControlShared/Models/Api/Master/Plan.cs | 3 --- 3 files changed, 7 deletions(-) diff --git a/src/FoxIDs.ControlClient/Models/ViewModels/Master/PlanViewModel.cs b/src/FoxIDs.ControlClient/Models/ViewModels/Master/PlanViewModel.cs index e8d0bffc4..258dd6584 100644 --- a/src/FoxIDs.ControlClient/Models/ViewModels/Master/PlanViewModel.cs +++ b/src/FoxIDs.ControlClient/Models/ViewModels/Master/PlanViewModel.cs @@ -30,9 +30,6 @@ public class PlanViewModel [Display(Name = "Custom domain")] public bool EnableCustomDomain { get; set; } - [Display(Name = "Key Vault")] - public bool EnableKeyVault { get; set; } - [Required] [Display(Name = "Total tracks")] public PlanItem Tracks { get; set; } = new PlanItem(); diff --git a/src/FoxIDs.ControlClient/Pages/Settings/Plans.razor b/src/FoxIDs.ControlClient/Pages/Settings/Plans.razor index 600858e9d..78ec356c4 100644 --- a/src/FoxIDs.ControlClient/Pages/Settings/Plans.razor +++ b/src/FoxIDs.ControlClient/Pages/Settings/Plans.razor @@ -77,7 +77,6 @@ -
  • diff --git a/src/FoxIDs.ControlShared/Models/Api/Master/Plan.cs b/src/FoxIDs.ControlShared/Models/Api/Master/Plan.cs index a12091033..572c9f8e4 100644 --- a/src/FoxIDs.ControlShared/Models/Api/Master/Plan.cs +++ b/src/FoxIDs.ControlShared/Models/Api/Master/Plan.cs @@ -30,9 +30,6 @@ public class Plan : INameValue [Display(Name = "Custom domain")] public bool EnableCustomDomain { get; set; } - [Display(Name = "Key Vault")] - public bool EnableKeyVault { get; set; } - [Required] [Display(Name = "Total tracks")] public PlanItem Tracks { get; set; } = new PlanItem(); From 12f661f1126152466c1c3a98111293712acd7972 Mon Sep 17 00:00:00 2001 From: Anders Revsgaard Date: Fri, 4 Oct 2024 17:00:31 +0200 Subject: [PATCH 02/87] Plan, change IsLimited bool to LimitedThreshold value. --- .../Controllers/Tracks/TTrackController.cs | 6 +++--- .../Controllers/Tracks/TUserController.cs | 6 +++--- src/FoxIDs.ControlClient/Pages/Settings/Plans.razor | 12 ++++++------ .../Models/Api/Master/PlanItem.cs | 6 +++--- src/FoxIDs.Shared/Models/Master/Plans/PlanItem.cs | 6 +++--- src/FoxIDs.SharedBase/Constants.cs | 1 + 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/FoxIDs.Control/Controllers/Tracks/TTrackController.cs b/src/FoxIDs.Control/Controllers/Tracks/TTrackController.cs index 6e96db0b7..41714d783 100644 --- a/src/FoxIDs.Control/Controllers/Tracks/TTrackController.cs +++ b/src/FoxIDs.Control/Controllers/Tracks/TTrackController.cs @@ -90,13 +90,13 @@ public TTrackController(FoxIDsControlSettings settings, TelemetryScopedLogger lo if (!RouteBinding.PlanName.IsNullOrEmpty()) { var plan = await planCacheLogic.GetPlanAsync(RouteBinding.PlanName); - if (plan.Tracks.IsLimited) + if (plan.Tracks.LimitedThreshold > 0) { var count = await tenantDataRepository.CountAsync(new Track.IdKey { TenantName = RouteBinding.TenantName }); // included + master track - if (count > plan.Tracks.Included) + if (count > plan.Tracks.LimitedThreshold) { - throw new Exception($"Maximum number of tracks ({plan.Tracks.Included}) included in the '{plan.Name}' plan has been reached. Master environment not counted."); + throw new Exception($"Maximum number of tracks ({plan.Tracks.LimitedThreshold}) in the '{plan.Name}' plan has been reached. Master environment not counted."); } } } diff --git a/src/FoxIDs.Control/Controllers/Tracks/TUserController.cs b/src/FoxIDs.Control/Controllers/Tracks/TUserController.cs index c06b990e7..ff239fbb1 100644 --- a/src/FoxIDs.Control/Controllers/Tracks/TUserController.cs +++ b/src/FoxIDs.Control/Controllers/Tracks/TUserController.cs @@ -81,14 +81,14 @@ public TUserController(TelemetryScopedLogger logger, IServiceProvider servicePro if (!RouteBinding.PlanName.IsNullOrEmpty()) { var plan = await planCacheLogic.GetPlanAsync(RouteBinding.PlanName); - if (plan.Users.IsLimited) + if (plan.Users.LimitedThreshold > 0) { Expression> whereQuery = p => p.DataType.Equals("user") && p.PartitionId.StartsWith($"{RouteBinding.TenantName}:"); var count = await tenantDataRepository.CountAsync(whereQuery: whereQuery, usePartitionId: false); // included + one master user - if (count > plan.Users.Included) + if (count > plan.Users.LimitedThreshold) { - throw new Exception($"Maximum number of users ({plan.Users.Included}) included in the '{plan.Name}' plan has been reached."); + throw new Exception($"Maximum number of users ({plan.Users.LimitedThreshold}) in the '{plan.Name}' plan has been reached."); } } } diff --git a/src/FoxIDs.ControlClient/Pages/Settings/Plans.razor b/src/FoxIDs.ControlClient/Pages/Settings/Plans.razor index 78ec356c4..0db102474 100644 --- a/src/FoxIDs.ControlClient/Pages/Settings/Plans.razor +++ b/src/FoxIDs.ControlClient/Pages/Settings/Plans.razor @@ -82,7 +82,7 @@