From de1b5371b4c84c32f920452a8434e28200904a96 Mon Sep 17 00:00:00 2001
From: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com>
Date: Wed, 10 Jul 2024 10:16:51 -0400
Subject: [PATCH] [AC-2849] Update organization autoscaling error message when
 managed by CB MSP (#4489)

* Update autoscaling error message for CB MSP organizations

* Run dotnet format

* Update error message per Product requirements
---
 .../Implementations/OrganizationService.cs        | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs b/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
index a155832d8..8aa5f5bc4 100644
--- a/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
+++ b/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
@@ -1438,9 +1438,20 @@ public class OrganizationService : IOrganizationService
 
         var provider = await _providerRepository.GetByOrganizationIdAsync(organization.Id);
 
-        if (provider is { Enabled: true, Type: ProviderType.Reseller })
+        if (provider is { Enabled: true })
         {
-            return (false, "Seat limit has been reached. Contact your provider to purchase additional seats.");
+            var consolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling);
+
+            if (consolidatedBillingEnabled && provider.Type == ProviderType.Msp &&
+                provider.Status == ProviderStatusType.Billable)
+            {
+                return (false, "Seat limit has been reached. Please contact your provider to add more seats.");
+            }
+
+            if (provider.Type == ProviderType.Reseller)
+            {
+                return (false, "Seat limit has been reached. Contact your provider to purchase additional seats.");
+            }
         }
 
         if (organization.Seats.HasValue &&