[NO LOGIC] Rename MultiOrganizationEnterprise to BusinessUnit

amorask-bitwarden · amorask-bitwarden · commit 06c0c4cfc194 · 2025-04-04T12:08:51.000-04:00
diff --git a/bitwarden_license/src/Commercial.Core/AdminConsole/Providers/CreateProviderCommand.cs b/bitwarden_license/src/Commercial.Core/AdminConsole/Providers/CreateProviderCommand.cs
@@ -48,7 +48,7 @@ public async Task CreateResellerAsync(Provider provider)
         await ProviderRepositoryCreateAsync(provider, ProviderStatusType.Created);
     }
 
-    public async Task CreateMultiOrganizationEnterpriseAsync(Provider provider, string ownerEmail, PlanType plan, int minimumSeats)
+    public async Task CreateBusinessUnitAsync(Provider provider, string ownerEmail, PlanType plan, int minimumSeats)
     {
         var providerId = await CreateProviderAsync(provider, ownerEmail);
 
diff --git a/bitwarden_license/src/Commercial.Core/AdminConsole/Services/ProviderService.cs b/bitwarden_license/src/Commercial.Core/AdminConsole/Services/ProviderService.cs
@@ -692,10 +692,10 @@ private void ThrowOnInvalidPlanType(ProviderType providerType, PlanType requeste
                     throw new BadRequestException($"Managed Service Providers cannot manage organizations with the plan type {requestedType}. Only Teams (Monthly) and Enterprise (Monthly) are allowed.");
                 }
                 break;
-            case ProviderType.MultiOrganizationEnterprise:
+            case ProviderType.BusinessUnit:
                 if (requestedType is not (PlanType.EnterpriseMonthly or PlanType.EnterpriseAnnually))
                 {
-                    throw new BadRequestException($"Multi-organization Enterprise Providers cannot manage organizations with the plan type {requestedType}. Only Enterprise (Monthly) and Enterprise (Annually) are allowed.");
+                    throw new BadRequestException($"Business Unit Providers cannot manage organizations with the plan type {requestedType}. Only Enterprise (Monthly) and Enterprise (Annually) are allowed.");
                 }
                 break;
             case ProviderType.Reseller:
diff --git a/bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs b/bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs
@@ -791,7 +791,7 @@ private async Task<PlanType> GetManagedPlanTypeAsync(
         Provider provider,
         Organization organization)
     {
-        if (provider.Type == ProviderType.MultiOrganizationEnterprise)
+        if (provider.Type == ProviderType.BusinessUnit)
         {
             return (await providerPlanRepository.GetByProviderId(provider.Id)).First().PlanType;
         }
diff --git a/bitwarden_license/src/Commercial.Core/Billing/ProviderPriceAdapter.cs b/bitwarden_license/src/Commercial.Core/Billing/ProviderPriceAdapter.cs
@@ -51,7 +51,7 @@ public static class Legacy
     /// <param name="subscription">The provider's subscription.</param>
     /// <param name="planType">The plan type correlating to the desired Stripe price ID.</param>
     /// <returns>A Stripe <see cref="Stripe.Price"/> ID.</returns>
-    /// <exception cref="BillingException">Thrown when the provider's type is not <see cref="ProviderType.Msp"/> or <see cref="ProviderType.MultiOrganizationEnterprise"/>.</exception>
+    /// <exception cref="BillingException">Thrown when the provider's type is not <see cref="ProviderType.Msp"/> or <see cref="ProviderType.BusinessUnit"/>.</exception>
     /// <exception cref="BillingException">Thrown when the provided <see cref="planType"/> does not relate to a Stripe price ID.</exception>
     public static string GetPriceId(
         Provider provider,
@@ -78,7 +78,7 @@ public static string GetPriceId(
                     PlanType.EnterpriseMonthly => MSP.Active.Enterprise,
                     _ => throw invalidPlanType
                 },
-            ProviderType.MultiOrganizationEnterprise => BusinessUnit.Legacy.List.Intersect(priceIds).Any()
+            ProviderType.BusinessUnit => BusinessUnit.Legacy.List.Intersect(priceIds).Any()
                 ? planType switch
                 {
                     PlanType.EnterpriseAnnually => BusinessUnit.Legacy.Annually,
@@ -103,7 +103,7 @@ public static string GetPriceId(
     /// <param name="provider">The provider to get the Stripe price ID for.</param>
     /// <param name="planType">The plan type correlating to the desired Stripe price ID.</param>
     /// <returns>A Stripe <see cref="Stripe.Price"/> ID.</returns>
-    /// <exception cref="BillingException">Thrown when the provider's type is not <see cref="ProviderType.Msp"/> or <see cref="ProviderType.MultiOrganizationEnterprise"/>.</exception>
+    /// <exception cref="BillingException">Thrown when the provider's type is not <see cref="ProviderType.Msp"/> or <see cref="ProviderType.BusinessUnit"/>.</exception>
     /// <exception cref="BillingException">Thrown when the provided <see cref="planType"/> does not relate to a Stripe price ID.</exception>
     public static string GetActivePriceId(
         Provider provider,
@@ -120,7 +120,7 @@ public static string GetActivePriceId(
                 PlanType.EnterpriseMonthly => MSP.Active.Enterprise,
                 _ => throw invalidPlanType
             },
-            ProviderType.MultiOrganizationEnterprise => planType switch
+            ProviderType.BusinessUnit => planType switch
             {
                 PlanType.EnterpriseAnnually => BusinessUnit.Active.Annually,
                 PlanType.EnterpriseMonthly => BusinessUnit.Active.Monthly,
diff --git a/bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/CreateProviderCommandTests.cs b/bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/CreateProviderCommandTests.cs
@@ -63,29 +63,29 @@ public async Task CreateResellerAsync_Success(Provider provider, SutProvider<Cre
     }
 
     [Theory, BitAutoData]
-    public async Task CreateMultiOrganizationEnterpriseAsync_Success(
+    public async Task CreateBusinessUnitAsync_Success(
     Provider provider,
     User user,
     PlanType plan,
     int minimumSeats,
     SutProvider<CreateProviderCommand> sutProvider)
     {
         // Arrange
-        provider.Type = ProviderType.MultiOrganizationEnterprise;
+        provider.Type = ProviderType.BusinessUnit;
 
         var userRepository = sutProvider.GetDependency<IUserRepository>();
         userRepository.GetByEmailAsync(user.Email).Returns(user);
 
         // Act
-        await sutProvider.Sut.CreateMultiOrganizationEnterpriseAsync(provider, user.Email, plan, minimumSeats);
+        await sutProvider.Sut.CreateBusinessUnitAsync(provider, user.Email, plan, minimumSeats);
 
         // Assert
         await sutProvider.GetDependency<IProviderRepository>().ReceivedWithAnyArgs().CreateAsync(provider);
         await sutProvider.GetDependency<IProviderService>().Received(1).SendProviderSetupInviteEmailAsync(provider, user.Email);
     }
 
     [Theory, BitAutoData]
-    public async Task CreateMultiOrganizationEnterpriseAsync_UserIdIsInvalid_Throws(
+    public async Task CreateBusinessUnitAsync_UserIdIsInvalid_Throws(
         Provider provider,
         SutProvider<CreateProviderCommand> sutProvider)
     {
@@ -94,7 +94,7 @@ public async Task CreateMultiOrganizationEnterpriseAsync_UserIdIsInvalid_Throws(
 
         // Act
         var exception = await Assert.ThrowsAsync<BadRequestException>(
-            () => sutProvider.Sut.CreateMultiOrganizationEnterpriseAsync(provider, default, default, default));
+            () => sutProvider.Sut.CreateBusinessUnitAsync(provider, default, default, default));
 
         // Assert
         Assert.Contains("Invalid owner.", exception.Message);
diff --git a/bitwarden_license/test/Commercial.Core.Test/Billing/ProviderBillingServiceTests.cs b/bitwarden_license/test/Commercial.Core.Test/Billing/ProviderBillingServiceTests.cs
@@ -116,7 +116,7 @@ public async Task ChangePlan_UpdatesSubscriptionCorrectly(
         SutProvider<ProviderBillingService> sutProvider)
     {
         // Arrange
-        provider.Type = ProviderType.MultiOrganizationEnterprise;
+        provider.Type = ProviderType.BusinessUnit;
 
         var providerPlanRepository = sutProvider.GetDependency<IProviderPlanRepository>();
         var existingPlan = new ProviderPlan
diff --git a/bitwarden_license/test/Commercial.Core.Test/Billing/ProviderPriceAdapterTests.cs b/bitwarden_license/test/Commercial.Core.Test/Billing/ProviderPriceAdapterTests.cs
@@ -71,7 +71,7 @@ public void GetPriceId_BusinessUnit_Legacy_Succeeds(string priceId, PlanType pla
         var provider = new Provider
         {
             Id = Guid.NewGuid(),
-            Type = ProviderType.MultiOrganizationEnterprise
+            Type = ProviderType.BusinessUnit
         };
 
         var subscription = new Subscription
@@ -98,7 +98,7 @@ public void GetPriceId_BusinessUnit_Active_Succeeds(string priceId, PlanType pla
         var provider = new Provider
         {
             Id = Guid.NewGuid(),
-            Type = ProviderType.MultiOrganizationEnterprise
+            Type = ProviderType.BusinessUnit
         };
 
         var subscription = new Subscription
@@ -141,7 +141,7 @@ public void GetActivePriceId_BusinessUnit_Succeeds(string priceId, PlanType plan
         var provider = new Provider
         {
             Id = Guid.NewGuid(),
-            Type = ProviderType.MultiOrganizationEnterprise
+            Type = ProviderType.BusinessUnit
         };
 
         var result = ProviderPriceAdapter.GetActivePriceId(provider, planType);
diff --git a/src/Admin/AdminConsole/Controllers/ProvidersController.cs b/src/Admin/AdminConsole/Controllers/ProvidersController.cs
@@ -133,10 +133,10 @@ public IActionResult CreateReseller()
         return View(new CreateResellerProviderModel());
     }
 
-    [HttpGet("providers/create/multi-organization-enterprise")]
-    public IActionResult CreateMultiOrganizationEnterprise(int enterpriseMinimumSeats, string ownerEmail = null)
+    [HttpGet("providers/create/business-unit")]
+    public IActionResult CreateBusinessUnit(int enterpriseMinimumSeats, string ownerEmail = null)
     {
-        return View(new CreateMultiOrganizationEnterpriseProviderModel
+        return View(new CreateBusinessUnitProviderModel
         {
             OwnerEmail = ownerEmail,
             EnterpriseSeatMinimum = enterpriseMinimumSeats
@@ -157,7 +157,7 @@ public IActionResult Create(CreateProviderModel model)
         {
             ProviderType.Msp => RedirectToAction("CreateMsp"),
             ProviderType.Reseller => RedirectToAction("CreateReseller"),
-            ProviderType.MultiOrganizationEnterprise => RedirectToAction("CreateMultiOrganizationEnterprise"),
+            ProviderType.BusinessUnit => RedirectToAction("CreateBusinessUnit"),
             _ => View(model)
         };
     }
@@ -198,18 +198,18 @@ public async Task<IActionResult> CreateReseller(CreateResellerProviderModel mode
         return RedirectToAction("Edit", new { id = provider.Id });
     }
 
-    [HttpPost("providers/create/multi-organization-enterprise")]
+    [HttpPost("providers/create/business-unit")]
     [ValidateAntiForgeryToken]
     [RequirePermission(Permission.Provider_Create)]
-    public async Task<IActionResult> CreateMultiOrganizationEnterprise(CreateMultiOrganizationEnterpriseProviderModel model)
+    public async Task<IActionResult> CreateBusinessUnit(CreateBusinessUnitProviderModel model)
     {
         if (!ModelState.IsValid)
         {
             return View(model);
         }
         var provider = model.ToProvider();
 
-        await _createProviderCommand.CreateMultiOrganizationEnterpriseAsync(
+        await _createProviderCommand.CreateBusinessUnitAsync(
             provider,
             model.OwnerEmail,
             model.Plan.Value,
@@ -307,7 +307,7 @@ public async Task<IActionResult> Edit(Guid id, ProviderEditModel model)
                     ]);
                 await _providerBillingService.UpdateSeatMinimums(updateMspSeatMinimumsCommand);
                 break;
-            case ProviderType.MultiOrganizationEnterprise:
+            case ProviderType.BusinessUnit:
                 {
                     var existingMoePlan = providerPlans.Single();
 
diff --git a/src/Admin/AdminConsole/Models/CreateBusinessUnitProviderModel.cs b/src/Admin/AdminConsole/Models/CreateBusinessUnitProviderModel.cs
@@ -6,7 +6,7 @@
 
 namespace Bit.Admin.AdminConsole.Models;
 
-public class CreateMultiOrganizationEnterpriseProviderModel : IValidatableObject
+public class CreateBusinessUnitProviderModel : IValidatableObject
 {
     [Display(Name = "Owner Email")]
     public string OwnerEmail { get; set; }
@@ -22,25 +22,25 @@ public virtual Provider ToProvider()
     {
         return new Provider
         {
-            Type = ProviderType.MultiOrganizationEnterprise
+            Type = ProviderType.BusinessUnit
         };
     }
 
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
         if (string.IsNullOrWhiteSpace(OwnerEmail))
         {
-            var ownerEmailDisplayName = nameof(OwnerEmail).GetDisplayAttribute<CreateMultiOrganizationEnterpriseProviderModel>()?.GetName() ?? nameof(OwnerEmail);
+            var ownerEmailDisplayName = nameof(OwnerEmail).GetDisplayAttribute<CreateBusinessUnitProviderModel>()?.GetName() ?? nameof(OwnerEmail);
             yield return new ValidationResult($"The {ownerEmailDisplayName} field is required.");
         }
         if (EnterpriseSeatMinimum < 0)
         {
-            var enterpriseSeatMinimumDisplayName = nameof(EnterpriseSeatMinimum).GetDisplayAttribute<CreateMultiOrganizationEnterpriseProviderModel>()?.GetName() ?? nameof(EnterpriseSeatMinimum);
+            var enterpriseSeatMinimumDisplayName = nameof(EnterpriseSeatMinimum).GetDisplayAttribute<CreateBusinessUnitProviderModel>()?.GetName() ?? nameof(EnterpriseSeatMinimum);
             yield return new ValidationResult($"The {enterpriseSeatMinimumDisplayName} field can not be negative.");
         }
         if (Plan != PlanType.EnterpriseAnnually && Plan != PlanType.EnterpriseMonthly)
         {
-            var planDisplayName = nameof(Plan).GetDisplayAttribute<CreateMultiOrganizationEnterpriseProviderModel>()?.GetName() ?? nameof(Plan);
+            var planDisplayName = nameof(Plan).GetDisplayAttribute<CreateBusinessUnitProviderModel>()?.GetName() ?? nameof(Plan);
             yield return new ValidationResult($"The {planDisplayName} field must be set to Enterprise Annually or Enterprise Monthly.");
         }
     }
diff --git a/src/Admin/AdminConsole/Models/ProviderEditModel.cs b/src/Admin/AdminConsole/Models/ProviderEditModel.cs
@@ -34,7 +34,7 @@ public ProviderEditModel(
         GatewaySubscriptionUrl = gatewaySubscriptionUrl;
         Type = provider.Type;
 
-        if (Type == ProviderType.MultiOrganizationEnterprise)
+        if (Type == ProviderType.BusinessUnit)
         {
             var plan = providerPlans.SingleOrDefault();
             EnterpriseMinimumSeats = plan?.SeatMinimum ?? 0;
@@ -100,7 +100,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
                     yield return new ValidationResult($"The {billingEmailDisplayName} field is required.");
                 }
                 break;
-            case ProviderType.MultiOrganizationEnterprise:
+            case ProviderType.BusinessUnit:
                 if (Plan == null)
                 {
                     var displayName = nameof(Plan).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(Plan);
diff --git a/src/Admin/AdminConsole/Models/ProviderViewModel.cs b/src/Admin/AdminConsole/Models/ProviderViewModel.cs
@@ -40,7 +40,7 @@ public ProviderViewModel(
                 ProviderPlanViewModels.Add(new ProviderPlanViewModel("Enterprise (Monthly) Subscription", enterpriseProviderPlan, usedEnterpriseSeats));
             }
         }
-        else if (Provider.Type == ProviderType.MultiOrganizationEnterprise)
+        else if (Provider.Type == ProviderType.BusinessUnit)
         {
             var usedEnterpriseSeats = ProviderOrganizations.Where(po => po.PlanType == PlanType.EnterpriseMonthly)
                 .Sum(po => po.OccupiedSeats).GetValueOrDefault(0);
diff --git a/src/Admin/AdminConsole/Views/Providers/CreateBusinessUnit.cshtml b/src/Admin/AdminConsole/Views/Providers/CreateBusinessUnit.cshtml
@@ -1,15 +1,15 @@
 @using Bit.Core.Billing.Enums
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 
-@model CreateMultiOrganizationEnterpriseProviderModel
+@model CreateBusinessUnitProviderModel
 
 @{
-    ViewData["Title"] = "Create Multi-organization Enterprise Provider";
+    ViewData["Title"] = "Create Business Unit Provider";
 }
 
-<h1 class="mb-4">Create Multi-organization Enterprise Provider</h1>
+<h1 class="mb-4">Create Business Unit Provider</h1>
 <div>
-    <form method="post" asp-action="CreateMultiOrganizationEnterprise">
+    <form method="post" asp-action="CreateBusinessUnit">
         <div asp-validation-summary="All" class="alert alert-danger"></div>
         <div class="mb-3">
             <label asp-for="OwnerEmail" class="form-label"></label>
@@ -19,14 +19,14 @@
             <div class="col-sm">
                 <div class="mb-3">
                     @{
-                        var multiOrgPlans = new List<PlanType>
+                        var businessUnitPlanTypes = new List<PlanType>
                         {
                             PlanType.EnterpriseAnnually,
                             PlanType.EnterpriseMonthly
                         };
                     }
                     <label asp-for="Plan" class="form-label"></label>
-                    <select class="form-select" asp-for="Plan" asp-items="Html.GetEnumSelectList(multiOrgPlans)">
+                    <select class="form-select" asp-for="Plan" asp-items="Html.GetEnumSelectList(businessUnitPlanTypes)">
                         <option value="">--</option>
                     </select>
                 </div>
diff --git a/src/Admin/AdminConsole/Views/Providers/Edit.cshtml b/src/Admin/AdminConsole/Views/Providers/Edit.cshtml
@@ -74,20 +74,20 @@
                 </div>
                 break;
             }
-            case ProviderType.MultiOrganizationEnterprise:
+            case ProviderType.BusinessUnit:
             {
                 <div class="row">
                     <div class="col-sm">
                         <div class="mb-3">
                             @{
-                                var multiOrgPlans = new List<PlanType>
+                                var businessUnitPlanTypes = new List<PlanType>
                                 {
                                     PlanType.EnterpriseAnnually,
                                     PlanType.EnterpriseMonthly
                                 };
                             }
                             <label asp-for="Plan" class="form-label"></label>
-                            <select class="form-control" asp-for="Plan" asp-items="Html.GetEnumSelectList(multiOrgPlans)">
+                            <select class="form-control" asp-for="Plan" asp-items="Html.GetEnumSelectList(businessUnitPlanTypes)">
                                 <option value="">--</option>
                             </select>
                         </div>
diff --git a/src/Core/AdminConsole/Enums/Provider/ProviderType.cs b/src/Core/AdminConsole/Enums/Provider/ProviderType.cs
@@ -8,6 +8,6 @@ public enum ProviderType : byte
     Msp = 0,
     [Display(ShortName = "Reseller", Name = "Reseller", Description = "Creates Bitwarden Portal page for client organization billing management", Order = 1000)]
     Reseller = 1,
-    [Display(ShortName = "MOE", Name = "Multi-organization Enterprises", Description = "Creates provider portal for multi-organization management", Order = 1)]
-    MultiOrganizationEnterprise = 2,
+    [Display(ShortName = "Business Unit", Name = "Business Unit", Description = "Creates provider portal for business unit management", Order = 1)]
+    BusinessUnit = 2,
 }
diff --git a/src/Core/AdminConsole/Providers/Interfaces/ICreateProviderCommand.cs b/src/Core/AdminConsole/Providers/Interfaces/ICreateProviderCommand.cs
@@ -7,5 +7,5 @@ public interface ICreateProviderCommand
 {
     Task CreateMspAsync(Provider provider, string ownerEmail, int teamsMinimumSeats, int enterpriseMinimumSeats);
     Task CreateResellerAsync(Provider provider);
-    Task CreateMultiOrganizationEnterpriseAsync(Provider provider, string ownerEmail, PlanType plan, int minimumSeats);
+    Task CreateBusinessUnitAsync(Provider provider, string ownerEmail, PlanType plan, int minimumSeats);
 }
diff --git a/src/Core/Billing/Extensions/BillingExtensions.cs b/src/Core/Billing/Extensions/BillingExtensions.cs
@@ -24,12 +24,12 @@ _ when planType.ToString().Contains("Enterprise") => ProductTierType.Enterprise,
     public static bool IsBillable(this Provider provider) =>
         provider is
         {
-            Type: ProviderType.Msp or ProviderType.MultiOrganizationEnterprise,
+            Type: ProviderType.Msp or ProviderType.BusinessUnit,
             Status: ProviderStatusType.Billable
         };
 
     public static bool SupportsConsolidatedBilling(this ProviderType providerType)
-        => providerType is ProviderType.Msp or ProviderType.MultiOrganizationEnterprise;
+        => providerType is ProviderType.Msp or ProviderType.BusinessUnit;
 
     public static bool IsValidClient(this Organization organization)
         => organization is
diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationRepository.cs
@@ -330,7 +330,7 @@ join od in dbContext.OrganizationDomains on ou.OrganizationId equals od.Organiza
             var planTypes = providerType switch
             {
                 ProviderType.Msp => PlanConstants.EnterprisePlanTypes.Concat(PlanConstants.TeamsPlanTypes),
-                ProviderType.MultiOrganizationEnterprise => PlanConstants.EnterprisePlanTypes,
+                ProviderType.BusinessUnit => PlanConstants.EnterprisePlanTypes,
                 _ => []
             };
 
diff --git a/test/Admin.Test/AdminConsole/Controllers/ProvidersControllerTests.cs b/test/Admin.Test/AdminConsole/Controllers/ProvidersControllerTests.cs

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public async Task CreateResellerAsync(Provider provider)`
`48`	`48`	`await ProviderRepositoryCreateAsync(provider, ProviderStatusType.Created);`
`49`	`49`	`}`
`50`	`50`
`51`		`- public async Task CreateMultiOrganizationEnterpriseAsync(Provider provider, string ownerEmail, PlanType plan, int minimumSeats)`
	`51`	`+ public async Task CreateBusinessUnitAsync(Provider provider, string ownerEmail, PlanType plan, int minimumSeats)`
`52`	`52`	`{`
`53`	`53`	`var providerId = await CreateProviderAsync(provider, ownerEmail);`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -692,10 +692,10 @@ private void ThrowOnInvalidPlanType(ProviderType providerType, PlanType requeste`
`692`	`692`	`throw new BadRequestException($"Managed Service Providers cannot manage organizations with the plan type {requestedType}. Only Teams (Monthly) and Enterprise (Monthly) are allowed.");`
`693`	`693`	`}`
`694`	`694`	`break;`
`695`		`- case ProviderType.MultiOrganizationEnterprise:`
	`695`	`+ case ProviderType.BusinessUnit:`
`696`	`696`	`if (requestedType is not (PlanType.EnterpriseMonthly or PlanType.EnterpriseAnnually))`
`697`	`697`	`{`
`698`		`- throw new BadRequestException($"Multi-organization Enterprise Providers cannot manage organizations with the plan type {requestedType}. Only Enterprise (Monthly) and Enterprise (Annually) are allowed.");`
	`698`	`+ throw new BadRequestException($"Business Unit Providers cannot manage organizations with the plan type {requestedType}. Only Enterprise (Monthly) and Enterprise (Annually) are allowed.");`
`699`	`699`	`}`
`700`	`700`	`break;`
`701`	`701`	`case ProviderType.Reseller:`
Original file line number	Diff line number	Diff line change
`@@ -791,7 +791,7 @@ private async Task<PlanType> GetManagedPlanTypeAsync(`
`791`	`791`	`Provider provider,`
`792`	`792`	`Organization organization)`
`793`	`793`	`{`
`794`		`- if (provider.Type == ProviderType.MultiOrganizationEnterprise)`
	`794`	`+ if (provider.Type == ProviderType.BusinessUnit)`
`795`	`795`	`{`
`796`	`796`	`return (await providerPlanRepository.GetByProviderId(provider.Id)).First().PlanType;`
`797`	`797`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public async Task ChangePlan_UpdatesSubscriptionCorrectly(`
`116`	`116`	`SutProvider<ProviderBillingService> sutProvider)`
`117`	`117`	`{`
`118`	`118`	`// Arrange`
`119`		`- provider.Type = ProviderType.MultiOrganizationEnterprise;`
	`119`	`+ provider.Type = ProviderType.BusinessUnit;`
`120`	`120`
`121`	`121`	`var providerPlanRepository = sutProvider.GetDependency<IProviderPlanRepository>();`
`122`	`122`	`var existingPlan = new ProviderPlan`
Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,10 @@ public IActionResult CreateReseller()`
`133`	`133`	`return View(new CreateResellerProviderModel());`
`134`	`134`	`}`
`135`	`135`
`136`		`- [HttpGet("providers/create/multi-organization-enterprise")]`
`137`		`- public IActionResult CreateMultiOrganizationEnterprise(int enterpriseMinimumSeats, string ownerEmail = null)`
	`136`	`+ [HttpGet("providers/create/business-unit")]`
	`137`	`+ public IActionResult CreateBusinessUnit(int enterpriseMinimumSeats, string ownerEmail = null)`
`138`	`138`	`{`
`139`		`- return View(new CreateMultiOrganizationEnterpriseProviderModel`
	`139`	`+ return View(new CreateBusinessUnitProviderModel`
`140`	`140`	`{`
`141`	`141`	`OwnerEmail = ownerEmail,`
`142`	`142`	`EnterpriseSeatMinimum = enterpriseMinimumSeats`
`@@ -157,7 +157,7 @@ public IActionResult Create(CreateProviderModel model)`
`157`	`157`	`{`
`158`	`158`	`ProviderType.Msp => RedirectToAction("CreateMsp"),`
`159`	`159`	`ProviderType.Reseller => RedirectToAction("CreateReseller"),`
`160`		`- ProviderType.MultiOrganizationEnterprise => RedirectToAction("CreateMultiOrganizationEnterprise"),`
	`160`	`+ ProviderType.BusinessUnit => RedirectToAction("CreateBusinessUnit"),`
`161`	`161`	`_ => View(model)`
`162`	`162`	`};`
`163`	`163`	`}`
`@@ -198,18 +198,18 @@ public async Task<IActionResult> CreateReseller(CreateResellerProviderModel mode`
`198`	`198`	`return RedirectToAction("Edit", new { id = provider.Id });`
`199`	`199`	`}`
`200`	`200`
`201`		`- [HttpPost("providers/create/multi-organization-enterprise")]`
	`201`	`+ [HttpPost("providers/create/business-unit")]`
`202`	`202`	`[ValidateAntiForgeryToken]`
`203`	`203`	`[RequirePermission(Permission.Provider_Create)]`
`204`		`- public async Task<IActionResult> CreateMultiOrganizationEnterprise(CreateMultiOrganizationEnterpriseProviderModel model)`
	`204`	`+ public async Task<IActionResult> CreateBusinessUnit(CreateBusinessUnitProviderModel model)`
`205`	`205`	`{`
`206`	`206`	`if (!ModelState.IsValid)`
`207`	`207`	`{`
`208`	`208`	`return View(model);`
`209`	`209`	`}`
`210`	`210`	`var provider = model.ToProvider();`
`211`	`211`
`212`		`- await _createProviderCommand.CreateMultiOrganizationEnterpriseAsync(`
	`212`	`+ await _createProviderCommand.CreateBusinessUnitAsync(`
`213`	`213`	`provider,`
`214`	`214`	`model.OwnerEmail,`
`215`	`215`	`model.Plan.Value,`
`@@ -307,7 +307,7 @@ public async Task<IActionResult> Edit(Guid id, ProviderEditModel model)`
`307`	`307`	`]);`
`308`	`308`	`await _providerBillingService.UpdateSeatMinimums(updateMspSeatMinimumsCommand);`
`309`	`309`	`break;`
`310`		`- case ProviderType.MultiOrganizationEnterprise:`
	`310`	`+ case ProviderType.BusinessUnit:`
`311`	`311`	`{`
`312`	`312`	`var existingMoePlan = providerPlans.Single();`
`313`	`313`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Bit.Admin.AdminConsole.Models;`
`8`	`8`
`9`		`-public class CreateMultiOrganizationEnterpriseProviderModel : IValidatableObject`
	`9`	`+public class CreateBusinessUnitProviderModel : IValidatableObject`
`10`	`10`	`{`
`11`	`11`	`[Display(Name = "Owner Email")]`
`12`	`12`	`public string OwnerEmail { get; set; }`
`@@ -22,25 +22,25 @@ public virtual Provider ToProvider()`
`22`	`22`	`{`
`23`	`23`	`return new Provider`
`24`	`24`	`{`
`25`		`- Type = ProviderType.MultiOrganizationEnterprise`
	`25`	`+ Type = ProviderType.BusinessUnit`
`26`	`26`	`};`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)`
`30`	`30`	`{`
`31`	`31`	`if (string.IsNullOrWhiteSpace(OwnerEmail))`
`32`	`32`	`{`
`33`		`- var ownerEmailDisplayName = nameof(OwnerEmail).GetDisplayAttribute<CreateMultiOrganizationEnterpriseProviderModel>()?.GetName() ?? nameof(OwnerEmail);`
	`33`	`+ var ownerEmailDisplayName = nameof(OwnerEmail).GetDisplayAttribute<CreateBusinessUnitProviderModel>()?.GetName() ?? nameof(OwnerEmail);`
`34`	`34`	`yield return new ValidationResult($"The {ownerEmailDisplayName} field is required.");`
`35`	`35`	`}`
`36`	`36`	`if (EnterpriseSeatMinimum < 0)`
`37`	`37`	`{`
`38`		`- var enterpriseSeatMinimumDisplayName = nameof(EnterpriseSeatMinimum).GetDisplayAttribute<CreateMultiOrganizationEnterpriseProviderModel>()?.GetName() ?? nameof(EnterpriseSeatMinimum);`
	`38`	`+ var enterpriseSeatMinimumDisplayName = nameof(EnterpriseSeatMinimum).GetDisplayAttribute<CreateBusinessUnitProviderModel>()?.GetName() ?? nameof(EnterpriseSeatMinimum);`
`39`	`39`	`yield return new ValidationResult($"The {enterpriseSeatMinimumDisplayName} field can not be negative.");`
`40`	`40`	`}`
`41`	`41`	`if (Plan != PlanType.EnterpriseAnnually && Plan != PlanType.EnterpriseMonthly)`
`42`	`42`	`{`
`43`		`- var planDisplayName = nameof(Plan).GetDisplayAttribute<CreateMultiOrganizationEnterpriseProviderModel>()?.GetName() ?? nameof(Plan);`
	`43`	`+ var planDisplayName = nameof(Plan).GetDisplayAttribute<CreateBusinessUnitProviderModel>()?.GetName() ?? nameof(Plan);`
`44`	`44`	`yield return new ValidationResult($"The {planDisplayName} field must be set to Enterprise Annually or Enterprise Monthly.");`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public ProviderEditModel(`
`34`	`34`	`GatewaySubscriptionUrl = gatewaySubscriptionUrl;`
`35`	`35`	`Type = provider.Type;`
`36`	`36`
`37`		`- if (Type == ProviderType.MultiOrganizationEnterprise)`
	`37`	`+ if (Type == ProviderType.BusinessUnit)`
`38`	`38`	`{`
`39`	`39`	`var plan = providerPlans.SingleOrDefault();`
`40`	`40`	`EnterpriseMinimumSeats = plan?.SeatMinimum ?? 0;`
`@@ -100,7 +100,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex`
`100`	`100`	`yield return new ValidationResult($"The {billingEmailDisplayName} field is required.");`
`101`	`101`	`}`
`102`	`102`	`break;`
`103`		`- case ProviderType.MultiOrganizationEnterprise:`
	`103`	`+ case ProviderType.BusinessUnit:`
`104`	`104`	`if (Plan == null)`
`105`	`105`	`{`
`106`	`106`	`var displayName = nameof(Plan).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(Plan);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public ProviderViewModel(`
`40`	`40`	`ProviderPlanViewModels.Add(new ProviderPlanViewModel("Enterprise (Monthly) Subscription", enterpriseProviderPlan, usedEnterpriseSeats));`
`41`	`41`	`}`
`42`	`42`	`}`
`43`		`- else if (Provider.Type == ProviderType.MultiOrganizationEnterprise)`
	`43`	`+ else if (Provider.Type == ProviderType.BusinessUnit)`
`44`	`44`	`{`
`45`	`45`	`var usedEnterpriseSeats = ProviderOrganizations.Where(po => po.PlanType == PlanType.EnterpriseMonthly)`
`46`	`46`	`.Sum(po => po.OccupiedSeats).GetValueOrDefault(0);`
Original file line number	Diff line number	Diff line change
`@@ -74,20 +74,20 @@`
`74`	`74`	`</div>`
`75`	`75`	`break;`
`76`	`76`	`}`
`77`		`- case ProviderType.MultiOrganizationEnterprise:`
	`77`	`+ case ProviderType.BusinessUnit:`
`78`	`78`	`{`
`79`	`79`	`<div class="row">`
`80`	`80`	`<div class="col-sm">`
`81`	`81`	`<div class="mb-3">`
`82`	`82`	`@{`
`83`		`- var multiOrgPlans = new List<PlanType>`
	`83`	`+ var businessUnitPlanTypes = new List<PlanType>`
`84`	`84`	`{`
`85`	`85`	`PlanType.EnterpriseAnnually,`
`86`	`86`	`PlanType.EnterpriseMonthly`
`87`	`87`	`};`
`88`	`88`	`}`
`89`	`89`	`<label asp-for="Plan" class="form-label"></label>`
`90`		`- <select class="form-control" asp-for="Plan" asp-items="Html.GetEnumSelectList(multiOrgPlans)">`
	`90`	`+ <select class="form-control" asp-for="Plan" asp-items="Html.GetEnumSelectList(businessUnitPlanTypes)">`
`91`	`91`	`<option value="">--</option>`
`92`	`92`	`</select>`
`93`	`93`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ public enum ProviderType : byte`
`8`	`8`	`Msp = 0,`
`9`	`9`	`[Display(ShortName = "Reseller", Name = "Reseller", Description = "Creates Bitwarden Portal page for client organization billing management", Order = 1000)]`
`10`	`10`	`Reseller = 1,`
`11`		`- [Display(ShortName = "MOE", Name = "Multi-organization Enterprises", Description = "Creates provider portal for multi-organization management", Order = 1)]`
`12`		`- MultiOrganizationEnterprise = 2,`
	`11`	`+ [Display(ShortName = "Business Unit", Name = "Business Unit", Description = "Creates provider portal for business unit management", Order = 1)]`
	`12`	`+ BusinessUnit = 2,`
`13`	`13`	`}`