Merge remote-tracking branch 'origin/master' into feature/flexible-co…

…llections
bitwarden · Oct 18, 2023 · ae18e76 · ae18e76
2 parents 3b049a6 + 8c77c65
commit ae18e76
Show file tree

Hide file tree

Showing 79 changed files with 1,665 additions and 1,469 deletions.
diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml
@@ -45,6 +45,9 @@ jobs:
           version: ${{ github.event.inputs.version_number }}
           file_path: "Directory.Build.props"
 
+      - name: Refresh lockfiles
+        run: dotnet restore -f --force-evaluate --no-cache
+
       - name: Setup git
         run: |
           git config --local user.email "[email protected]"

diff --git a/bitwarden_license/src/Commercial.Core/SecretsManager/Queries/Projects/MaxProjectsQuery.cs b/bitwarden_license/src/Commercial.Core/SecretsManager/Queries/Projects/MaxProjectsQuery.cs
@@ -28,16 +28,16 @@ public MaxProjectsQuery(
             throw new NotFoundException();
         }
 
-        var plan = StaticStore.GetSecretsManagerPlan(org.PlanType);
-        if (plan == null)
+        var plan = StaticStore.GetPlan(org.PlanType);
+        if (plan?.SecretsManager == null)
         {
             throw new BadRequestException("Existing plan not found.");
         }
 
         if (plan.Type == PlanType.Free)
         {
             var projects = await _projectRepository.GetProjectCountByOrganizationIdAsync(organizationId);
-            return projects + projectsToAdd > plan.MaxProjects ? (plan.MaxProjects, true) : (plan.MaxProjects, false);
+            return ((short? max, bool? overMax))(projects + projectsToAdd > plan.SecretsManager.MaxProjects ? (plan.SecretsManager.MaxProjects, true) : (plan.SecretsManager.MaxProjects, false));
         }
 
         return (null, null);

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.413",
+    "version": "6.0.415",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/Admin/Controllers/OrganizationsController.cs b/src/Admin/Controllers/OrganizationsController.cs
@@ -205,9 +205,8 @@ public async Task<IActionResult> Edit(Guid id, OrganizationEditModel model)
         var organization = await GetOrganization(id, model);
 
         if (organization.UseSecretsManager &&
-            !organization.SecretsManagerBeta
-            && StaticStore.GetSecretsManagerPlan(organization.PlanType) == null
-            )
+            !organization.SecretsManagerBeta &&
+            !StaticStore.GetPlan(organization.PlanType).SupportsSecretsManager)
         {
             throw new BadRequestException("Plan does not support Secrets Manager");
         }

diff --git a/src/Admin/Models/OrganizationEditModel.cs b/src/Admin/Models/OrganizationEditModel.cs
@@ -158,11 +158,12 @@ public OrganizationEditModel(Organization org, Provider provider, IEnumerable<Or
      * Add mappings for individual properties as you need them
      */
     public IEnumerable<Dictionary<string, object>> GetPlansHelper() =>
-        StaticStore.SecretManagerPlans.Select(p =>
-            new Dictionary<string, object>
+        StaticStore.Plans
+            .Where(p => p.SupportsSecretsManager)
+            .Select(p => new Dictionary<string, object>
             {
                 { "type", p.Type },
-                { "baseServiceAccount", p.BaseServiceAccount }
+                { "baseServiceAccount", p.SecretsManager.BaseServiceAccount }
             });
 
     public Organization CreateOrganization(Provider provider)

diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs
@@ -540,7 +540,7 @@ public async Task<ApiKeyResponseModel> ApiKey(string id, [FromBody] Organization
         if (model.Type == OrganizationApiKeyType.BillingSync || model.Type == OrganizationApiKeyType.Scim)
         {
             // Non-enterprise orgs should not be able to create or view an apikey of billing sync/scim key types
-            var plan = StaticStore.GetPasswordManagerPlan(organization.PlanType);
+            var plan = StaticStore.GetPlan(organization.PlanType);
             if (plan.Product != ProductType.Enterprise)
             {
                 throw new NotFoundException();

diff --git a/src/Api/Controllers/PlansController.cs b/src/Api/Controllers/PlansController.cs
@@ -19,30 +19,12 @@ public PlansController(ITaxRateRepository taxRateRepository)
     [HttpGet("")]
     [AllowAnonymous]
     public ListResponseModel<PlanResponseModel> Get()
-    {
-        var data = StaticStore.PasswordManagerPlans;
-        var responses = data.Select(plan => new PlanResponseModel(plan));
-        return new ListResponseModel<PlanResponseModel>(responses);
-    }
-
-    [HttpGet("all")]
-    [AllowAnonymous]
-    public ListResponseModel<PlanResponseModel> GetAllPlans()
     {
         var data = StaticStore.Plans;
         var responses = data.Select(plan => new PlanResponseModel(plan));
         return new ListResponseModel<PlanResponseModel>(responses);
     }
 
-    [HttpGet("sm-plans")]
-    [AllowAnonymous]
-    public ListResponseModel<PlanResponseModel> GetSecretsManagerPlans()
-    {
-        var data = StaticStore.SecretManagerPlans;
-        var responses = data.Select(plan => new PlanResponseModel(plan));
-        return new ListResponseModel<PlanResponseModel>(responses);
-    }
-
     [HttpGet("sales-tax-rates")]
     public async Task<ListResponseModel<TaxRateResponseModel>> GetTaxRates()
     {

diff --git a/src/Api/Models/Response/Organizations/OrganizationResponseModel.cs b/src/Api/Models/Response/Organizations/OrganizationResponseModel.cs
@@ -26,12 +26,7 @@ public OrganizationResponseModel(Organization organization, string obj = "organi
         BusinessCountry = organization.BusinessCountry;
         BusinessTaxNumber = organization.BusinessTaxNumber;
         BillingEmail = organization.BillingEmail;
-        Plan = new PlanResponseModel(StaticStore.PasswordManagerPlans.FirstOrDefault(plan => plan.Type == organization.PlanType));
-        var matchingPlan = StaticStore.GetSecretsManagerPlan(organization.PlanType);
-        if (matchingPlan != null)
-        {
-            SecretsManagerPlan = new PlanResponseModel(matchingPlan);
-        }
+        Plan = new PlanResponseModel(StaticStore.GetPlan(organization.PlanType));
         PlanType = organization.PlanType;
         Seats = organization.Seats;
         MaxAutoscaleSeats = organization.MaxAutoscaleSeats;

diff --git a/src/Api/Models/Response/PlanResponseModel.cs b/src/Api/Models/Response/PlanResponseModel.cs
@@ -21,15 +21,6 @@ public PlanResponseModel(Plan plan, string obj = "plan")
         NameLocalizationKey = plan.NameLocalizationKey;
         DescriptionLocalizationKey = plan.DescriptionLocalizationKey;
         CanBeUsedByBusiness = plan.CanBeUsedByBusiness;
-        BaseSeats = plan.BaseSeats;
-        BaseStorageGb = plan.BaseStorageGb;
-        MaxCollections = plan.MaxCollections;
-        MaxUsers = plan.MaxUsers;
-        HasAdditionalSeatsOption = plan.HasAdditionalSeatsOption;
-        HasAdditionalStorageOption = plan.HasAdditionalStorageOption;
-        MaxAdditionalSeats = plan.MaxAdditionalSeats;
-        MaxAdditionalStorage = plan.MaxAdditionalStorage;
-        HasPremiumAccessOption = plan.HasPremiumAccessOption;
         TrialPeriodDays = plan.TrialPeriodDays;
         HasSelfHost = plan.HasSelfHost;
         HasPolicies = plan.HasPolicies;
@@ -45,22 +36,12 @@ public PlanResponseModel(Plan plan, string obj = "plan")
         DisplaySortOrder = plan.DisplaySortOrder;
         LegacyYear = plan.LegacyYear;
         Disabled = plan.Disabled;
-        StripePlanId = plan.StripePlanId;
-        StripeSeatPlanId = plan.StripeSeatPlanId;
-        StripeStoragePlanId = plan.StripeStoragePlanId;
-        BasePrice = plan.BasePrice;
-        SeatPrice = plan.SeatPrice;
-        AdditionalStoragePricePerGb = plan.AdditionalStoragePricePerGb;
-        PremiumAccessOptionPrice = plan.PremiumAccessOptionPrice;
+        if (plan.SecretsManager != null)
+        {
+            SecretsManager = new SecretsManagerPlanFeaturesResponseModel(plan.SecretsManager);
+        }
 
-        AdditionalPricePerServiceAccount = plan.AdditionalPricePerServiceAccount;
-        BaseServiceAccount = plan.BaseServiceAccount;
-        MaxServiceAccounts = plan.MaxServiceAccounts;
-        MaxAdditionalServiceAccounts = plan.MaxAdditionalServiceAccount;
-        HasAdditionalServiceAccountOption = plan.HasAdditionalServiceAccountOption;
-        MaxProjects = plan.MaxProjects;
-        BitwardenProduct = plan.BitwardenProduct;
-        StripeServiceAccountPlanId = plan.StripeServiceAccountPlanId;
+        PasswordManager = new PasswordManagerPlanFeaturesResponseModel(plan.PasswordManager);
     }
 
     public PlanType Type { get; set; }
@@ -70,16 +51,6 @@ public PlanResponseModel(Plan plan, string obj = "plan")
     public string NameLocalizationKey { get; set; }
     public string DescriptionLocalizationKey { get; set; }
     public bool CanBeUsedByBusiness { get; set; }
-    public int BaseSeats { get; set; }
-    public short? BaseStorageGb { get; set; }
-    public short? MaxCollections { get; set; }
-    public short? MaxUsers { get; set; }
-
-    public bool HasAdditionalSeatsOption { get; set; }
-    public int? MaxAdditionalSeats { get; set; }
-    public bool HasAdditionalStorageOption { get; set; }
-    public short? MaxAdditionalStorage { get; set; }
-    public bool HasPremiumAccessOption { get; set; }
     public int? TrialPeriodDays { get; set; }
 
     public bool HasSelfHost { get; set; }
@@ -98,21 +69,95 @@ public PlanResponseModel(Plan plan, string obj = "plan")
     public int DisplaySortOrder { get; set; }
     public int? LegacyYear { get; set; }
     public bool Disabled { get; set; }
+    public SecretsManagerPlanFeaturesResponseModel SecretsManager { get; protected init; }
+    public PasswordManagerPlanFeaturesResponseModel PasswordManager { get; protected init; }
+
+    public class SecretsManagerPlanFeaturesResponseModel
+    {
+        public SecretsManagerPlanFeaturesResponseModel(Plan.SecretsManagerPlanFeatures plan)
+        {
+            MaxServiceAccounts = plan.MaxServiceAccounts;
+            AllowServiceAccountsAutoscale = plan is { AllowServiceAccountsAutoscale: true };
+            StripeServiceAccountPlanId = plan.StripeServiceAccountPlanId;
+            AdditionalPricePerServiceAccount = plan.AdditionalPricePerServiceAccount;
+            BaseServiceAccount = plan.BaseServiceAccount;
+            MaxAdditionalServiceAccount = plan.MaxAdditionalServiceAccount;
+            HasAdditionalServiceAccountOption = plan is { HasAdditionalServiceAccountOption: true };
+            StripeSeatPlanId = plan.StripeSeatPlanId;
+            HasAdditionalSeatsOption = plan is { HasAdditionalSeatsOption: true };
+            BasePrice = plan.BasePrice;
+            SeatPrice = plan.SeatPrice;
+            BaseSeats = plan.BaseSeats;
+            MaxSeats = plan.MaxSeats;
+            MaxAdditionalSeats = plan.MaxAdditionalSeats;
+            AllowSeatAutoscale = plan.AllowSeatAutoscale;
+            MaxProjects = plan.MaxProjects;
+        }
+        // Service accounts
+        public short? MaxServiceAccounts { get; init; }
+        public bool AllowServiceAccountsAutoscale { get; init; }
+        public string StripeServiceAccountPlanId { get; init; }
+        public decimal? AdditionalPricePerServiceAccount { get; init; }
+        public short? BaseServiceAccount { get; init; }
+        public short? MaxAdditionalServiceAccount { get; init; }
+        public bool HasAdditionalServiceAccountOption { get; init; }
+        // Seats
+        public string StripeSeatPlanId { get; init; }
+        public bool HasAdditionalSeatsOption { get; init; }
+        public decimal BasePrice { get; init; }
+        public decimal SeatPrice { get; init; }
+        public int BaseSeats { get; init; }
+        public short? MaxSeats { get; init; }
+        public int? MaxAdditionalSeats { get; init; }
+        public bool AllowSeatAutoscale { get; init; }
 
-    public string StripePlanId { get; set; }
-    public string StripeSeatPlanId { get; set; }
-    public string StripeStoragePlanId { get; set; }
-    public string StripePremiumAccessPlanId { get; set; }
-    public decimal BasePrice { get; set; }
-    public decimal SeatPrice { get; set; }
-    public decimal AdditionalStoragePricePerGb { get; set; }
-    public decimal PremiumAccessOptionPrice { get; set; }
-    public string StripeServiceAccountPlanId { get; set; }
-    public decimal? AdditionalPricePerServiceAccount { get; set; }
-    public short? BaseServiceAccount { get; set; }
-    public short? MaxServiceAccounts { get; set; }
-    public short? MaxAdditionalServiceAccounts { get; set; }
-    public bool HasAdditionalServiceAccountOption { get; set; }
-    public short? MaxProjects { get; set; }
-    public BitwardenProductType BitwardenProduct { get; set; }
+        // Features
+        public int MaxProjects { get; init; }
+    }
+
+    public record PasswordManagerPlanFeaturesResponseModel
+    {
+        public PasswordManagerPlanFeaturesResponseModel(Plan.PasswordManagerPlanFeatures plan)
+        {
+            StripePlanId = plan.StripePlanId;
+            StripeSeatPlanId = plan.StripeSeatPlanId;
+            BasePrice = plan.BasePrice;
+            SeatPrice = plan.SeatPrice;
+            AllowSeatAutoscale = plan.AllowSeatAutoscale;
+            HasAdditionalSeatsOption = plan.HasAdditionalSeatsOption;
+            MaxAdditionalSeats = plan.MaxAdditionalSeats;
+            BaseSeats = plan.BaseSeats;
+            HasPremiumAccessOption = plan.HasPremiumAccessOption;
+            StripePremiumAccessPlanId = plan.StripePremiumAccessPlanId;
+            PremiumAccessOptionPrice = plan.PremiumAccessOptionPrice;
+            MaxSeats = plan.MaxSeats;
+            BaseStorageGb = plan.BaseStorageGb;
+            HasAdditionalStorageOption = plan.HasAdditionalStorageOption;
+            AdditionalStoragePricePerGb = plan.AdditionalStoragePricePerGb;
+            StripeStoragePlanId = plan.StripeStoragePlanId;
+            MaxAdditionalStorage = plan.MaxAdditionalStorage;
+            MaxCollections = plan.MaxCollections;
+        }
+        // Seats
+        public string StripePlanId { get; init; }
+        public string StripeSeatPlanId { get; init; }
+        public decimal BasePrice { get; init; }
+        public decimal SeatPrice { get; init; }
+        public bool AllowSeatAutoscale { get; init; }
+        public bool HasAdditionalSeatsOption { get; init; }
+        public int? MaxAdditionalSeats { get; init; }
+        public int BaseSeats { get; init; }
+        public bool HasPremiumAccessOption { get; init; }
+        public string StripePremiumAccessPlanId { get; init; }
+        public decimal PremiumAccessOptionPrice { get; init; }
+        public short? MaxSeats { get; init; }
+        // Storage
+        public short? BaseStorageGb { get; init; }
+        public bool HasAdditionalStorageOption { get; init; }
+        public decimal AdditionalStoragePricePerGb { get; init; }
+        public string StripeStoragePlanId { get; init; }
+        public short? MaxAdditionalStorage { get; init; }
+        // Feature
+        public short? MaxCollections { get; init; }
+    }
 }
diff --git a/src/Api/Models/Response/ProfileOrganizationResponseModel.cs b/src/Api/Models/Response/ProfileOrganizationResponseModel.cs
@@ -55,7 +55,7 @@ public ProfileOrganizationResponseModel(OrganizationUserOrganizationDetails orga
         FamilySponsorshipAvailable = FamilySponsorshipFriendlyName == null &&
             StaticStore.GetSponsoredPlan(PlanSponsorshipType.FamiliesForEnterprise)
             .UsersCanSponsor(organization);
-        PlanProductType = StaticStore.GetPasswordManagerPlan(organization.PlanType).Product;
+        PlanProductType = StaticStore.GetPlan(organization.PlanType).Product;
         FamilySponsorshipLastSyncDate = organization.FamilySponsorshipLastSyncDate;
         FamilySponsorshipToDelete = organization.FamilySponsorshipToDelete;
         FamilySponsorshipValidUntil = organization.FamilySponsorshipValidUntil;

diff --git a/src/Api/Models/Response/ProfileProviderOrganizationResponseModel.cs b/src/Api/Models/Response/ProfileProviderOrganizationResponseModel.cs
@@ -42,6 +42,6 @@ public ProfileProviderOrganizationResponseModel(ProviderUserOrganizationDetails
         UserId = organization.UserId;
         ProviderId = organization.ProviderId;
         ProviderName = organization.ProviderName;
-        PlanProductType = StaticStore.GetPasswordManagerPlan(organization.PlanType).Product;
+        PlanProductType = StaticStore.GetPlan(organization.PlanType).Product;
     }
 }
diff --git a/src/Api/Models/Response/SubscriptionResponseModel.cs b/src/Api/Models/Response/SubscriptionResponseModel.cs
@@ -1,5 +1,4 @@
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Business;
 using Bit.Core.Utilities;
@@ -98,7 +97,6 @@ public BillingSubscriptionItem(SubscriptionInfo.BillingSubscription.BillingSubsc
             Quantity = item.Quantity;
             SponsoredSubscriptionItem = item.SponsoredSubscriptionItem;
             AddonSubscriptionItem = item.AddonSubscriptionItem;
-            BitwardenProduct = item.BitwardenProduct;
         }
 
         public string Name { get; set; }
@@ -107,7 +105,6 @@ public BillingSubscriptionItem(SubscriptionInfo.BillingSubscription.BillingSubsc
         public string Interval { get; set; }
         public bool SponsoredSubscriptionItem { get; set; }
         public bool AddonSubscriptionItem { get; set; }
-        public BitwardenProductType BitwardenProduct { get; set; }
     }
 }
 

diff --git a/src/Api/SecretsManager/Controllers/AccessPoliciesController.cs b/src/Api/SecretsManager/Controllers/AccessPoliciesController.cs
@@ -10,14 +10,12 @@
 using Bit.Core.SecretsManager.Entities;
 using Bit.Core.SecretsManager.Repositories;
 using Bit.Core.Services;
-using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.SecretsManager.Controllers;
 
 [Authorize("secrets")]
-[SelfHosted(NotSelfHostedOnly = true)]
 [Route("access-policies")]
 public class AccessPoliciesController : Controller
 {

diff --git a/src/Api/SecretsManager/Controllers/ProjectsController.cs b/src/Api/SecretsManager/Controllers/ProjectsController.cs
@@ -10,14 +10,12 @@
 using Bit.Core.SecretsManager.Queries.Projects.Interfaces;
 using Bit.Core.SecretsManager.Repositories;
 using Bit.Core.Services;
-using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.SecretsManager.Controllers;
 
 [Authorize("secrets")]
-[SelfHosted(NotSelfHostedOnly = true)]
 public class ProjectsController : Controller
 {
     private readonly ICurrentContext _currentContext;

diff --git a/src/Api/SecretsManager/Controllers/SecretsController.cs b/src/Api/SecretsManager/Controllers/SecretsController.cs
@@ -14,14 +14,12 @@
 using Bit.Core.Tools.Enums;
 using Bit.Core.Tools.Models.Business;
 using Bit.Core.Tools.Services;
-using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.SecretsManager.Controllers;
 
 [Authorize("secrets")]
-[SelfHosted(NotSelfHostedOnly = true)]
 public class SecretsController : Controller
 {
     private readonly ICurrentContext _currentContext;

diff --git a/src/Api/SecretsManager/Controllers/SecretsManagerPortingController.cs b/src/Api/SecretsManager/Controllers/SecretsManagerPortingController.cs
@@ -7,14 +7,12 @@
 using Bit.Core.SecretsManager.Queries.Projects.Interfaces;
 using Bit.Core.SecretsManager.Repositories;
 using Bit.Core.Services;
-using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.SecretsManager.Controllers;
 
 [Authorize("secrets")]
-[SelfHosted(NotSelfHostedOnly = true)]
 public class SecretsManagerPortingController : Controller
 {
     private readonly ISecretRepository _secretRepository;