[AC 1451] Refactor staticstore plans and consuming logic (#3164)

* refactor the plan and create new objects * initial commit * Add new plan types * continue the refactoring by adding new plantypes * changes for plans * Refactoring continues * making changes for plan * Fixing the failing test * Fixing whitespace * Fix some in correct values * Resolve the plan data * rearranging the plan * Make the plan more immutable * Resolve the lint errors * Fix the failing test * Add custom plan * Fix the failing test * Fix the failing test * resolve the failing addons after refactoring * Refactoring * Merge branch 'master' into ac-1451/refactor-staticstore-plans-and-consuming-logic * merge from master * Merge branch 'master' into ac-1451/refactor-staticstore-plans-and-consuming-logic * format whitespace * resolve the conflict * Fix some pr comments * Fixing some of the pr comments * fixing some of the pr comments * Resolve some pr comments * Resolve pr comments * Resolves some pr comments * Resolving some or comments * Resolve a failing test * fix the failing test * Resolving some pr comments * Fix the failing test * resolve pr comment * add a using statement fir a failing test --------- Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
2025-06-30 23:52:50 -05:00 · 2023-10-17 15:56:35 +01:00
parent 1c3bd4d252
commit 8177821e8b
48 changed files with 1041 additions and 1173 deletions
--- a/src/Core/Models/Business/SecretsManagerSubscriptionUpdate.cs
+++ b/src/Core/Models/Business/SecretsManagerSubscriptionUpdate.cs
@ -43,18 +43,18 @@ public class SecretsManagerSubscriptionUpdate
    /// The seats the organization will have after the update, excluding the base seats included in the plan
    /// Usually this is what the organization is billed for
    /// </summary>
-    public int SmSeatsExcludingBase => SmSeats.HasValue ? SmSeats.Value - Plan.BaseSeats : 0;
+    public int SmSeatsExcludingBase => SmSeats.HasValue ? SmSeats.Value - Plan.SecretsManager.BaseSeats : 0;
    /// <summary>
    /// The seats the organization will have after the update, excluding the base seats included in the plan
    /// Usually this is what the organization is billed for
    /// </summary>
-    public int SmServiceAccountsExcludingBase => SmServiceAccounts.HasValue ? SmServiceAccounts.Value - Plan.BaseServiceAccount.GetValueOrDefault() : 0;
+    public int SmServiceAccountsExcludingBase => SmServiceAccounts.HasValue ? SmServiceAccounts.Value - Plan.SecretsManager!.BaseServiceAccount : 0;
    public bool SmSeatsChanged => SmSeats != Organization.SmSeats;
    public bool SmServiceAccountsChanged => SmServiceAccounts != Organization.SmServiceAccounts;
    public bool MaxAutoscaleSmSeatsChanged => MaxAutoscaleSmSeats != Organization.MaxAutoscaleSmSeats;
    public bool MaxAutoscaleSmServiceAccountsChanged =>
        MaxAutoscaleSmServiceAccounts != Organization.MaxAutoscaleSmServiceAccounts;
-    public Plan Plan => Utilities.StaticStore.GetSecretsManagerPlan(Organization.PlanType);
+    public Plan Plan => Utilities.StaticStore.GetPlan(Organization.PlanType);
    public bool SmSeatAutoscaleLimitReached => SmSeats.HasValue && MaxAutoscaleSmSeats.HasValue && SmSeats == MaxAutoscaleSmSeats;

    public bool SmServiceAccountAutoscaleLimitReached => SmServiceAccounts.HasValue &&
@ -70,7 +70,7 @@ public class SecretsManagerSubscriptionUpdate

        Organization = organization;

-        if (Plan == null)
+        if (!Plan.SupportsSecretsManager)
        {
            throw new NotFoundException("Invalid Secrets Manager plan.");
        }
--- a/src/Core/Models/Business/SubscriptionCreateOptions.cs
+++ b/src/Core/Models/Business/SubscriptionCreateOptions.cs
@ -1,12 +1,12 @@
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Stripe;
+using Plan = Bit.Core.Models.StaticStore.Plan;

 namespace Bit.Core.Models.Business;

 public class OrganizationSubscriptionOptionsBase : Stripe.SubscriptionCreateOptions
 {
-    public OrganizationSubscriptionOptionsBase(Organization org, List<StaticStore.Plan> plans, TaxInfo taxInfo, int additionalSeats,
+    public OrganizationSubscriptionOptionsBase(Organization org, StaticStore.Plan plan, TaxInfo taxInfo, int additionalSeats,
        int additionalStorageGb, bool premiumAccessAddon, int additionalSmSeats, int additionalServiceAccounts)
    {
        Items = new List<SubscriptionItemOptions>();
@ -14,79 +14,80 @@ public class OrganizationSubscriptionOptionsBase : Stripe.SubscriptionCreateOpti
        {
            [org.GatewayIdField()] = org.Id.ToString()
        };
-        foreach (var plan in plans)
-        {
-            AddPlanIdToSubscription(plan);

-            switch (plan.BitwardenProduct)
-            {
-                case BitwardenProductType.PasswordManager:
-                    {
-                        AddPremiumAccessAddon(premiumAccessAddon, plan);
-                        AddAdditionalSeatToSubscription(additionalSeats, plan);
-                        AddAdditionalStorage(additionalStorageGb, plan);
-                        break;
-                    }
-                case BitwardenProductType.SecretsManager:
-                    {
-                        AddAdditionalSeatToSubscription(additionalSmSeats, plan);
-                        AddServiceAccount(additionalServiceAccounts, plan);
-                        break;
-                    }
-            }
+        AddPlanIdToSubscription(plan);
+
+        if (org.UseSecretsManager)
+        {
+            AddSecretsManagerSeat(plan, additionalSmSeats);
+            AddServiceAccount(plan, additionalServiceAccounts);
        }

+        AddPremiumAccessAddon(plan, premiumAccessAddon);
+        AddPasswordManagerSeat(plan, additionalSeats);
+        AddAdditionalStorage(plan, additionalStorageGb);
+
        if (!string.IsNullOrWhiteSpace(taxInfo?.StripeTaxRateId))
        {
            DefaultTaxRates = new List<string> { taxInfo.StripeTaxRateId };
        }
    }

-    private void AddServiceAccount(int additionalServiceAccounts, StaticStore.Plan plan)
+    private void AddSecretsManagerSeat(Plan plan, int additionalSmSeats)
    {
-        if (additionalServiceAccounts > 0 && plan.StripeServiceAccountPlanId != null)
+        if (additionalSmSeats > 0 && plan.SecretsManager.StripeSeatPlanId != null)
+        {
+            Items.Add(new SubscriptionItemOptions
+            { Plan = plan.SecretsManager.StripeSeatPlanId, Quantity = additionalSmSeats });
+        }
+    }
+
+    private void AddPasswordManagerSeat(Plan plan, int additionalSeats)
+    {
+        if (additionalSeats > 0 && plan.PasswordManager.StripeSeatPlanId != null)
+        {
+            Items.Add(new SubscriptionItemOptions
+            { Plan = plan.PasswordManager.StripeSeatPlanId, Quantity = additionalSeats });
+        }
+    }
+
+    private void AddServiceAccount(StaticStore.Plan plan, int additionalServiceAccounts)
+    {
+        if (additionalServiceAccounts > 0 && plan.SecretsManager.StripeServiceAccountPlanId != null)
        {
            Items.Add(new SubscriptionItemOptions
            {
-                Plan = plan.StripeServiceAccountPlanId,
+                Plan = plan.SecretsManager.StripeServiceAccountPlanId,
                Quantity = additionalServiceAccounts
            });
        }
    }

-    private void AddAdditionalStorage(int additionalStorageGb, StaticStore.Plan plan)
+    private void AddAdditionalStorage(StaticStore.Plan plan, int additionalStorageGb)
    {
        if (additionalStorageGb > 0)
        {
            Items.Add(new SubscriptionItemOptions
            {
-                Plan = plan.StripeStoragePlanId,
+                Plan = plan.PasswordManager.StripeStoragePlanId,
                Quantity = additionalStorageGb
            });
        }
    }

-    private void AddPremiumAccessAddon(bool premiumAccessAddon, StaticStore.Plan plan)
+    private void AddPremiumAccessAddon(StaticStore.Plan plan, bool premiumAccessAddon)
    {
-        if (premiumAccessAddon && plan.StripePremiumAccessPlanId != null)
+        if (premiumAccessAddon && plan.PasswordManager.StripePremiumAccessPlanId != null)
        {
-            Items.Add(new SubscriptionItemOptions { Plan = plan.StripePremiumAccessPlanId, Quantity = 1 });
-        }
-    }
-
-    private void AddAdditionalSeatToSubscription(int additionalSeats, StaticStore.Plan plan)
-    {
-        if (additionalSeats > 0 && plan.StripeSeatPlanId != null)
-        {
-            Items.Add(new SubscriptionItemOptions { Plan = plan.StripeSeatPlanId, Quantity = additionalSeats });
+            Items.Add(new SubscriptionItemOptions { Plan = plan.PasswordManager.StripePremiumAccessPlanId, Quantity = 1 });
        }
    }

    private void AddPlanIdToSubscription(StaticStore.Plan plan)
    {
-        if (plan.StripePlanId != null)
+        if (plan.PasswordManager.StripePlanId != null)
        {
-            Items.Add(new SubscriptionItemOptions { Plan = plan.StripePlanId, Quantity = 1 });
+            Items.Add(new SubscriptionItemOptions { Plan = plan.PasswordManager.StripePlanId, Quantity = 1 });
        }
    }
 }
@ -94,14 +95,14 @@ public class OrganizationSubscriptionOptionsBase : Stripe.SubscriptionCreateOpti
 public class OrganizationPurchaseSubscriptionOptions : OrganizationSubscriptionOptionsBase
 {
    public OrganizationPurchaseSubscriptionOptions(
-        Organization org, List<StaticStore.Plan> plans,
+        Organization org, StaticStore.Plan plan,
        TaxInfo taxInfo, int additionalSeats,
        int additionalStorageGb, bool premiumAccessAddon,
        int additionalSmSeats, int additionalServiceAccounts) :
-        base(org, plans, taxInfo, additionalSeats, additionalStorageGb, premiumAccessAddon, additionalSmSeats, additionalServiceAccounts)
+        base(org, plan, taxInfo, additionalSeats, additionalStorageGb, premiumAccessAddon, additionalSmSeats, additionalServiceAccounts)
    {
        OffSession = true;
-        TrialPeriodDays = plans.FirstOrDefault(x => x.BitwardenProduct == BitwardenProductType.PasswordManager)!.TrialPeriodDays;
+        TrialPeriodDays = plan.TrialPeriodDays;
    }
 }

@ -109,8 +110,8 @@ public class OrganizationUpgradeSubscriptionOptions : OrganizationSubscriptionOp
 {
    public OrganizationUpgradeSubscriptionOptions(
        string customerId, Organization org,
-        List<StaticStore.Plan> plans, OrganizationUpgrade upgrade) :
-        base(org, plans, upgrade.TaxInfo, upgrade.AdditionalSeats, upgrade.AdditionalStorageGb,
+        StaticStore.Plan plan, OrganizationUpgrade upgrade) :
+        base(org, plan, upgrade.TaxInfo, upgrade.AdditionalSeats, upgrade.AdditionalStorageGb,
        upgrade.PremiumAccessAddon, upgrade.AdditionalSmSeats.GetValueOrDefault(),
        upgrade.AdditionalServiceAccounts.GetValueOrDefault())
    {
--- a/src/Core/Models/Business/SubscriptionInfo.cs
+++ b/src/Core/Models/Business/SubscriptionInfo.cs
@ -1,5 +1,4 @@
-using Bit.Core.Enums;
-using Stripe;
+using Stripe;

 namespace Bit.Core.Models.Business;

@ -64,16 +63,12 @@ public class SubscriptionInfo
                    Interval = item.Plan.Interval;
                    AddonSubscriptionItem =
                        Utilities.StaticStore.IsAddonSubscriptionItem(item.Plan.Id);
-                    BitwardenProduct =
-                        Utilities.StaticStore.GetPlanByStripeId(item.Plan.Id)?.BitwardenProduct ?? BitwardenProductType.PasswordManager;
                }

                Quantity = (int)item.Quantity;
                SponsoredSubscriptionItem = Utilities.StaticStore.SponsoredPlans.Any(p => p.StripePlanId == item.Plan.Id);
            }

-            public BitwardenProductType BitwardenProduct { get; set; }
-
            public bool AddonSubscriptionItem { get; set; }

            public string Name { get; set; }
--- a/src/Core/Models/Business/SubscriptionUpdate.cs
+++ b/src/Core/Models/Business/SubscriptionUpdate.cs
@ -1,5 +1,4 @@
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Stripe;

 namespace Bit.Core.Models.Business;
@ -30,29 +29,23 @@ public abstract class SubscriptionUpdate
        planId == null ? null : subscription.Items?.Data?.FirstOrDefault(i => i.Plan.Id == planId);
 }

-public class SeatSubscriptionUpdate : SubscriptionUpdate
+public abstract class BaseSeatSubscriptionUpdate : SubscriptionUpdate
 {
    private readonly int _previousSeats;
-    private readonly StaticStore.Plan _plan;
+    protected readonly StaticStore.Plan Plan;
    private readonly long? _additionalSeats;
-    protected override List<string> PlanIds => new() { _plan.StripeSeatPlanId };

-
-    public SeatSubscriptionUpdate(Organization organization, StaticStore.Plan plan, long? additionalSeats)
+    protected BaseSeatSubscriptionUpdate(Organization organization, StaticStore.Plan plan, long? additionalSeats, int previousSeats)
    {
-        _plan = plan;
+        Plan = plan;
        _additionalSeats = additionalSeats;
-        switch (plan.BitwardenProduct)
-        {
-            case BitwardenProductType.PasswordManager:
-                _previousSeats = organization.Seats.GetValueOrDefault();
-                break;
-            case BitwardenProductType.SecretsManager:
-                _previousSeats = organization.SmSeats.GetValueOrDefault();
-                break;
-        }
+        _previousSeats = previousSeats;
    }

+    protected abstract string GetPlanId();
+
+    protected override List<string> PlanIds => new() { GetPlanId() };
+
    public override List<SubscriptionItemOptions> UpgradeItemsOptions(Subscription subscription)
    {
        var item = SubscriptionItem(subscription, PlanIds.Single());
@ -85,12 +78,30 @@ public class SeatSubscriptionUpdate : SubscriptionUpdate
    }
 }

+public class SeatSubscriptionUpdate : BaseSeatSubscriptionUpdate
+{
+    public SeatSubscriptionUpdate(Organization organization, StaticStore.Plan plan, long? additionalSeats)
+        : base(organization, plan, additionalSeats, organization.Seats.GetValueOrDefault())
+    { }
+
+    protected override string GetPlanId() => Plan.PasswordManager.StripeSeatPlanId;
+}
+
+public class SmSeatSubscriptionUpdate : BaseSeatSubscriptionUpdate
+{
+    public SmSeatSubscriptionUpdate(Organization organization, StaticStore.Plan plan, long? additionalSeats)
+        : base(organization, plan, additionalSeats, organization.SmSeats.GetValueOrDefault())
+    { }
+
+    protected override string GetPlanId() => Plan.SecretsManager.StripeSeatPlanId;
+}
+
 public class ServiceAccountSubscriptionUpdate : SubscriptionUpdate
 {
    private long? _prevServiceAccounts;
    private readonly StaticStore.Plan _plan;
    private readonly long? _additionalServiceAccounts;
-    protected override List<string> PlanIds => new() { _plan.StripeServiceAccountPlanId };
+    protected override List<string> PlanIds => new() { _plan.SecretsManager.StripeServiceAccountPlanId };

    public ServiceAccountSubscriptionUpdate(Organization organization, StaticStore.Plan plan, long? additionalServiceAccounts)
    {
@ -190,7 +201,7 @@ public class SponsorOrganizationSubscriptionUpdate : SubscriptionUpdate

    public SponsorOrganizationSubscriptionUpdate(StaticStore.Plan existingPlan, StaticStore.SponsoredPlan sponsoredPlan, bool applySponsorship)
    {
-        _existingPlanStripeId = existingPlan.StripePlanId;
+        _existingPlanStripeId = existingPlan.PasswordManager.StripePlanId;
        _sponsoredPlanStripeId = sponsoredPlan?.StripePlanId;
        _applySponsorship = applySponsorship;
    }
@ -269,7 +280,7 @@ public class SecretsManagerSubscribeUpdate : SubscriptionUpdate
    private readonly long? _additionalServiceAccounts;
    private readonly int _previousSeats;
    private readonly int _previousServiceAccounts;
-    protected override List<string> PlanIds => new() { _plan.StripeSeatPlanId, _plan.StripeServiceAccountPlanId };
+    protected override List<string> PlanIds => new() { _plan.SecretsManager.StripeSeatPlanId, _plan.SecretsManager.StripeServiceAccountPlanId };
    public SecretsManagerSubscribeUpdate(Organization organization, StaticStore.Plan plan, long? additionalSeats, long? additionalServiceAccounts)
    {
        _plan = plan;
@ -303,7 +314,7 @@ public class SecretsManagerSubscribeUpdate : SubscriptionUpdate
        {
            updatedItems.Add(new SubscriptionItemOptions
            {
-                Price = _plan.StripeSeatPlanId,
+                Price = _plan.SecretsManager.StripeSeatPlanId,
                Quantity = _additionalSeats
            });
        }
@ -312,7 +323,7 @@ public class SecretsManagerSubscribeUpdate : SubscriptionUpdate
        {
            updatedItems.Add(new SubscriptionItemOptions
            {
-                Price = _plan.StripeServiceAccountPlanId,
+                Price = _plan.SecretsManager.StripeServiceAccountPlanId,
                Quantity = _additionalServiceAccounts
            });
        }
@ -322,14 +333,14 @@ public class SecretsManagerSubscribeUpdate : SubscriptionUpdate
    {
        updatedItems.Add(new SubscriptionItemOptions
        {
-            Price = _plan.StripeSeatPlanId,
+            Price = _plan.SecretsManager.StripeSeatPlanId,
            Quantity = _previousSeats,
            Deleted = _previousSeats == 0 ? true : (bool?)null,
        });

        updatedItems.Add(new SubscriptionItemOptions
        {
-            Price = _plan.StripeServiceAccountPlanId,
+            Price = _plan.SecretsManager.StripeServiceAccountPlanId,
            Quantity = _previousServiceAccounts,
            Deleted = _previousServiceAccounts == 0 ? true : (bool?)null,
        });
--- a/src/Core/Models/StaticStore/Plan.cs
+++ b/src/Core/Models/StaticStore/Plan.cs
@ -2,64 +2,84 @@

 namespace Bit.Core.Models.StaticStore;

-public class Plan
+public abstract record Plan
 {
-    public PlanType Type { get; set; }
-    public ProductType Product { get; set; }
-    public string Name { get; set; }
-    public bool IsAnnual { get; set; }
-    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 short? MaxServiceAccounts { get; set; }
-    public bool AllowSeatAutoscale { get; set; }
+    public PlanType Type { get; protected init; }
+    public ProductType Product { get; protected init; }
+    public string Name { get; protected init; }
+    public bool IsAnnual { get; protected init; }
+    public string NameLocalizationKey { get; protected init; }
+    public string DescriptionLocalizationKey { get; protected init; }
+    public bool CanBeUsedByBusiness { get; protected init; }
+    public int? TrialPeriodDays { get; protected init; }
+    public bool HasSelfHost { get; protected init; }
+    public bool HasPolicies { get; protected init; }
+    public bool HasGroups { get; protected init; }
+    public bool HasDirectory { get; protected init; }
+    public bool HasEvents { get; protected init; }
+    public bool HasTotp { get; protected init; }
+    public bool Has2fa { get; protected init; }
+    public bool HasApi { get; protected init; }
+    public bool HasSso { get; protected init; }
+    public bool HasKeyConnector { get; protected init; }
+    public bool HasScim { get; protected init; }
+    public bool HasResetPassword { get; protected init; }
+    public bool UsersGetPremium { get; protected init; }
+    public bool HasCustomPermissions { get; protected init; }
+    public int UpgradeSortOrder { get; protected init; }
+    public int DisplaySortOrder { get; protected init; }
+    public int? LegacyYear { get; protected init; }
+    public bool Disabled { get; protected init; }
+    public PasswordManagerPlanFeatures PasswordManager { get; protected init; }
+    public SecretsManagerPlanFeatures SecretsManager { get; protected init; }
+    public bool SupportsSecretsManager => SecretsManager != null;

-    public bool AllowServiceAccountsAutoscale { get; set; }
+    public record SecretsManagerPlanFeatures
+    {
+        // 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 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; }
+        // Features
+        public int MaxProjects { get; init; }
+    }

-    public bool HasSelfHost { get; set; }
-    public bool HasPolicies { get; set; }
-    public bool HasGroups { get; set; }
-    public bool HasDirectory { get; set; }
-    public bool HasEvents { get; set; }
-    public bool HasTotp { get; set; }
-    public bool Has2fa { get; set; }
-    public bool HasApi { get; set; }
-    public bool HasSso { get; set; }
-    public bool HasKeyConnector { get; set; }
-    public bool HasScim { get; set; }
-    public bool HasResetPassword { get; set; }
-    public bool UsersGetPremium { get; set; }
-    public bool HasCustomPermissions { get; set; }
-
-    public int UpgradeSortOrder { get; set; }
-    public int DisplaySortOrder { get; set; }
-    public int? LegacyYear { get; set; }
-    public bool Disabled { get; set; }
-
-    public string StripePlanId { get; set; }
-    public string StripeSeatPlanId { get; set; }
-    public string StripeStoragePlanId { get; set; }
-    public string StripeServiceAccountPlanId { 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 decimal? AdditionalPricePerServiceAccount { get; set; }
-    public short? BaseServiceAccount { get; set; }
-    public short? MaxAdditionalServiceAccount { get; set; }
-    public bool HasAdditionalServiceAccountOption { get; set; }
-    public short? MaxProjects { get; set; }
-    public BitwardenProductType BitwardenProduct { get; set; }
+    public record PasswordManagerPlanFeatures
+    {
+        // 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; }
+    }
 }
--- a/src/Core/Models/StaticStore/Plans/CustomPlan.cs
+++ b/src/Core/Models/StaticStore/Plans/CustomPlan.cs
@ -0,0 +1,20 @@
+using Bit.Core.Enums;
+
+namespace Bit.Core.Models.StaticStore.Plans;
+
+public record CustomPlan : Models.StaticStore.Plan
+{
+    public CustomPlan()
+    {
+        Type = PlanType.Custom;
+        PasswordManager = new CustomPasswordManagerFeatures();
+    }
+
+    private record CustomPasswordManagerFeatures : PasswordManagerPlanFeatures
+    {
+        public CustomPasswordManagerFeatures()
+        {
+            AllowSeatAutoscale = true;
+        }
+    }
+}
--- a/src/Core/Models/StaticStore/Plans/Enterprise2019Plan.cs
+++ b/src/Core/Models/StaticStore/Plans/Enterprise2019Plan.cs
@ -0,0 +1,65 @@
+using Bit.Core.Enums;
+
+namespace Bit.Core.Models.StaticStore.Plans;
+
+public record Enterprise2019Plan : Models.StaticStore.Plan
+{
+    public Enterprise2019Plan(bool isAnnual)
+    {
+        Type = isAnnual ? PlanType.EnterpriseAnnually2019 : PlanType.EnterpriseMonthly2019;
+        Product = ProductType.Enterprise;
+        Name = isAnnual ? "Enterprise (Annually) 2019" : "Enterprise (Monthly) 2019";
+        IsAnnual = isAnnual;
+        NameLocalizationKey = "planNameEnterprise";
+        DescriptionLocalizationKey = "planDescEnterprise";
+        CanBeUsedByBusiness = true;
+
+        TrialPeriodDays = 7;
+
+        HasPolicies = true;
+        HasSelfHost = true;
+        HasGroups = true;
+        HasDirectory = true;
+        HasEvents = true;
+        HasTotp = true;
+        Has2fa = true;
+        HasApi = true;
+        UsersGetPremium = true;
+        HasCustomPermissions = true;
+
+        UpgradeSortOrder = 3;
+        DisplaySortOrder = 3;
+        LegacyYear = 2020;
+
+        PasswordManager = new Enterprise2019PasswordManagerFeatures(isAnnual);
+    }
+
+    private record Enterprise2019PasswordManagerFeatures : PasswordManagerPlanFeatures
+    {
+        public Enterprise2019PasswordManagerFeatures(bool isAnnual)
+        {
+            BaseSeats = 0;
+            BaseStorageGb = 1;
+
+            HasAdditionalStorageOption = true;
+            HasAdditionalSeatsOption = true;
+
+            AllowSeatAutoscale = true;
+
+            if (isAnnual)
+            {
+                StripeStoragePlanId = "storage-gb-annually";
+                StripeSeatPlanId = "enterprise-org-seat-annually";
+                SeatPrice = 36;
+                AdditionalStoragePricePerGb = 4;
+            }
+            else
+            {
+                StripeSeatPlanId = "enterprise-org-seat-monthly";
+                StripeStoragePlanId = "storage-gb-monthly";
+                SeatPrice = 4M;
+                AdditionalStoragePricePerGb = 0.5M;
+            }
+        }
+    }
+}
--- a/src/Core/Models/StaticStore/Plans/EnterprisePlan.cs
+++ b/src/Core/Models/StaticStore/Plans/EnterprisePlan.cs
@ -0,0 +1,100 @@
+using Bit.Core.Enums;
+
+namespace Bit.Core.Models.StaticStore.Plans;
+
+public record EnterprisePlan : Models.StaticStore.Plan
+{
+    public EnterprisePlan(bool isAnnual)
+    {
+        Type = isAnnual ? PlanType.EnterpriseAnnually : PlanType.EnterpriseMonthly;
+        Product = ProductType.Enterprise;
+        Name = isAnnual ? "Enterprise (Annually)" : "Enterprise (Monthly)";
+        IsAnnual = isAnnual;
+        NameLocalizationKey = "planNameEnterprise";
+        DescriptionLocalizationKey = "planDescEnterprise";
+        CanBeUsedByBusiness = true;
+
+        TrialPeriodDays = 7;
+
+        HasPolicies = true;
+        HasSelfHost = true;
+        HasGroups = true;
+        HasDirectory = true;
+        HasEvents = true;
+        HasTotp = true;
+        Has2fa = true;
+        HasApi = true;
+        HasSso = true;
+        HasKeyConnector = true;
+        HasScim = true;
+        HasResetPassword = true;
+        UsersGetPremium = true;
+        HasCustomPermissions = true;
+
+        UpgradeSortOrder = 3;
+        DisplaySortOrder = 3;
+
+        PasswordManager = new EnterprisePasswordManagerFeatures(isAnnual);
+        SecretsManager = new EnterpriseSecretsManagerFeatures(isAnnual);
+    }
+
+    private record EnterpriseSecretsManagerFeatures : SecretsManagerPlanFeatures
+    {
+        public EnterpriseSecretsManagerFeatures(bool isAnnual)
+        {
+            BaseSeats = 0;
+            BasePrice = 0;
+            BaseServiceAccount = 200;
+
+            HasAdditionalSeatsOption = true;
+            HasAdditionalServiceAccountOption = true;
+
+            AllowSeatAutoscale = true;
+            AllowServiceAccountsAutoscale = true;
+
+            if (isAnnual)
+            {
+                StripeSeatPlanId = "secrets-manager-enterprise-seat-annually";
+                StripeServiceAccountPlanId = "secrets-manager-service-account-annually";
+                SeatPrice = 144;
+                AdditionalPricePerServiceAccount = 6;
+            }
+            else
+            {
+                StripeSeatPlanId = "secrets-manager-enterprise-seat-monthly";
+                StripeServiceAccountPlanId = "secrets-manager-service-account-monthly";
+                SeatPrice = 13;
+                AdditionalPricePerServiceAccount = 0.5M;
+            }
+        }
+    }
+
+    private record EnterprisePasswordManagerFeatures : PasswordManagerPlanFeatures
+    {
+        public EnterprisePasswordManagerFeatures(bool isAnnual)
+        {
+            BaseSeats = 0;
+            BaseStorageGb = 1;
+
+            HasAdditionalStorageOption = true;
+            HasAdditionalSeatsOption = true;
+
+            AllowSeatAutoscale = true;
+
+            if (isAnnual)
+            {
+                AdditionalStoragePricePerGb = 4;
+                StripeStoragePlanId = "storage-gb-annually";
+                StripeSeatPlanId = "2020-enterprise-org-seat-annually";
+                SeatPrice = 60;
+            }
+            else
+            {
+                StripeSeatPlanId = "2020-enterprise-seat-monthly";
+                StripeStoragePlanId = "storage-gb-monthly";
+                SeatPrice = 6;
+                AdditionalStoragePricePerGb = 0.5M;
+            }
+        }
+    }
+}
--- a/src/Core/Models/StaticStore/Plans/Families2019Plan.cs
+++ b/src/Core/Models/StaticStore/Plans/Families2019Plan.cs
@ -0,0 +1,49 @@
+using Bit.Core.Enums;
+
+namespace Bit.Core.Models.StaticStore.Plans;
+
+public record Families2019Plan : Models.StaticStore.Plan
+{
+    public Families2019Plan()
+    {
+        Type = PlanType.FamiliesAnnually2019;
+        Product = ProductType.Families;
+        Name = "Families 2019";
+        IsAnnual = true;
+        NameLocalizationKey = "planNameFamilies";
+        DescriptionLocalizationKey = "planDescFamilies";
+
+        TrialPeriodDays = 7;
+
+        HasSelfHost = true;
+        HasTotp = true;
+
+        UpgradeSortOrder = 1;
+        DisplaySortOrder = 1;
+        LegacyYear = 2020;
+
+        PasswordManager = new Families2019PasswordManagerFeatures();
+    }
+
+    private record Families2019PasswordManagerFeatures : PasswordManagerPlanFeatures
+    {
+        public Families2019PasswordManagerFeatures()
+        {
+            BaseSeats = 5;
+            BaseStorageGb = 1;
+            MaxSeats = 5;
+
+            HasAdditionalStorageOption = true;
+            HasPremiumAccessOption = true;
+
+            StripePlanId = "personal-org-annually";
+            StripeStoragePlanId = "storage-gb-annually";
+            StripePremiumAccessPlanId = "personal-org-premium-access-annually";
+            BasePrice = 12;
+            AdditionalStoragePricePerGb = 4;
+            PremiumAccessOptionPrice = 40;
+
+            AllowSeatAutoscale = false;
+        }
+    }
+}
--- a/src/Core/Models/StaticStore/Plans/FamiliesPlan.cs
+++ b/src/Core/Models/StaticStore/Plans/FamiliesPlan.cs
@ -0,0 +1,46 @@
+using Bit.Core.Enums;
+
+namespace Bit.Core.Models.StaticStore.Plans;
+
+public record FamiliesPlan : Models.StaticStore.Plan
+{
+    public FamiliesPlan()
+    {
+        Type = PlanType.FamiliesAnnually;
+        Product = ProductType.Families;
+        Name = "Families";
+        IsAnnual = true;
+        NameLocalizationKey = "planNameFamilies";
+        DescriptionLocalizationKey = "planDescFamilies";
+
+        TrialPeriodDays = 7;
+
+        HasSelfHost = true;
+        HasTotp = true;
+        UsersGetPremium = true;
+
+        UpgradeSortOrder = 1;
+        DisplaySortOrder = 1;
+
+        PasswordManager = new TeamsPasswordManagerFeatures();
+    }
+
+    private record TeamsPasswordManagerFeatures : PasswordManagerPlanFeatures
+    {
+        public TeamsPasswordManagerFeatures()
+        {
+            BaseSeats = 6;
+            BaseStorageGb = 1;
+            MaxSeats = 6;
+
+            HasAdditionalStorageOption = true;
+
+            StripePlanId = "2020-families-org-annually";
+            StripeStoragePlanId = "storage-gb-annually";
+            BasePrice = 40;
+            AdditionalStoragePricePerGb = 4;
+
+            AllowSeatAutoscale = false;
+        }
+    }
+}
--- a/src/Core/Models/StaticStore/Plans/FreePlan.cs
+++ b/src/Core/Models/StaticStore/Plans/FreePlan.cs
@ -0,0 +1,47 @@
+using Bit.Core.Enums;
+
+namespace Bit.Core.Models.StaticStore.Plans;
+
+public record FreePlan : Models.StaticStore.Plan
+{
+    public FreePlan()
+    {
+        Type = PlanType.Free;
+        Product = ProductType.Free;
+        Name = "Free";
+        NameLocalizationKey = "planNameFree";
+        DescriptionLocalizationKey = "planDescFree";
+
+        UpgradeSortOrder = -1; // Always the lowest plan, cannot be upgraded to
+        DisplaySortOrder = -1;
+
+        PasswordManager = new FreePasswordManagerFeatures();
+        SecretsManager = new FreeSecretsManagerFeatures();
+    }
+
+    private record FreeSecretsManagerFeatures : SecretsManagerPlanFeatures
+    {
+        public FreeSecretsManagerFeatures()
+        {
+            BaseSeats = 2;
+            BaseServiceAccount = 3;
+            MaxProjects = 3;
+            MaxSeats = 2;
+            MaxServiceAccounts = 3;
+
+            AllowSeatAutoscale = false;
+        }
+    }
+
+    private record FreePasswordManagerFeatures : PasswordManagerPlanFeatures
+    {
+        public FreePasswordManagerFeatures()
+        {
+            BaseSeats = 2;
+            MaxCollections = 2;
+            MaxSeats = 2;
+
+            AllowSeatAutoscale = false;
+        }
+    }
+}
--- a/src/Core/Models/StaticStore/Plans/Teams2019Plan.cs
+++ b/src/Core/Models/StaticStore/Plans/Teams2019Plan.cs
@ -0,0 +1,60 @@
+using Bit.Core.Enums;
+
+namespace Bit.Core.Models.StaticStore.Plans;
+
+public record Teams2019Plan : Models.StaticStore.Plan
+{
+    public Teams2019Plan(bool isAnnual)
+    {
+        Type = isAnnual ? PlanType.TeamsAnnually2019 : PlanType.TeamsMonthly2019;
+        Product = ProductType.Teams;
+        Name = isAnnual ? "Teams (Annually) 2019" : "Teams (Monthly) 2019";
+        IsAnnual = isAnnual;
+        NameLocalizationKey = "planNameTeams";
+        DescriptionLocalizationKey = "planDescTeams";
+        CanBeUsedByBusiness = true;
+
+        TrialPeriodDays = 7;
+
+        HasTotp = true;
+
+        UpgradeSortOrder = 2;
+        DisplaySortOrder = 2;
+        LegacyYear = 2020;
+
+        PasswordManager = new Teams2019PasswordManagerFeatures(isAnnual);
+    }
+
+    private record Teams2019PasswordManagerFeatures : PasswordManagerPlanFeatures
+    {
+        public Teams2019PasswordManagerFeatures(bool isAnnual)
+        {
+            BaseSeats = 5;
+            BaseStorageGb = 1;
+
+            HasAdditionalStorageOption = true;
+            HasAdditionalSeatsOption = true;
+
+            AllowSeatAutoscale = true;
+
+            if (isAnnual)
+            {
+                StripePlanId = "teams-org-annually";
+                StripeStoragePlanId = "storage-gb-annually";
+                StripeSeatPlanId = "teams-org-seat-annually";
+                SeatPrice = 24;
+                BasePrice = 60;
+                AdditionalStoragePricePerGb = 4;
+            }
+            else
+            {
+                StripePlanId = "teams-org-monthly";
+                StripeSeatPlanId = "teams-org-seat-monthly";
+                StripeStoragePlanId = "storage-gb-monthly";
+                BasePrice = 8;
+                SeatPrice = 2.5M;
+                AdditionalStoragePricePerGb = 0.5M;
+            }
+        }
+    }
+}
--- a/src/Core/Models/StaticStore/Plans/TeamsPlan.cs
+++ b/src/Core/Models/StaticStore/Plans/TeamsPlan.cs
@ -0,0 +1,94 @@
+using Bit.Core.Enums;
+
+namespace Bit.Core.Models.StaticStore.Plans;
+
+public record TeamsPlan : Models.StaticStore.Plan
+{
+    public TeamsPlan(bool isAnnual)
+    {
+        Type = isAnnual ? PlanType.TeamsAnnually : PlanType.TeamsMonthly;
+        Product = ProductType.Teams;
+        Name = isAnnual ? "Teams (Annually)" : "Teams (Monthly)";
+        IsAnnual = isAnnual;
+        NameLocalizationKey = "planNameTeams";
+        DescriptionLocalizationKey = "planDescTeams";
+        CanBeUsedByBusiness = true;
+
+        TrialPeriodDays = 7;
+
+        HasGroups = true;
+        HasDirectory = true;
+        HasEvents = true;
+        HasTotp = true;
+        Has2fa = true;
+        HasApi = true;
+        UsersGetPremium = true;
+
+        UpgradeSortOrder = 2;
+        DisplaySortOrder = 2;
+
+        PasswordManager = new TeamsPasswordManagerFeatures(isAnnual);
+        SecretsManager = new TeamsSecretsManagerFeatures(isAnnual);
+    }
+
+    private record TeamsSecretsManagerFeatures : SecretsManagerPlanFeatures
+    {
+        public TeamsSecretsManagerFeatures(bool isAnnual)
+        {
+            BaseSeats = 0;
+            BasePrice = 0;
+            BaseServiceAccount = 50;
+
+            HasAdditionalSeatsOption = true;
+            HasAdditionalServiceAccountOption = true;
+
+            AllowSeatAutoscale = true;
+            AllowServiceAccountsAutoscale = true;
+
+            if (isAnnual)
+            {
+                StripeSeatPlanId = "secrets-manager-teams-seat-annually";
+                StripeServiceAccountPlanId = "secrets-manager-service-account-annually";
+                SeatPrice = 72;
+                AdditionalPricePerServiceAccount = 6;
+            }
+            else
+            {
+                StripeSeatPlanId = "secrets-manager-teams-seat-monthly";
+                StripeServiceAccountPlanId = "secrets-manager-service-account-monthly";
+                SeatPrice = 7;
+                AdditionalPricePerServiceAccount = 0.5M;
+            }
+        }
+    }
+
+    private record TeamsPasswordManagerFeatures : PasswordManagerPlanFeatures
+    {
+        public TeamsPasswordManagerFeatures(bool isAnnual)
+        {
+            BaseSeats = 0;
+            BaseStorageGb = 1;
+            BasePrice = 0;
+
+            HasAdditionalStorageOption = true;
+            HasAdditionalSeatsOption = true;
+
+            AllowSeatAutoscale = true;
+
+            if (isAnnual)
+            {
+                StripeStoragePlanId = "storage-gb-annually";
+                StripeSeatPlanId = "2020-teams-org-seat-annually";
+                SeatPrice = 36;
+                AdditionalStoragePricePerGb = 4;
+            }
+            else
+            {
+                StripeSeatPlanId = "2020-teams-org-seat-monthly";
+                StripeStoragePlanId = "storage-gb-monthly";
+                SeatPrice = 4;
+                AdditionalStoragePricePerGb = 0.5M;
+            }
+        }
+    }
+}