Updated CB to use both flag and provider status. (#4005)

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

@@ -40,7 +40,6 @@ public class CreateProviderCommand : ICreateProviderCommand
 
     public async Task CreateMspAsync(Provider provider, string ownerEmail, int teamsMinimumSeats, int enterpriseMinimumSeats)
     {
-        var isConsolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling);
         var owner = await _userRepository.GetByEmailAsync(ownerEmail);
         if (owner == null)
         {
@@ -57,6 +56,8 @@ public class CreateProviderCommand : ICreateProviderCommand
             Status = ProviderUserStatusType.Confirmed,
         };
 
+        var isConsolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling);
+
         if (isConsolidatedBillingEnabled)
         {
             var providerPlans = new List<ProviderPlan>
@@ -73,7 +74,6 @@ public class CreateProviderCommand : ICreateProviderCommand
 
         await _providerUserRepository.CreateAsync(providerUser);
         await _providerService.SendProviderSetupInviteEmailAsync(provider, owner.Email);
-
     }
 
     public async Task CreateResellerAsync(Provider provider)

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.Extensions;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -518,7 +519,9 @@ public class ProviderService : IProviderService
     public async Task<ProviderOrganization> CreateOrganizationAsync(Guid providerId,
         OrganizationSignup organizationSignup, string clientOwnerEmail, User user)
     {
-        var consolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling);
+        var provider = await _providerRepository.GetByIdAsync(providerId);
+
+        var consolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling) && provider.IsBillable();
 
         ThrowOnInvalidPlanType(organizationSignup.Plan, consolidatedBillingEnabled);
 

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

@@ -652,6 +652,9 @@ public class ProviderServiceTests
     {
         sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling).Returns(true);
 
+        provider.Type = ProviderType.Msp;
+        provider.Status = ProviderStatusType.Billable;
+
         organizationSignup.Plan = PlanType.EnterpriseAnnually;
 
         sutProvider.GetDependency<IProviderRepository>().GetByIdAsync(provider.Id).Returns(provider);
@@ -678,6 +681,9 @@ public class ProviderServiceTests
     {
         sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling).Returns(true);
 
+        provider.Type = ProviderType.Msp;
+        provider.Status = ProviderStatusType.Billable;
+
         organizationSignup.Plan = PlanType.EnterpriseMonthly;
 
         sutProvider.GetDependency<IProviderRepository>().GetByIdAsync(provider.Id).Returns(provider);

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.Extensions;
 using Bit.Core.Billing.Repositories;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
@@ -149,7 +150,6 @@ public class ProvidersController : Controller
     [SelfHosted(NotSelfHostedOnly = true)]
     public async Task<IActionResult> Edit(Guid id)
     {
-        var isConsolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling);
         var provider = await _providerRepository.GetByIdAsync(id);
         if (provider == null)
         {
@@ -158,13 +158,17 @@ public class ProvidersController : Controller
 
         var users = await _providerUserRepository.GetManyDetailsByProviderAsync(id);
         var providerOrganizations = await _providerOrganizationRepository.GetManyDetailsByProviderAsync(id);
-        if (isConsolidatedBillingEnabled)
+
+        var isConsolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling);
+
+        if (!isConsolidatedBillingEnabled || !provider.IsBillable())
         {
+            return View(new ProviderEditModel(provider, users, providerOrganizations, new List<ProviderPlan>()));
+        }
+
         var providerPlan = await _providerPlanRepository.GetByProviderId(id);
         return View(new ProviderEditModel(provider, users, providerOrganizations, providerPlan));
     }
-        return View(new ProviderEditModel(provider, users, providerOrganizations, new List<ProviderPlan>()));
-    }
 
     [HttpPost]
     [ValidateAntiForgeryToken]
@@ -172,7 +176,6 @@ public class ProvidersController : Controller
     [RequirePermission(Permission.Provider_Edit)]
     public async Task<IActionResult> Edit(Guid id, ProviderEditModel model)
     {
-        var isConsolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling);
         var providerPlans = await _providerPlanRepository.GetByProviderId(id);
         var provider = await _providerRepository.GetByIdAsync(id);
         if (provider == null)
@@ -183,14 +186,19 @@ public class ProvidersController : Controller
         model.ToProvider(provider);
         await _providerRepository.ReplaceAsync(provider);
         await _applicationCacheService.UpsertProviderAbilityAsync(provider);
-        if (isConsolidatedBillingEnabled)
+
+        var isConsolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling);
+
+        if (!isConsolidatedBillingEnabled || !provider.IsBillable())
         {
+            return RedirectToAction("Edit", new { id });
+        }
+
         model.ToProviderPlan(providerPlans);
         foreach (var providerPlan in providerPlans)
         {
             await _providerPlanRepository.ReplaceAsync(providerPlan);
         }
-        }
 
         return RedirectToAction("Edit", new { id });
     }

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

@@ -1,6 +1,6 @@
 @using Bit.Admin.Enums;
 @using Bit.Core
-@using Bit.Core.AdminConsole.Enums.Provider
+@using Bit.Core.Billing.Extensions
 @inject Bit.Admin.Services.IAccessControlService AccessControlService
 @inject Bit.Core.Services.IFeatureService FeatureService
 
@@ -43,7 +43,7 @@
             </div>
         </div>
     </div>
-    @if (FeatureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling) && Model.Provider.Type == ProviderType.Msp)
+    @if (FeatureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling) && Model.Provider.IsBillable())
     {
         <div class="row">
             <div class="col-sm">

src/Api/AdminConsole/Models/Response/Providers/ProfileProviderResponseModel.cs

@@ -21,6 +21,7 @@ public class ProfileProviderResponseModel : ResponseModel
         Permissions = CoreHelpers.LoadClassFromJsonData<Permissions>(provider.Permissions);
         UserId = provider.UserId;
         UseEvents = provider.UseEvents;
+        ProviderStatus = provider.ProviderStatus;
     }
 
     public Guid Id { get; set; }
@@ -33,4 +34,5 @@ public class ProfileProviderResponseModel : ResponseModel
     public Permissions Permissions { get; set; }
     public Guid? UserId { get; set; }
     public bool UseEvents { get; set; }
+    public ProviderStatusType ProviderStatus { get; set; }
 }