[PM-8830] Billing Enums Rename (#4180)

* Renamed ProductType to ProductTierType

* Renamed Product properties to ProductTier

* Moved ProductTierType to Bit.Core.Billing.Enums namespace from Bit.Core.Enums

* Moved PlanType enum to Bit.Core.Billing.Enums

* Moved StaticStore to Bit.Core.Billing.Models.StaticStore namespace

* Added ProductType enum

* dotnet format

bitwarden_license/src/Commercial.Core/AdminConsole/Providers/CreateProviderCommand.cs

@@ -5,6 +5,7 @@ using Bit.Core.AdminConsole.Providers.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.AdminConsole.Services;
 using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Repositories;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;

bitwarden_license/src/Commercial.Core/AdminConsole/Services/ProviderService.cs

@@ -7,6 +7,7 @@ using Bit.Core.AdminConsole.Models.Business.Provider;
 using Bit.Core.AdminConsole.Models.Business.Tokenables;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.AdminConsole.Services;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Extensions;
 using Bit.Core.Context;
 using Bit.Core.Entities;

bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs

@@ -8,6 +8,7 @@ using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing;
 using Bit.Core.Billing.Constants;
 using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Extensions;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Repositories;

bitwarden_license/src/Commercial.Core/SecretsManager/Queries/Projects/MaxProjectsQuery.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 using Bit.Core.SecretsManager.Queries.Projects.Interfaces;

bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/RemoveOrganizationFromProviderCommandTests.cs

@@ -5,6 +5,7 @@ using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Constants;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Services;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;

bitwarden_license/test/Commercial.Core.Test/AdminConsole/Services/ProviderServiceTests.cs

@@ -7,6 +7,7 @@ using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Models.Business.Provider;
 using Bit.Core.AdminConsole.Models.Business.Tokenables;
 using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;

bitwarden_license/test/Commercial.Core.Test/Billing/ProviderBillingServiceTests.cs

@@ -10,6 +10,7 @@ using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing;
 using Bit.Core.Billing.Constants;
 using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Repositories;
 using Bit.Core.Billing.Services;

bitwarden_license/test/Commercial.Core.Test/SecretsManager/Queries/Projects/MaxProjectsQueryTests.cs

@@ -1,6 +1,6 @@
 using Bit.Commercial.Core.SecretsManager.Queries.Projects;
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 using Bit.Core.SecretsManager.Repositories;

src/Admin/AdminConsole/Controllers/ProvidersController.cs

@@ -10,6 +10,7 @@ using Bit.Core.AdminConsole.Providers.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.AdminConsole.Services;
 using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Extensions;
 using Bit.Core.Billing.Repositories;
 using Bit.Core.Enums;

src/Admin/AdminConsole/Models/OrganizationEditModel.cs

@@ -3,6 +3,7 @@ using System.Net;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -22,8 +23,8 @@ public class OrganizationEditModel : OrganizationViewModel
     {
         Provider = provider;
         BillingEmail = provider.Type == ProviderType.Reseller ? provider.BillingEmail : string.Empty;
-        PlanType = Core.Enums.PlanType.TeamsMonthly;
+        PlanType = Core.Billing.Enums.PlanType.TeamsMonthly;
-        Plan = Core.Enums.PlanType.TeamsMonthly.GetDisplayAttribute()?.GetName();
+        Plan = Core.Billing.Enums.PlanType.TeamsMonthly.GetDisplayAttribute()?.GetName();
         LicenseKey = RandomLicenseKey;
     }
 

src/Admin/AdminConsole/Models/ProviderEditModel.cs

@@ -2,6 +2,7 @@
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Models.Data.Provider;
 using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 
 namespace Bit.Admin.AdminConsole.Models;

src/Admin/AdminConsole/Views/Organizations/Edit.cshtml

@@ -1,5 +1,6 @@
 @using Bit.Admin.Enums;
 @using Bit.Admin.Models
+@using Bit.Core.Billing.Enums
 @using Bit.Core.Enums
 @inject Bit.Admin.Services.IAccessControlService AccessControlService
 @model OrganizationEditModel

src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml

@@ -1,6 +1,7 @@
 @using Bit.Admin.Enums;
 @using Bit.Core.Enums
 @using Bit.Core.AdminConsole.Enums.Provider
+@using Bit.Core.Billing.Enums
 @using Bit.SharedWeb.Utilities
 @inject Bit.Admin.Services.IAccessControlService AccessControlService;
 

src/Admin/AdminConsole/Views/Shared/_OrganizationFormScripts.cshtml

@@ -1,5 +1,6 @@
 @inject IWebHostEnvironment HostingEnvironment
 @using Bit.Admin.Utilities
+@using Bit.Core.Billing.Enums
 @using Bit.Core.Enums
 @model OrganizationEditModel
 

src/Admin/Views/Tools/StripeSubscriptions.cshtml

@@ -149,7 +149,7 @@
             <th>Id</th>
             <th>Customer Email</th>
             <th>Status</th>
-            <th>Product</th>
+            <th>Product Tier</th>
             <th>Current Period End</th>
         </tr>
         </thead>

src/Api/AdminConsole/Controllers/OrganizationsController.cs

@@ -18,6 +18,7 @@ using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Repositories;
 using Bit.Core.Auth.Services;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Extensions;
 using Bit.Core.Billing.Services;
 using Bit.Core.Context;
@@ -355,7 +356,7 @@ public class OrganizationsController : Controller
         {
             // Non-enterprise orgs should not be able to create or view an apikey of billing sync/scim key types
             var plan = StaticStore.GetPlan(organization.PlanType);
-            if (plan.Product != ProductType.Enterprise)
+            if (plan.ProductTier != ProductTierType.Enterprise)
             {
                 throw new NotFoundException();
             }

src/Api/AdminConsole/Models/Request/Organizations/OrganizationCreateRequestModel.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;

src/Api/AdminConsole/Models/Request/Organizations/OrganizationUpgradeRequestModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Models.Business;
 
 namespace Bit.Api.AdminConsole.Models.Request.Organizations;

src/Api/AdminConsole/Models/Response/Organizations/OrganizationResponseModel.cs

@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using Bit.Api.Models.Response;
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Business;
 using Bit.Core.Utilities;

src/Api/AdminConsole/Models/Response/ProfileOrganizationResponseModel.cs

@@ -2,6 +2,7 @@
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Data;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
@@ -33,7 +34,7 @@ public class ProfileOrganizationResponseModel : ResponseModel
         UsePasswordManager = organization.UsePasswordManager;
         UsersGetPremium = organization.UsersGetPremium;
         UseCustomPermissions = organization.UseCustomPermissions;
-        UseActivateAutofillPolicy = StaticStore.GetPlan(organization.PlanType).Product == ProductType.Enterprise;
+        UseActivateAutofillPolicy = StaticStore.GetPlan(organization.PlanType).ProductTier == ProductTierType.Enterprise;
         SelfHost = organization.SelfHost;
         Seats = organization.Seats;
         MaxCollections = organization.MaxCollections;
@@ -56,7 +57,7 @@ public class ProfileOrganizationResponseModel : ResponseModel
         FamilySponsorshipAvailable = FamilySponsorshipFriendlyName == null &&
             StaticStore.GetSponsoredPlan(PlanSponsorshipType.FamiliesForEnterprise)
             .UsersCanSponsor(organization);
-        PlanProductType = StaticStore.GetPlan(organization.PlanType).Product;
+        ProductTierType = StaticStore.GetPlan(organization.PlanType).ProductTier;
         FamilySponsorshipLastSyncDate = organization.FamilySponsorshipLastSyncDate;
         FamilySponsorshipToDelete = organization.FamilySponsorshipToDelete;
         FamilySponsorshipValidUntil = organization.FamilySponsorshipValidUntil;
@@ -147,7 +148,7 @@ public class ProfileOrganizationResponseModel : ResponseModel
     public ProviderType? ProviderType { get; set; }
     public string FamilySponsorshipFriendlyName { get; set; }
     public bool FamilySponsorshipAvailable { get; set; }
-    public ProductType PlanProductType { get; set; }
+    public ProductTierType ProductTierType { get; set; }
     public bool KeyConnectorEnabled { get; set; }
     public string KeyConnectorUrl { get; set; }
     public DateTime? FamilySponsorshipLastSyncDate { get; set; }

src/Api/AdminConsole/Models/Response/ProfileProviderOrganizationResponseModel.cs

@@ -1,4 +1,5 @@
 using Bit.Core.AdminConsole.Models.Data.Provider;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
@@ -25,7 +26,7 @@ public class ProfileProviderOrganizationResponseModel : ProfileOrganizationRespo
         UseResetPassword = organization.UseResetPassword;
         UsersGetPremium = organization.UsersGetPremium;
         UseCustomPermissions = organization.UseCustomPermissions;
-        UseActivateAutofillPolicy = StaticStore.GetPlan(organization.PlanType).Product == ProductType.Enterprise;
+        UseActivateAutofillPolicy = StaticStore.GetPlan(organization.PlanType).ProductTier == ProductTierType.Enterprise;
         SelfHost = organization.SelfHost;
         Seats = organization.Seats;
         MaxCollections = organization.MaxCollections;
@@ -42,7 +43,7 @@ public class ProfileProviderOrganizationResponseModel : ProfileOrganizationRespo
         UserId = organization.UserId;
         ProviderId = organization.ProviderId;
         ProviderName = organization.ProviderName;
-        PlanProductType = StaticStore.GetPlan(organization.PlanType).Product;
+        ProductTierType = StaticStore.GetPlan(organization.PlanType).ProductTier;
         LimitCollectionCreationDeletion = organization.LimitCollectionCreationDeletion;
         AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
         FlexibleCollections = organization.FlexibleCollections;

src/Api/Billing/Models/Requests/CreateClientOrganizationRequestBody.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Api.Utilities;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 
 namespace Bit.Api.Billing.Models.Requests;
 

src/Api/Models/Response/PlanResponseModel.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.StaticStore;
 
@@ -15,7 +15,7 @@ public class PlanResponseModel : ResponseModel
         }
 
         Type = plan.Type;
-        Product = plan.Product;
+        ProductTier = plan.ProductTier;
         Name = plan.Name;
         IsAnnual = plan.IsAnnual;
         NameLocalizationKey = plan.NameLocalizationKey;
@@ -45,7 +45,7 @@ public class PlanResponseModel : ResponseModel
     }
 
     public PlanType Type { get; set; }
-    public ProductType Product { get; set; }
+    public ProductTierType ProductTier { get; set; }
     public string Name { get; set; }
     public bool IsAnnual { get; set; }
     public string NameLocalizationKey { get; set; }

src/Billing/Controllers/FreshsalesController.cs

@@ -1,6 +1,6 @@
 using System.Net.Http.Headers;
 using System.Text.Json.Serialization;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;

src/Billing/Controllers/StripeController.cs

@@ -5,6 +5,7 @@ using Bit.Core;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Constants;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;

src/Core/AdminConsole/Entities/Organization.cs

@@ -3,6 +3,7 @@ using System.Net;
 using System.Text.Json;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;

src/Core/AdminConsole/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs

@@ -1,5 +1,6 @@
 using System.Text.Json.Serialization;
 using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Models.Data.Organizations.OrganizationUsers;
@@ -33,7 +34,7 @@ public class OrganizationUserOrganizationDetails
     public Enums.OrganizationUserStatusType Status { get; set; }
     public Enums.OrganizationUserType Type { get; set; }
     public bool Enabled { get; set; }
-    public Enums.PlanType PlanType { get; set; }
+    public PlanType PlanType { get; set; }
     public string SsoExternalId { get; set; }
     public string Identifier { get; set; }
     public string Permissions { get; set; }

src/Core/AdminConsole/Models/Data/Provider/ProviderUserOrganizationDetails.cs

@@ -1,5 +1,6 @@
 using System.Text.Json.Serialization;
 using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.AdminConsole.Models.Data.Provider;
@@ -38,7 +39,7 @@ public class ProviderUserOrganizationDetails
     public Guid? ProviderUserId { get; set; }
     [JsonConverter(typeof(HtmlEncodingStringConverter))]
     public string ProviderName { get; set; }
-    public Core.Enums.PlanType PlanType { get; set; }
+    public PlanType PlanType { get; set; }
     public bool LimitCollectionCreationDeletion { get; set; }
     public bool AllowAdminAccessToAllCollectionItems { get; set; }
     public bool FlexibleCollections { get; set; }

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/AcceptOrgUserCommand.cs

@@ -1,6 +1,7 @@
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Models.Business.Tokenables;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;

src/Core/AdminConsole/Services/Implementations/OrganizationService.cs

@@ -13,6 +13,7 @@ using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Business;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Auth.Repositories;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -2054,9 +2055,9 @@ public class OrganizationService : IOrganizationService
             throw new BadRequestException("Plan does not allow additional Machine Accounts.");
         }
 
-        if ((plan.Product == ProductType.TeamsStarter &&
+        if ((plan.ProductTier == ProductTierType.TeamsStarter &&
             upgrade.AdditionalSmSeats.GetValueOrDefault() > plan.PasswordManager.BaseSeats) ||
-            (plan.Product != ProductType.TeamsStarter &&
+            (plan.ProductTier != ProductTierType.TeamsStarter &&
              upgrade.AdditionalSmSeats.GetValueOrDefault() > upgrade.AdditionalSeats))
         {
             throw new BadRequestException("You cannot have more Secrets Manager seats than Password Manager seats.");

src/Core/Billing/Entities/ProviderPlan.cs

@@ -1,5 +1,5 @@
-using Bit.Core.Entities;
+using Bit.Core.Billing.Enums;
-using Bit.Core.Enums;
+using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Billing.Entities;

src/Core/Billing/Enums/PlanType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Enums;
+namespace Bit.Core.Billing.Enums;
 
 public enum PlanType : byte
 {

src/Core/Billing/Enums/ProductTierType.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Enums;
+namespace Bit.Core.Billing.Enums;
 
-public enum ProductType : byte
+public enum ProductTierType : byte
 {
     [Display(Name = "Free")]
     Free = 0,
@@ -15,4 +15,3 @@ public enum ProductType : byte
     [Display(Name = "Teams Starter")]
     TeamsStarter = 4,
 }
-

src/Core/Billing/Enums/ProductType.cs

@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Bit.Core.Billing.Enums;
+
+public enum ProductType
+{
+    [Display(Name = "Password Manager")]
+    PasswordManager = 0,
+    [Display(Name = "Secrets Manager")]
+    SecretsManager = 1,
+}

src/Core/Billing/Extensions/BillingExtensions.cs

@@ -1,6 +1,7 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Stripe;
 

src/Core/Billing/Models/ConfiguredProviderPlanDTO.cs

@@ -1,5 +1,5 @@
 using Bit.Core.Billing.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 
 namespace Bit.Core.Billing.Models;
 

src/Core/Billing/Models/StaticStore/Plan.cs

@@ -1,11 +1,11 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 
 namespace Bit.Core.Models.StaticStore;
 
 public abstract record Plan
 {
     public PlanType Type { get; protected init; }
-    public ProductType Product { get; protected init; }
+    public ProductTierType ProductTier { get; protected init; }
     public string Name { get; protected init; }
     public bool IsAnnual { get; protected init; }
     public string NameLocalizationKey { get; protected init; }

src/Core/Billing/Models/StaticStore/Plans/CustomPlan.cs

@@ -1,8 +1,9 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
-public record CustomPlan : Models.StaticStore.Plan
+public record CustomPlan : Plan
 {
     public CustomPlan()
     {

src/Core/Billing/Models/StaticStore/Plans/Enterprise2019Plan.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
-public record Enterprise2019Plan : Models.StaticStore.Plan
+public record Enterprise2019Plan : Plan
 {
     public Enterprise2019Plan(bool isAnnual)
     {
         Type = isAnnual ? PlanType.EnterpriseAnnually2019 : PlanType.EnterpriseMonthly2019;
-        Product = ProductType.Enterprise;
+        ProductTier = ProductTierType.Enterprise;
         Name = isAnnual ? "Enterprise (Annually) 2019" : "Enterprise (Monthly) 2019";
         IsAnnual = isAnnual;
         NameLocalizationKey = "planNameEnterprise";

src/Core/Billing/Models/StaticStore/Plans/Enterprise2020Plan.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
-public record Enterprise2020Plan : Models.StaticStore.Plan
+public record Enterprise2020Plan : Plan
 {
     public Enterprise2020Plan(bool isAnnual)
     {
         Type = isAnnual ? PlanType.EnterpriseAnnually2020 : PlanType.EnterpriseMonthly2020;
-        Product = ProductType.Enterprise;
+        ProductTier = ProductTierType.Enterprise;
         Name = isAnnual ? "Enterprise (Annually) 2020" : "Enterprise (Monthly) 2020";
         IsAnnual = isAnnual;
         NameLocalizationKey = "planNameEnterprise";

src/Core/Billing/Models/StaticStore/Plans/EnterprisePlan.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
 public record EnterprisePlan : Plan
 {
     public EnterprisePlan(bool isAnnual)
     {
         Type = isAnnual ? PlanType.EnterpriseAnnually : PlanType.EnterpriseMonthly;
-        Product = ProductType.Enterprise;
+        ProductTier = ProductTierType.Enterprise;
         Name = isAnnual ? "Enterprise (Annually)" : "Enterprise (Monthly)";
         IsAnnual = isAnnual;
         NameLocalizationKey = "planNameEnterprise";

src/Core/Billing/Models/StaticStore/Plans/EnterprisePlan2023.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
 public record Enterprise2023Plan : Plan
 {
     public Enterprise2023Plan(bool isAnnual)
     {
         Type = isAnnual ? PlanType.EnterpriseAnnually2023 : PlanType.EnterpriseMonthly2023;
-        Product = ProductType.Enterprise;
+        ProductTier = ProductTierType.Enterprise;
         Name = isAnnual ? "Enterprise (Annually)" : "Enterprise (Monthly)";
         IsAnnual = isAnnual;
         NameLocalizationKey = "planNameEnterprise";

src/Core/Billing/Models/StaticStore/Plans/Families2019Plan.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
-public record Families2019Plan : Models.StaticStore.Plan
+public record Families2019Plan : Plan
 {
     public Families2019Plan()
     {
         Type = PlanType.FamiliesAnnually2019;
-        Product = ProductType.Families;
+        ProductTier = ProductTierType.Families;
         Name = "Families 2019";
         IsAnnual = true;
         NameLocalizationKey = "planNameFamilies";

src/Core/Billing/Models/StaticStore/Plans/FamiliesPlan.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
-public record FamiliesPlan : Models.StaticStore.Plan
+public record FamiliesPlan : Plan
 {
     public FamiliesPlan()
     {
         Type = PlanType.FamiliesAnnually;
-        Product = ProductType.Families;
+        ProductTier = ProductTierType.Families;
         Name = "Families";
         IsAnnual = true;
         NameLocalizationKey = "planNameFamilies";

src/Core/Billing/Models/StaticStore/Plans/FreePlan.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
-public record FreePlan : Models.StaticStore.Plan
+public record FreePlan : Plan
 {
     public FreePlan()
     {
         Type = PlanType.Free;
-        Product = ProductType.Free;
+        ProductTier = ProductTierType.Free;
         Name = "Free";
         NameLocalizationKey = "planNameFree";
         DescriptionLocalizationKey = "planDescFree";

src/Core/Billing/Models/StaticStore/Plans/Teams2019Plan.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
-public record Teams2019Plan : Models.StaticStore.Plan
+public record Teams2019Plan : Plan
 {
     public Teams2019Plan(bool isAnnual)
     {
         Type = isAnnual ? PlanType.TeamsAnnually2019 : PlanType.TeamsMonthly2019;
-        Product = ProductType.Teams;
+        ProductTier = ProductTierType.Teams;
         Name = isAnnual ? "Teams (Annually) 2019" : "Teams (Monthly) 2019";
         IsAnnual = isAnnual;
         NameLocalizationKey = "planNameTeams";

src/Core/Billing/Models/StaticStore/Plans/Teams2020Plan.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
-public record Teams2020Plan : Models.StaticStore.Plan
+public record Teams2020Plan : Plan
 {
     public Teams2020Plan(bool isAnnual)
     {
         Type = isAnnual ? PlanType.TeamsAnnually2020 : PlanType.TeamsMonthly2020;
-        Product = ProductType.Teams;
+        ProductTier = ProductTierType.Teams;
         Name = isAnnual ? "Teams (Annually) 2020" : "Teams (Monthly) 2020";
         IsAnnual = isAnnual;
         NameLocalizationKey = "planNameTeams";

src/Core/Billing/Models/StaticStore/Plans/TeamsPlan.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
 public record TeamsPlan : Plan
 {
     public TeamsPlan(bool isAnnual)
     {
         Type = isAnnual ? PlanType.TeamsAnnually : PlanType.TeamsMonthly;
-        Product = ProductType.Teams;
+        ProductTier = ProductTierType.Teams;
         Name = isAnnual ? "Teams (Annually)" : "Teams (Monthly)";
         IsAnnual = isAnnual;
         NameLocalizationKey = "planNameTeams";

src/Core/Billing/Models/StaticStore/Plans/TeamsPlan2023.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
 public record Teams2023Plan : Plan
 {
     public Teams2023Plan(bool isAnnual)
     {
         Type = isAnnual ? PlanType.TeamsAnnually2023 : PlanType.TeamsMonthly2023;
-        Product = ProductType.Teams;
+        ProductTier = ProductTierType.Teams;
         Name = isAnnual ? "Teams (Annually)" : "Teams (Monthly)";
         IsAnnual = isAnnual;
         NameLocalizationKey = "planNameTeams";

src/Core/Billing/Models/StaticStore/Plans/TeamsStarterPlan.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
 public record TeamsStarterPlan : Plan
 {
     public TeamsStarterPlan()
     {
         Type = PlanType.TeamsStarter;
-        Product = ProductType.TeamsStarter;
+        ProductTier = ProductTierType.TeamsStarter;
         Name = "Teams (Starter)";
         NameLocalizationKey = "planNameTeamsStarter";
         DescriptionLocalizationKey = "planDescTeams";

src/Core/Billing/Models/StaticStore/Plans/TeamsStarterPlan2023.cs

@@ -1,13 +1,14 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Models.StaticStore.Plans;
+namespace Bit.Core.Billing.Models.StaticStore.Plans;
 
 public record TeamsStarterPlan2023 : Plan
 {
     public TeamsStarterPlan2023()
     {
         Type = PlanType.TeamsStarter2023;
-        Product = ProductType.TeamsStarter;
+        ProductTier = ProductTierType.TeamsStarter;
         Name = "Teams (Starter)";
         NameLocalizationKey = "planNameTeamsStarter";
         DescriptionLocalizationKey = "planDescTeams";

src/Core/Billing/Models/StaticStore/SponsoredPlan.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 
 namespace Bit.Core.Models.StaticStore;
@@ -6,8 +7,8 @@ namespace Bit.Core.Models.StaticStore;
 public class SponsoredPlan
 {
     public PlanSponsorshipType PlanSponsorshipType { get; set; }
-    public ProductType SponsoredProductType { get; set; }
+    public ProductTierType SponsoredProductTierType { get; set; }
-    public ProductType SponsoringProductType { get; set; }
+    public ProductTierType SponsoringProductTierType { get; set; }
     public string StripePlanId { get; set; }
     public Func<OrganizationUserOrganizationDetails, bool> UsersCanSponsor { get; set; }
 }

src/Core/Billing/Services/IProviderBillingService.cs

@@ -1,8 +1,8 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Models;
-using Bit.Core.Enums;
 using Bit.Core.Models.Business;
 
 namespace Bit.Core.Billing.Services;

src/Core/Models/Business/OrganizationLicense.cs

@@ -4,6 +4,7 @@ using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.Json.Serialization;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Core/Models/Business/OrganizationUpgrade.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 
 namespace Bit.Core.Models.Business;
 

src/Core/Models/Business/ProviderSubscriptionUpdate.cs

@@ -1,5 +1,5 @@
-using Bit.Core.Billing.Extensions;
+using Bit.Core.Billing.Enums;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Extensions;
 using Stripe;
 
 using static Bit.Core.Billing.Utilities;

src/Core/Models/Business/SubscriptionUpdate.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Stripe;
 
 namespace Bit.Core.Models.Business;

src/Core/Models/Mail/OrganizationInvitesInfo.cs

@@ -1,7 +1,7 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Auth.Models.Business;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Mail;
 public class OrganizationInvitesInfo

src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommand.cs

@@ -53,9 +53,9 @@ public class CloudSyncSponsorshipsCommand : ICloudSyncSponsorshipsCommand
 
         foreach (var selfHostedSponsorship in sponsorshipsData)
         {
-            var requiredSponsoringProductType = StaticStore.GetSponsoredPlan(selfHostedSponsorship.PlanSponsorshipType)?.SponsoringProductType;
+            var requiredSponsoringProductType = StaticStore.GetSponsoredPlan(selfHostedSponsorship.PlanSponsorshipType)?.SponsoringProductTierType;
             if (requiredSponsoringProductType == null
-                || StaticStore.GetPlan(sponsoringOrg.PlanType).Product != requiredSponsoringProductType.Value)
+                || StaticStore.GetPlan(sponsoringOrg.PlanType).ProductTier != requiredSponsoringProductType.Value)
             {
                 continue; // prevent unsupported sponsorships
             }

src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommand.cs

@@ -49,10 +49,10 @@ public class SetUpSponsorshipCommand : ISetUpSponsorshipCommand
         }
 
         // Check org to sponsor's product type
-        var requiredSponsoredProductType = StaticStore.GetSponsoredPlan(sponsorship.PlanSponsorshipType.Value)?.SponsoredProductType;
+        var requiredSponsoredProductType = StaticStore.GetSponsoredPlan(sponsorship.PlanSponsorshipType.Value)?.SponsoredProductTierType;
         if (requiredSponsoredProductType == null ||
             sponsoredOrganization == null ||
-            StaticStore.GetPlan(sponsoredOrganization.PlanType).Product != requiredSponsoredProductType.Value)
+            StaticStore.GetPlan(sponsoredOrganization.PlanType).ProductTier != requiredSponsoredProductType.Value)
         {
             throw new BadRequestException("Can only redeem sponsorship offer on families organizations.");
         }

src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommand.cs

@@ -59,7 +59,7 @@ public class ValidateSponsorshipCommand : CancelSponsorshipCommand, IValidateSpo
 
         var sponsoringOrgPlan = Utilities.StaticStore.GetPlan(sponsoringOrganization.PlanType);
         if (OrgDisabledForMoreThanGracePeriod(sponsoringOrganization) ||
-            sponsoredPlan.SponsoringProductType != sponsoringOrgPlan.Product ||
+            sponsoredPlan.SponsoringProductTierType != sponsoringOrgPlan.ProductTier ||
             existingSponsorship.ToDelete ||
             SponsorshipIsSelfHostedOutOfSync(existingSponsorship))
         {

src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommand.cs

@@ -30,10 +30,10 @@ public class CreateSponsorshipCommand : ICreateSponsorshipCommand
             throw new BadRequestException("Cannot offer a Families Organization Sponsorship to yourself. Choose a different email.");
         }
 
-        var requiredSponsoringProductType = StaticStore.GetSponsoredPlan(sponsorshipType)?.SponsoringProductType;
+        var requiredSponsoringProductType = StaticStore.GetSponsoredPlan(sponsorshipType)?.SponsoringProductTierType;
         if (requiredSponsoringProductType == null ||
             sponsoringOrg == null ||
-            StaticStore.GetPlan(sponsoringOrg.PlanType).Product != requiredSponsoringProductType.Value)
+            StaticStore.GetPlan(sponsoringOrg.PlanType).ProductTier != requiredSponsoringProductType.Value)
         {
             throw new BadRequestException("Specified Organization cannot sponsor other organizations.");
         }

src/Core/OrganizationFeatures/OrganizationSubscriptions/AddSecretsManagerSubscriptionCommand.cs

@@ -1,7 +1,7 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Repositories;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface;
@@ -34,7 +34,7 @@ public class AddSecretsManagerSubscriptionCommand : IAddSecretsManagerSubscripti
         var signup = SetOrganizationUpgrade(organization, additionalSmSeats, additionalServiceAccounts);
         _organizationService.ValidateSecretsManagerPlan(plan, signup);
 
-        if (plan.Product != ProductType.Free)
+        if (plan.ProductTier != ProductTierType.Free)
         {
             await _paymentService.AddSecretsManagerToSubscription(organization, plan, additionalSmSeats, additionalServiceAccounts);
         }
@@ -74,12 +74,12 @@ public class AddSecretsManagerSubscriptionCommand : IAddSecretsManagerSubscripti
         }
 
         var plan = StaticStore.Plans.FirstOrDefault(p => p.Type == organization.PlanType && p.SupportsSecretsManager);
-        if (string.IsNullOrWhiteSpace(organization.GatewayCustomerId) && plan.Product != ProductType.Free)
+        if (string.IsNullOrWhiteSpace(organization.GatewayCustomerId) && plan.ProductTier != ProductTierType.Free)
         {
             throw new BadRequestException("No payment method found.");
         }
 
-        if (string.IsNullOrWhiteSpace(organization.GatewaySubscriptionId) && plan.Product != ProductType.Free)
+        if (string.IsNullOrWhiteSpace(organization.GatewaySubscriptionId) && plan.ProductTier != ProductTierType.Free)
         {
             throw new BadRequestException("No subscription found.");
         }

src/Core/OrganizationFeatures/OrganizationSubscriptions/UpdateSecretsManagerSubscriptionCommand.cs

@@ -1,4 +1,5 @@
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
@@ -165,7 +166,7 @@ public class UpdateSecretsManagerSubscriptionCommand : IUpdateSecretsManagerSubs
             throw new BadRequestException("Organization has no access to Secrets Manager.");
         }
 
-        if (update.Plan.Product == ProductType.Free)
+        if (update.Plan.ProductTier == ProductTierType.Free)
         {
             // No need to check the organization is set up with Stripe
             return;

src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs

@@ -4,6 +4,7 @@ using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Repositories;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
@@ -279,7 +280,7 @@ public class UpgradeOrganizationPlanCommand : IUpgradeOrganizationPlanCommand
 
         if (success)
         {
-            var upgradePath = GetUpgradePath(existingPlan.Product, newPlan.Product);
+            var upgradePath = GetUpgradePath(existingPlan.ProductTier, newPlan.ProductTier);
             await _referenceEventService.RaiseEventAsync(
                 new ReferenceEvent(ReferenceEventType.UpgradePlan, organization, _currentContext)
                 {
@@ -342,25 +343,25 @@ public class UpgradeOrganizationPlanCommand : IUpgradeOrganizationPlanCommand
         return await _organizationRepository.GetByIdAsync(id);
     }
 
-    private static string GetUpgradePath(ProductType oldProductType, ProductType newProductType)
+    private static string GetUpgradePath(ProductTierType oldProductTierType, ProductTierType newProductTierType)
     {
-        var oldDescription = _upgradePath.TryGetValue(oldProductType, out var description)
+        var oldDescription = _upgradePath.TryGetValue(oldProductTierType, out var description)
             ? description
-            : $"{oldProductType:G}";
+            : $"{oldProductTierType:G}";
 
-        var newDescription = _upgradePath.TryGetValue(newProductType, out description)
+        var newDescription = _upgradePath.TryGetValue(newProductTierType, out description)
             ? description
-            : $"{newProductType:G}";
+            : $"{newProductTierType:G}";
 
         return $"{oldDescription} → {newDescription}";
     }
 
-    private static readonly Dictionary<ProductType, string> _upgradePath = new()
+    private static readonly Dictionary<ProductTierType, string> _upgradePath = new()
     {
-        [ProductType.Free] = "2-person org",
+        [ProductTierType.Free] = "2-person org",
-        [ProductType.Families] = "Families",
+        [ProductTierType.Families] = "Families",
-        [ProductType.TeamsStarter] = "Teams Starter",
+        [ProductTierType.TeamsStarter] = "Teams Starter",
-        [ProductType.Teams] = "Teams",
+        [ProductTierType.Teams] = "Teams",
-        [ProductType.Enterprise] = "Enterprise"
+        [ProductTierType.Enterprise] = "Enterprise"
     };
 }

src/Core/Tools/Models/Business/ReferenceEvent.cs

@@ -1,8 +1,8 @@
 #nullable enable
 
 using System.Text.Json.Serialization;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Context;
-using Bit.Core.Enums;
 using Bit.Core.Tools.Entities;
 using Bit.Core.Tools.Enums;
 

src/Core/Utilities/CoreHelpers.cs

@@ -13,9 +13,9 @@ using Azure.Storage.Queues.Models;
 using Bit.Core.AdminConsole.Context;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.Auth.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Context;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Identity;
 using Bit.Core.Settings;
 using IdentityModel;

src/Core/Utilities/StaticStore.cs

@@ -1,8 +1,9 @@
 using System.Collections.Immutable;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Billing.Models.StaticStore.Plans;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Models.StaticStore;
-using Bit.Core.Models.StaticStore.Plans;
 
 namespace Bit.Core.Utilities;
 
@@ -142,11 +143,11 @@ public static class StaticStore
             new SponsoredPlan
             {
                 PlanSponsorshipType = PlanSponsorshipType.FamiliesForEnterprise,
-                SponsoredProductType = ProductType.Families,
+                SponsoredProductTierType = ProductTierType.Families,
-                SponsoringProductType = ProductType.Enterprise,
+                SponsoringProductTierType = ProductTierType.Enterprise,
                 StripePlanId = "2021-family-for-enterprise-annually",
                 UsersCanSponsor = (OrganizationUserOrganizationDetails org) =>
-                    GetPlan(org.PlanType).Product == ProductType.Enterprise,
+                    GetPlan(org.PlanType).ProductTier == ProductTierType.Enterprise,
             }
         };
 

src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationRepository.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations;
 using Bit.Core.Repositories;

src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/OrganizationUserReadCountByFreeOrganizationAdminUserQuery.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Enums;
 using Bit.Infrastructure.EntityFramework.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Repositories.Queries;

test/Api.IntegrationTest/AdminConsole/Public/Controllers/MembersControllerTests.cs

@@ -6,6 +6,7 @@ using Bit.Api.IntegrationTest.Factories;
 using Bit.Api.IntegrationTest.Helpers;
 using Bit.Api.Models.Public.Response;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;

test/Api.IntegrationTest/Controllers/ConfigControllerTests.cs

@@ -3,6 +3,7 @@ using Bit.Api.IntegrationTest.Factories;
 using Bit.Api.IntegrationTest.Helpers;
 using Bit.Api.Models.Response;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Xunit;
 
 namespace Bit.Api.IntegrationTest.Controllers;
@@ -77,7 +78,7 @@ public class ConfigControllerTests : IClassFixture<ApiApplicationFactory>, IAsyn
             await _factory.LoginWithNewAccount(ownerEmail);
 
             Organization org;
-            (org, _) = await OrganizationTestHelpers.SignUpAsync(_factory, plan: Core.Enums.PlanType.Free, ownerEmail: ownerEmail,
+            (org, _) = await OrganizationTestHelpers.SignUpAsync(_factory, plan: PlanType.Free, ownerEmail: ownerEmail,
                 name: i.ToString(), billingEmail: ownerEmail, ownerKey: i.ToString());
             await OrganizationTestHelpers.CreateUserAsync(_factory, org.Id, _email, Core.Enums.OrganizationUserType.User);
         }

test/Api.IntegrationTest/Helpers/OrganizationTestHelpers.cs

@@ -1,5 +1,6 @@
 using Bit.Api.IntegrationTest.Factories;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;

test/Api.Test/AdminConsole/Controllers/OrganizationsControllerTests.cs

@@ -13,6 +13,7 @@ using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Data;
 using Bit.Core.Auth.Repositories;
 using Bit.Core.Auth.Services;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;

test/Api.Test/Billing/Controllers/OrganizationSponsorshipsControllerTests.cs

@@ -1,6 +1,7 @@
 using Bit.Api.Billing.Controllers;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -21,11 +22,11 @@ namespace Bit.Api.Test.Billing.Controllers;
 public class OrganizationSponsorshipsControllerTests
 {
     public static IEnumerable<object[]> EnterprisePlanTypes =>
-        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).Product == ProductType.Enterprise).Select(p => new object[] { p });
+        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).ProductTier == ProductTierType.Enterprise).Select(p => new object[] { p });
     public static IEnumerable<object[]> NonEnterprisePlanTypes =>
-        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).Product != ProductType.Enterprise).Select(p => new object[] { p });
+        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).ProductTier != ProductTierType.Enterprise).Select(p => new object[] { p });
     public static IEnumerable<object[]> NonFamiliesPlanTypes =>
-        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).Product != ProductType.Families).Select(p => new object[] { p });
+        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).ProductTier != ProductTierType.Families).Select(p => new object[] { p });
 
     public static IEnumerable<object[]> NonConfirmedOrganizationUsersStatuses =>
         Enum.GetValues<OrganizationUserStatusType>()

test/Api.Test/Billing/Controllers/ProviderBillingControllerTests.cs

@@ -6,6 +6,7 @@ using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Constants;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Services;
 using Bit.Core.Context;

test/Api.Test/Utilities/EnumMatchesAttributeTests.cs

@@ -1,4 +1,5 @@
 using Bit.Api.Utilities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Xunit;
 

test/Api.Test/Vault/Controllers/SyncControllerTests.cs

@@ -306,8 +306,8 @@ public class SyncControllerTests
 
             if (matchedProviderUserOrgDetails != null)
             {
-                var providerOrgProductType = StaticStore.GetPlan(matchedProviderUserOrgDetails.PlanType).Product;
+                var providerOrgProductType = StaticStore.GetPlan(matchedProviderUserOrgDetails.PlanType).ProductTier;
-                Assert.Equal(providerOrgProductType, profProviderOrg.PlanProductType);
+                Assert.Equal(providerOrgProductType, profProviderOrg.ProductTierType);
             }
         }
     }

test/Core.Test/AdminConsole/AutoFixture/OrganizationFixtures.cs

@@ -4,6 +4,7 @@ using AutoFixture.Kernel;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;

test/Core.Test/AdminConsole/Models/Data/SelfHostedOrganizationDetailsTests.cs

@@ -4,6 +4,7 @@ using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Data;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;

test/Core.Test/AdminConsole/Services/OrganizationServiceTests.cs

@@ -10,6 +10,7 @@ using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Auth.Models.Data;
 using Bit.Core.Auth.Repositories;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;

test/Core.Test/Models/Business/CompleteSubscriptionUpdateTests.cs

@@ -1,5 +1,5 @@
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Test.AutoFixture.OrganizationFixtures;
 using Bit.Core.Utilities;

test/Core.Test/Models/Business/OrganizationLicenseFileFixtures.cs

@@ -1,5 +1,6 @@
 using System.Text.Json;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
 

test/Core.Test/Models/Business/SeatSubscriptionUpdateTests.cs

@@ -1,5 +1,5 @@
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Utilities;
 using Bit.Test.Common.AutoFixture.Attributes;

test/Core.Test/Models/Business/SecretsManagerSubscriptionUpdateTests.cs

@@ -1,5 +1,5 @@
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Test.AutoFixture.OrganizationFixtures;

test/Core.Test/Models/Business/ServiceAccountSubscriptionUpdateTests.cs

@@ -1,5 +1,5 @@
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Utilities;
 using Bit.Test.Common.AutoFixture.Attributes;

test/Core.Test/Models/Business/SmSeatSubscriptionUpdateTests.cs

@@ -1,5 +1,5 @@
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Utilities;
 using Bit.Test.Common.AutoFixture.Attributes;

test/Core.Test/Models/Business/StorageSubscriptionUpdateTests.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Utilities;
 using Bit.Test.Common.AutoFixture.Attributes;

test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommandTests.cs

@@ -1,4 +1,5 @@
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;

test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommandTests.cs

@@ -1,6 +1,6 @@
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Cloud;
 using Bit.Core.Repositories;

test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommandTests.cs

@@ -1,6 +1,6 @@
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Cloud;
 using Bit.Core.Repositories;
 using Bit.Core.Test.AutoFixture.OrganizationSponsorshipFixtures;

test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommandTests.cs

@@ -1,4 +1,5 @@
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;

test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/FamiliesForEnterpriseTestsBase.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Test.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise;
@@ -6,16 +7,16 @@ namespace Bit.Core.Test.OrganizationFeatures.OrganizationSponsorships.FamiliesFo
 public abstract class FamiliesForEnterpriseTestsBase
 {
     public static IEnumerable<object[]> EnterprisePlanTypes =>
-        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).Product == ProductType.Enterprise).Select(p => new object[] { p });
+        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).ProductTier == ProductTierType.Enterprise).Select(p => new object[] { p });
 
     public static IEnumerable<object[]> NonEnterprisePlanTypes =>
-        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).Product != ProductType.Enterprise).Select(p => new object[] { p });
+        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).ProductTier != ProductTierType.Enterprise).Select(p => new object[] { p });
 
     public static IEnumerable<object[]> FamiliesPlanTypes =>
-        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).Product == ProductType.Families).Select(p => new object[] { p });
+        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).ProductTier == ProductTierType.Families).Select(p => new object[] { p });
 
     public static IEnumerable<object[]> NonFamiliesPlanTypes =>
-        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).Product != ProductType.Families).Select(p => new object[] { p });
+        Enum.GetValues<PlanType>().Where(p => StaticStore.GetPlan(p).ProductTier != ProductTierType.Families).Select(p => new object[] { p });
 
     public static IEnumerable<object[]> NonConfirmedOrganizationUsersStatuses =>
         Enum.GetValues<OrganizationUserStatusType>()

test/Core.Test/OrganizationFeatures/OrganizationSubscriptionUpdate/AddSecretsManagerSubscriptionCommandTests.cs

@@ -2,7 +2,7 @@
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Repositories;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.StaticStore;

test/Core.Test/OrganizationFeatures/OrganizationSubscriptionUpdate/UpdateSecretsManagerSubscriptionCommandTests.cs

@@ -1,5 +1,5 @@
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.StaticStore;

test/Core.Test/OrganizationFeatures/OrganizationSubscriptionUpdate/UpgradeOrganizationPlanCommandTests.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.OrganizationFeatures.OrganizationSubscriptions;

test/Core.Test/Services/StripePaymentServiceTests.cs

@@ -1,4 +1,5 @@
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;

test/Core.Test/Utilities/StaticStoreTests.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Utilities;
 using Xunit;
 

test/Core.Test/Vault/Services/CipherServiceTests.cs

@@ -1,4 +1,5 @@
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
@@ -185,7 +186,7 @@ public class CipherServiceTests
         sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organizationId)
             .Returns(new Organization
             {
-                PlanType = Enums.PlanType.EnterpriseAnnually,
+                PlanType = PlanType.EnterpriseAnnually,
                 MaxStorageGb = 100
             });
 
@@ -672,7 +673,7 @@ public class CipherServiceTests
         sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organization.Id)
             .Returns(new Organization
             {
-                PlanType = Enums.PlanType.EnterpriseAnnually,
+                PlanType = PlanType.EnterpriseAnnually,
                 MaxStorageGb = 100
             });
 
@@ -803,7 +804,7 @@ public class CipherServiceTests
     {
         sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organizationId).Returns(new Organization
         {
-            PlanType = Enums.PlanType.Free
+            PlanType = PlanType.Free
         });
         ciphers.FirstOrDefault().Attachments =
             "{\"attachment1\":{\"Size\":\"250\",\"FileName\":\"superCoolFile\","
@@ -825,7 +826,7 @@ public class CipherServiceTests
         sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organizationId)
             .Returns(new Organization
             {
-                PlanType = Enums.PlanType.EnterpriseAnnually,
+                PlanType = PlanType.EnterpriseAnnually,
                 MaxStorageGb = 100
             });
         ciphers.FirstOrDefault().Attachments =

test/Infrastructure.EFIntegration.Test/AdminConsole/Repositories/OrganizationRepositoryTests.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations;