Merge branch 'main' into billing/AC-2379/webhook-update-provider-status

# Conflicts:
#	src/Billing/Controllers/StripeController.cs

Directory.Build.props

@@ -3,7 +3,7 @@
  <PropertyGroup>
  <TargetFramework>net8.0</TargetFramework>
 
- <Version>2024.4.1</Version>
+ <Version>2024.4.2</Version>
 
  <RootNamespace>Bit.$(MSBuildProjectName)</RootNamespace>
  <ImplicitUsings>enable</ImplicitUsings>

bitwarden_license/src/Sso/package.json

@@ -8,14 +8,14 @@
  "build": "gulp build"
  },
  "devDependencies": {
- "bootstrap": "4.5.0",
+ "bootstrap": "5.3.3",
  "del": "6.0.0",
  "font-awesome": "4.7.0",
  "gulp": "4.0.2",
  "gulp-sass": "5.1.0",
- "jquery": "3.5.1",
+ "jquery": "3.7.1",
  "merge-stream": "2.0.0",
  "popper.js": "1.16.1",
- "sass": "1.49.7"
+ "sass": "1.75.0"
  }
 }

src/Admin/AdminConsole/Controllers/OrganizationsController.cs

@@ -3,10 +3,12 @@
 using Bit.Admin.Enums;
 using Bit.Admin.Services;
 using Bit.Admin.Utilities;
+using Bit.Core;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Providers.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Commands;
+using Bit.Core.Billing.Extensions;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
@@ -53,6 +55,8 @@ public class OrganizationsController : Controller
  private readonly IProviderOrganizationRepository _providerOrganizationRepository;
  private readonly IRemoveOrganizationFromProviderCommand _removeOrganizationFromProviderCommand;
  private readonly IRemovePaymentMethodCommand _removePaymentMethodCommand;
+ private readonly IFeatureService _featureService;
+ private readonly IScaleSeatsCommand _scaleSeatsCommand;
 
  public OrganizationsController(
  IOrganizationService organizationService,
@@ -78,7 +82,9 @@ public class OrganizationsController : Controller
  IServiceAccountRepository serviceAccountRepository,
  IProviderOrganizationRepository providerOrganizationRepository,
  IRemoveOrganizationFromProviderCommand removeOrganizationFromProviderCommand,
- IRemovePaymentMethodCommand removePaymentMethodCommand)
+ IRemovePaymentMethodCommand removePaymentMethodCommand,
+ IFeatureService featureService,
+ IScaleSeatsCommand scaleSeatsCommand)
  {
  _organizationService = organizationService;
  _organizationRepository = organizationRepository;
@@ -104,6 +110,8 @@ public class OrganizationsController : Controller
  _providerOrganizationRepository = providerOrganizationRepository;
  _removeOrganizationFromProviderCommand = removeOrganizationFromProviderCommand;
  _removePaymentMethodCommand = removePaymentMethodCommand;
+ _featureService = featureService;
+ _scaleSeatsCommand = scaleSeatsCommand;
  }
 
  [RequirePermission(Permission.Org_List_View)]
@@ -234,12 +242,30 @@ await _referenceEventService.RaiseEventAsync(new ReferenceEvent(ReferenceEventTy
  public async Task<IActionResult> Delete(Guid id)
  {
  var organization = await _organizationRepository.GetByIdAsync(id);
- if (organization != null)
+
+ if (organization == null)
  {
- await _organizationRepository.DeleteAsync(organization);
- await _applicationCacheService.DeleteOrganizationAbilityAsync(organization.Id);
+ return RedirectToAction("Index");
  }
 
+ var consolidatedBillingEnabled = _featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling);
+
+ if (consolidatedBillingEnabled && organization.IsValidClient())
+ {
+ var provider = await _providerRepository.GetByOrganizationIdAsync(organization.Id);
+
+ if (provider.IsBillable())
+ {
+ await _scaleSeatsCommand.ScalePasswordManagerSeats(
+ provider,
+ organization.PlanType,
+ -organization.Seats ?? 0);
+ }
+ }
+
+ await _organizationRepository.DeleteAsync(organization);
+ await _applicationCacheService.DeleteOrganizationAbilityAsync(organization.Id);
+
  return RedirectToAction("Index");
  }
 

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

@@ -57,8 +57,11 @@
  case '@((byte)PlanType.TeamsAnnually2019)':
  case '@((byte)PlanType.TeamsMonthly2020)':
  case '@((byte)PlanType.TeamsAnnually2020)':
+ case '@((byte)PlanType.TeamsMonthly2023)':
+ case '@((byte)PlanType.TeamsAnnually2023)':
  case '@((byte)PlanType.TeamsMonthly)':
  case '@((byte)PlanType.TeamsAnnually)':
+ case '@((byte)PlanType.TeamsStarter2023)':
  case '@((byte)PlanType.TeamsStarter)':
  document.getElementById('@(nameof(Model.UsePolicies))').checked = false;
  document.getElementById('@(nameof(Model.UseSso))').checked = false;
@@ -79,6 +82,8 @@
  case '@((byte)PlanType.EnterpriseAnnually2019)':
  case '@((byte)PlanType.EnterpriseMonthly2020)':
  case '@((byte)PlanType.EnterpriseAnnually2020)':
+ case '@((byte)PlanType.EnterpriseMonthly2023)':
+ case '@((byte)PlanType.EnterpriseAnnually2023)':
  case '@((byte)PlanType.EnterpriseMonthly)':
  case '@((byte)PlanType.EnterpriseAnnually)':
  document.getElementById('@(nameof(Model.UsePolicies))').checked = true;