Merge branch 'main' of https://github.com/bitwarden/server into vault/pm-21024/change-password-uri

.github/workflows/build.yml

@@ -636,7 +636,9 @@ jobs:
 
   setup-ephemeral-environment:
     name: Setup Ephemeral Environment
-    needs: build-docker
+    needs:
+      - build-artifacts
+      - build-docker
     if: |
       needs.build-artifacts.outputs.has_secrets == 'true'
       && github.event_name == 'pull_request'

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

@@ -3,9 +3,9 @@ using Bit.Core.AdminConsole.Enums.Provider;
 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.Billing.Providers.Entities;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;

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

@@ -7,6 +7,7 @@ using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Constants;
 using Bit.Core.Billing.Extensions;
 using Bit.Core.Billing.Pricing;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Billing.Services;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;

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

@@ -11,7 +11,7 @@ using Bit.Core.AdminConsole.Services;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Services;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;

bitwarden_license/src/Commercial.Core/Billing/Providers/Models/ProviderClientInvoiceReportRow.cs

@@ -1,8 +1,8 @@
 using System.Globalization;
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Providers.Entities;
 using CsvHelper.Configuration.Attributes;
 
-namespace Bit.Commercial.Core.Billing.Models;
+namespace Bit.Commercial.Core.Billing.Providers.Models;
 
 public class ProviderClientInvoiceReportRow
 {

bitwarden_license/src/Commercial.Core/Billing/Providers/Services/BusinessUnitConverter.cs

@@ -7,11 +7,12 @@ using Bit.Core.AdminConsole.Enums.Provider;
 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.Pricing;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Entities;
+using Bit.Core.Billing.Providers.Repositories;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Billing.Services;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -24,7 +25,7 @@ using Microsoft.Extensions.Logging;
 using OneOf;
 using Stripe;
 
-namespace Bit.Commercial.Core.Billing;
+namespace Bit.Commercial.Core.Billing.Providers.Services;
 
 [RequireFeature(FeatureFlagKeys.PM18770_EnableOrganizationBusinessUnitConversion)]
 public class BusinessUnitConverter(

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

@@ -1,5 +1,5 @@
 using System.Globalization;
-using Bit.Commercial.Core.Billing.Models;
+using Bit.Commercial.Core.Billing.Providers.Models;
 using Bit.Core;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
@@ -8,14 +8,15 @@ using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing;
 using Bit.Core.Billing.Caches;
 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.Pricing;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Entities;
+using Bit.Core.Billing.Providers.Models;
+using Bit.Core.Billing.Providers.Repositories;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Billing.Services;
-using Bit.Core.Billing.Services.Contracts;
 using Bit.Core.Billing.Tax.Models;
 using Bit.Core.Billing.Tax.Services;
 using Bit.Core.Enums;
@@ -28,12 +29,11 @@ using Braintree;
 using CsvHelper;
 using Microsoft.Extensions.Logging;
 using Stripe;
-
 using static Bit.Core.Billing.Utilities;
 using Customer = Stripe.Customer;
 using Subscription = Stripe.Subscription;
 
-namespace Bit.Commercial.Core.Billing;
+namespace Bit.Commercial.Core.Billing.Providers.Services;
 
 public class ProviderBillingService(
     IBraintreeGateway braintreeGateway,

bitwarden_license/src/Commercial.Core/Billing/Providers/Services/ProviderPriceAdapter.cs

@@ -6,7 +6,7 @@ using Bit.Core.Billing;
 using Bit.Core.Billing.Enums;
 using Stripe;
 
-namespace Bit.Commercial.Core.Billing;
+namespace Bit.Commercial.Core.Billing.Providers.Services;
 
 public static class ProviderPriceAdapter
 {

bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs

@@ -1,9 +1,9 @@
 using Bit.Commercial.Core.AdminConsole.Providers;
 using Bit.Commercial.Core.AdminConsole.Services;
-using Bit.Commercial.Core.Billing;
+using Bit.Commercial.Core.Billing.Providers.Services;
 using Bit.Core.AdminConsole.Providers.Interfaces;
 using Bit.Core.AdminConsole.Services;
-using Bit.Core.Billing.Services;
+using Bit.Core.Billing.Providers.Services;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Bit.Commercial.Core.Utilities;

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

@@ -8,6 +8,7 @@ using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Constants;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Pricing;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Billing.Services;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;

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

@@ -11,7 +11,7 @@ using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Services;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;

bitwarden_license/test/Commercial.Core.Test/Billing/Providers/BusinessUnitConverterTests.cs

@@ -1,16 +1,16 @@
 #nullable enable
 using System.Text;
-using Bit.Commercial.Core.Billing;
+using Bit.Commercial.Core.Billing.Providers.Services;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
 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.Pricing;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Entities;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Billing.Services;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -25,7 +25,7 @@ using NSubstitute;
 using Stripe;
 using Xunit;
 
-namespace Bit.Commercial.Core.Test.Billing;
+namespace Bit.Commercial.Core.Test.Billing.Providers;
 
 public class BusinessUnitConverterTests
 {

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

@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Net;
-using Bit.Commercial.Core.Billing;
+using Bit.Commercial.Core.Billing.Providers.Models;
-using Bit.Commercial.Core.Billing.Models;
+using Bit.Commercial.Core.Billing.Providers.Services;
 using Bit.Core;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
@@ -10,13 +10,13 @@ using Bit.Core.AdminConsole.Models.Data.Provider;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Caches;
 using Bit.Core.Billing.Constants;
-using Bit.Core.Billing.Entities;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Entities;
+using Bit.Core.Billing.Providers.Models;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Billing.Services;
-using Bit.Core.Billing.Services.Contracts;
 using Bit.Core.Billing.Tax.Services;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -40,7 +40,7 @@ using Customer = Stripe.Customer;
 using PaymentMethod = Stripe.PaymentMethod;
 using Subscription = Stripe.Subscription;
 
-namespace Bit.Commercial.Core.Test.Billing;
+namespace Bit.Commercial.Core.Test.Billing.Providers;
 
 [SutProviderCustomize]
 public class ProviderBillingServiceTests

bitwarden_license/test/Commercial.Core.Test/Billing/Providers/ProviderPriceAdapterTests.cs

@@ -1,11 +1,11 @@
-using Bit.Commercial.Core.Billing;
+using Bit.Commercial.Core.Billing.Providers.Services;
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.Billing.Enums;
 using Stripe;
 using Xunit;
 
-namespace Bit.Commercial.Core.Test.Billing;
+namespace Bit.Commercial.Core.Test.Billing.Providers;
 
 public class ProviderPriceAdapterTests
 {

bitwarden_license/test/Commercial.Core.Test/Billing/Tax/TaxServiceTests.cs

@@ -3,7 +3,7 @@ using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 using Xunit;
 
-namespace Bit.Commercial.Core.Test.Billing;
+namespace Bit.Commercial.Core.Test.Billing.Tax;
 
 [SutProviderCustomize]
 public class TaxServiceTests

src/Admin/AdminConsole/Controllers/OrganizationsController.cs

@@ -11,7 +11,7 @@ using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Extensions;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Services;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Models.OrganizationConnectionConfigs;

src/Admin/AdminConsole/Controllers/ProvidersController.cs

@@ -10,13 +10,13 @@ using Bit.Core.AdminConsole.Providers.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.AdminConsole.Services;
 using Bit.Core.Billing.Constants;
-using Bit.Core.Billing.Entities;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Extensions;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Entities;
-using Bit.Core.Billing.Services;
+using Bit.Core.Billing.Providers.Models;
-using Bit.Core.Billing.Services.Contracts;
+using Bit.Core.Billing.Providers.Repositories;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;

src/Admin/AdminConsole/Models/ProviderEditModel.cs

@@ -2,8 +2,8 @@
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Models.Data.Provider;
-using Bit.Core.Billing.Entities;
 using Bit.Core.Billing.Enums;
+using Bit.Core.Billing.Providers.Entities;
 using Bit.Core.Enums;
 using Bit.SharedWeb.Utilities;
 

src/Admin/AdminConsole/Models/ProviderViewModel.cs

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

src/Admin/Billing/Controllers/BusinessUnitConversionController.cs

@@ -7,7 +7,7 @@ using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Repositories;
-using Bit.Core.Billing.Services;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 using Bit.Core.Utilities;

src/Admin/Billing/Controllers/MigrateProvidersController.cs

@@ -1,8 +1,8 @@
 using Bit.Admin.Billing.Models;
 using Bit.Admin.Enums;
 using Bit.Admin.Utilities;
-using Bit.Core.Billing.Migration.Models;
+using Bit.Core.Billing.Providers.Migration.Models;
-using Bit.Core.Billing.Migration.Services;
+using Bit.Core.Billing.Providers.Migration.Services;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

src/Admin/Billing/Models/ProviderPlanViewModel.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Providers.Entities;
 
 namespace Bit.Admin.Billing.Models;
 

src/Admin/Billing/Views/MigrateProviders/Details.cshtml

@@ -1,5 +1,5 @@
 @using System.Text.Json
-@model Bit.Core.Billing.Migration.Models.ProviderMigrationResult
+@model Bit.Core.Billing.Providers.Migration.Models.ProviderMigrationResult
 @{
     ViewData["Title"] = "Results";
 }

src/Admin/Billing/Views/MigrateProviders/Results.cshtml

@@ -1,4 +1,4 @@
-@model Bit.Core.Billing.Migration.Models.ProviderMigrationResult[]
+@model Bit.Core.Billing.Providers.Migration.Models.ProviderMigrationResult[]
 @{
     ViewData["Title"] = "Results";
 }

src/Admin/Startup.cs

@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Bit.Admin.Services;
 using Bit.Core.Billing.Extensions;
-using Bit.Core.Billing.Migration;
+using Bit.Core.Billing.Providers.Migration;
 
 #if !OSS
 using Bit.Commercial.Core.Utilities;

src/Api/AdminConsole/Controllers/OrganizationDomainController.cs

@@ -2,13 +2,11 @@
 using Bit.Api.AdminConsole.Models.Request.Organizations;
 using Bit.Api.AdminConsole.Models.Response.Organizations;
 using Bit.Api.Models.Response;
-using Bit.Core;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
-using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -137,7 +135,6 @@ public class OrganizationDomainController : Controller
 
     [AllowAnonymous]
     [HttpPost("domain/sso/verified")]
-    [RequireFeature(FeatureFlagKeys.VerifiedSsoDomainEndpoint)]
     public async Task<VerifiedOrganizationDomainSsoDetailsResponseModel> GetVerifiedOrgDomainSsoDetailsAsync(
         [FromBody] OrganizationDomainSsoDetailsRequestModel model)
     {

src/Api/AdminConsole/Controllers/OrganizationsController.cs

@@ -25,7 +25,7 @@ using Bit.Core.Auth.Services;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Extensions;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Services;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;

src/Api/AdminConsole/Controllers/ProviderClientsController.cs

@@ -2,7 +2,7 @@
 using Bit.Api.Billing.Models.Requests;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.AdminConsole.Services;
-using Bit.Core.Billing.Services;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;

src/Api/Billing/Controllers/OrganizationBillingController.cs

@@ -8,6 +8,7 @@ using Bit.Core;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Models.Sales;
 using Bit.Core.Billing.Pricing;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Billing.Services;
 using Bit.Core.Billing.Tax.Models;
 using Bit.Core.Context;

src/Api/Billing/Controllers/ProviderBillingController.cs

@@ -1,10 +1,12 @@
 using Bit.Api.Billing.Models.Requests;
 using Bit.Api.Billing.Models.Responses;
+using Bit.Commercial.Core.Billing.Providers.Services;
 using Bit.Core;
 using Bit.Core.AdminConsole.Repositories;
-using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Models;
+using Bit.Core.Billing.Providers.Repositories;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Billing.Services;
 using Bit.Core.Billing.Tax.Models;
 using Bit.Core.Context;
@@ -148,13 +150,33 @@ public class ProviderBillingController(
 
         var providerPlans = await providerPlanRepository.GetByProviderId(provider.Id);
 
+        var getProviderPriceFromStripe = featureService.IsEnabled(FeatureFlagKeys.PM21383_GetProviderPriceFromStripe);
+
         var configuredProviderPlans = await Task.WhenAll(providerPlans.Select(async providerPlan =>
         {
             var plan = await pricingClient.GetPlanOrThrow(providerPlan.PlanType);
+
+            decimal unitAmount;
+
+            if (getProviderPriceFromStripe)
+            {
+                var priceId = ProviderPriceAdapter.GetPriceId(provider, subscription, plan.Type);
+                var price = await stripeAdapter.PriceGetAsync(priceId);
+
+                unitAmount = price.UnitAmountDecimal.HasValue
+                    ? price.UnitAmountDecimal.Value / 100M
+                    : plan.PasswordManager.ProviderPortalSeatPrice;
+            }
+            else
+            {
+                unitAmount = plan.PasswordManager.ProviderPortalSeatPrice;
+            }
+
             return new ConfiguredProviderPlan(
                 providerPlan.Id,
                 providerPlan.ProviderId,
                 plan,
+                unitAmount,
                 providerPlan.SeatMinimum ?? 0,
                 providerPlan.PurchasedSeats ?? 0,
                 providerPlan.AllocatedSeats ?? 0);

src/Api/Billing/Models/Responses/ProviderSubscriptionResponse.cs

@@ -2,6 +2,7 @@
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Models;
+using Bit.Core.Billing.Providers.Models;
 using Bit.Core.Billing.Tax.Models;
 using Stripe;
 
@@ -35,7 +36,7 @@ public record ProviderSubscriptionResponse(
             .Select(providerPlan =>
             {
                 var plan = providerPlan.Plan;
-                var cost = (providerPlan.SeatMinimum + providerPlan.PurchasedSeats) * plan.PasswordManager.ProviderPortalSeatPrice;
+                var cost = (providerPlan.SeatMinimum + providerPlan.PurchasedSeats) * providerPlan.Price;
                 var cadence = plan.IsAnnual ? _annualCadence : _monthlyCadence;
                 return new ProviderPlanResponse(
                     plan.Name,

src/Billing/Services/Implementations/ProviderEventService.cs

@@ -1,8 +1,8 @@
 using Bit.Billing.Constants;
 using Bit.Core.AdminConsole.Repositories;
-using Bit.Core.Billing.Entities;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Entities;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Stripe;

src/Core/Billing/Providers/Entities/ClientOrganizationMigrationRecord.cs

@@ -1,12 +1,12 @@
-using System.ComponentModel.DataAnnotations;
+#nullable enable
+
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-#nullable enable
+namespace Bit.Core.Billing.Providers.Entities;
-
-namespace Bit.Core.Billing.Entities;
 
 public class ClientOrganizationMigrationRecord : ITableObject<Guid>
 {

src/Core/Billing/Providers/Entities/ProviderInvoiceItem.cs

@@ -1,10 +1,10 @@
-using System.ComponentModel.DataAnnotations;
+#nullable enable
+
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
-#nullable enable
+namespace Bit.Core.Billing.Providers.Entities;
-
-namespace Bit.Core.Billing.Entities;
 
 public class ProviderInvoiceItem : ITableObject<Guid>
 {

src/Core/Billing/Providers/Entities/ProviderPlan.cs

@@ -1,10 +1,10 @@
-using Bit.Core.Billing.Enums;
+#nullable enable
+
+using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
-#nullable enable
+namespace Bit.Core.Billing.Providers.Entities;
-
-namespace Bit.Core.Billing.Entities;
 
 public class ProviderPlan : ITableObject<Guid>
 {

src/Core/Billing/Providers/Migration/Models/ClientMigrationTracker.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Billing.Migration.Models;
+namespace Bit.Core.Billing.Providers.Migration.Models;
 
 public enum ClientMigrationProgress
 {

src/Core/Billing/Providers/Migration/Models/ProviderMigrationResult.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Providers.Entities;
 
-namespace Bit.Core.Billing.Migration.Models;
+namespace Bit.Core.Billing.Providers.Migration.Models;
 
 public class ProviderMigrationResult
 {

src/Core/Billing/Providers/Migration/Models/ProviderMigrationTracker.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Billing.Migration.Models;
+namespace Bit.Core.Billing.Providers.Migration.Models;
 
 public enum ProviderMigrationProgress
 {

src/Core/Billing/Providers/Migration/ServiceCollectionExtensions.cs

@@ -1,8 +1,8 @@
-using Bit.Core.Billing.Migration.Services;
+using Bit.Core.Billing.Providers.Migration.Services;
-using Bit.Core.Billing.Migration.Services.Implementations;
+using Bit.Core.Billing.Providers.Migration.Services.Implementations;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Bit.Core.Billing.Migration;
+namespace Bit.Core.Billing.Providers.Migration;
 
 public static class ServiceCollectionExtensions
 {

src/Core/Billing/Providers/Migration/Services/IMigrationTrackerCache.cs

@@ -1,8 +1,8 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Billing.Migration.Models;
+using Bit.Core.Billing.Providers.Migration.Models;
 
-namespace Bit.Core.Billing.Migration.Services;
+namespace Bit.Core.Billing.Providers.Migration.Services;
 
 public interface IMigrationTrackerCache
 {

src/Core/Billing/Providers/Migration/Services/IOrganizationMigrator.cs

@@ -1,6 +1,6 @@
 using Bit.Core.AdminConsole.Entities;
 
-namespace Bit.Core.Billing.Migration.Services;
+namespace Bit.Core.Billing.Providers.Migration.Services;
 
 public interface IOrganizationMigrator
 {

src/Core/Billing/Providers/Migration/Services/IProviderMigrator.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Billing.Migration.Models;
+using Bit.Core.Billing.Providers.Migration.Models;
 
-namespace Bit.Core.Billing.Migration.Services;
+namespace Bit.Core.Billing.Providers.Migration.Services;
 
 public interface IProviderMigrator
 {

src/Core/Billing/Providers/Migration/Services/Implementations/MigrationTrackerDistributedCache.cs

@@ -1,11 +1,11 @@
 using System.Text.Json;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Billing.Migration.Models;
+using Bit.Core.Billing.Providers.Migration.Models;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Bit.Core.Billing.Migration.Services.Implementations;
+namespace Bit.Core.Billing.Providers.Migration.Services.Implementations;
 
 public class MigrationTrackerDistributedCache(
     [FromKeyedServices("persistent")]

src/Core/Billing/Providers/Migration/Services/Implementations/OrganizationMigrator.cs

@@ -1,10 +1,10 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Constants;
-using Bit.Core.Billing.Entities;
 using Bit.Core.Billing.Enums;
-using Bit.Core.Billing.Migration.Models;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Entities;
+using Bit.Core.Billing.Providers.Migration.Models;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
@@ -12,7 +12,7 @@ using Microsoft.Extensions.Logging;
 using Stripe;
 using Plan = Bit.Core.Models.StaticStore.Plan;
 
-namespace Bit.Core.Billing.Migration.Services.Implementations;
+namespace Bit.Core.Billing.Providers.Migration.Services.Implementations;
 
 public class OrganizationMigrator(
     IClientOrganizationMigrationRecordRepository clientOrganizationMigrationRecordRepository,

src/Core/Billing/Providers/Migration/Services/Implementations/ProviderMigrator.cs

@@ -3,18 +3,18 @@ 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.Entities;
 using Bit.Core.Billing.Enums;
-using Bit.Core.Billing.Migration.Models;
+using Bit.Core.Billing.Providers.Entities;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Migration.Models;
-using Bit.Core.Billing.Services;
+using Bit.Core.Billing.Providers.Models;
-using Bit.Core.Billing.Services.Contracts;
+using Bit.Core.Billing.Providers.Repositories;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Microsoft.Extensions.Logging;
 using Stripe;
 
-namespace Bit.Core.Billing.Migration.Services.Implementations;
+namespace Bit.Core.Billing.Providers.Migration.Services.Implementations;
 
 public class ProviderMigrator(
     IClientOrganizationMigrationRecordRepository clientOrganizationMigrationRecordRepository,

src/Core/Billing/Providers/Models/AddableOrganization.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Billing.Models;
+namespace Bit.Core.Billing.Providers.Models;
 
 public record AddableOrganization(
     Guid Id,

src/Core/Billing/Providers/Models/ChangeProviderPlansCommand.cs

@@ -1,7 +1,7 @@
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.Billing.Enums;
 
-namespace Bit.Core.Billing.Services.Contracts;
+namespace Bit.Core.Billing.Providers.Models;
 
 public record ChangeProviderPlanCommand(
     Provider Provider,

src/Core/Billing/Providers/Models/ConfiguredProviderPlan.cs

@@ -1,11 +1,12 @@
 using Bit.Core.Models.StaticStore;
 
-namespace Bit.Core.Billing.Models;
+namespace Bit.Core.Billing.Providers.Models;
 
 public record ConfiguredProviderPlan(
     Guid Id,
     Guid ProviderId,
     Plan Plan,
+    decimal Price,
     int SeatMinimum,
     int PurchasedSeats,
     int AssignedSeats);

src/Core/Billing/Providers/Models/UpdateProviderSeatMinimumsCommand.cs

@@ -1,7 +1,7 @@
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.Billing.Enums;
 
-namespace Bit.Core.Billing.Services.Contracts;
+namespace Bit.Core.Billing.Providers.Models;
 
 /// <param name="Provider">The provider to update the seat minimums for.</param>
 /// <param name="Configuration">The new seat minimums for the provider.</param>

src/Core/Billing/Providers/Repositories/IClientOrganizationMigrationRecordRepository.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Providers.Entities;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.Billing.Repositories;
+namespace Bit.Core.Billing.Providers.Repositories;
 
 public interface IClientOrganizationMigrationRecordRepository : IRepository<ClientOrganizationMigrationRecord, Guid>
 {

src/Core/Billing/Providers/Repositories/IProviderInvoiceItemRepository.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Providers.Entities;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.Billing.Repositories;
+namespace Bit.Core.Billing.Providers.Repositories;
 
 public interface IProviderInvoiceItemRepository : IRepository<ProviderInvoiceItem, Guid>
 {

src/Core/Billing/Providers/Repositories/IProviderPlanRepository.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Providers.Entities;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.Billing.Repositories;
+namespace Bit.Core.Billing.Providers.Repositories;
 
 public interface IProviderPlanRepository : IRepository<ProviderPlan, Guid>
 {

src/Core/Billing/Providers/Services/IBusinessUnitConverter.cs

@@ -3,7 +3,7 @@ using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
 using OneOf;
 
-namespace Bit.Core.Billing.Services;
+namespace Bit.Core.Billing.Providers.Services;
 
 public interface IBusinessUnitConverter
 {

src/Core/Billing/Providers/Services/IProviderBillingService.cs

@@ -1,14 +1,14 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Billing.Entities;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Models;
-using Bit.Core.Billing.Services.Contracts;
+using Bit.Core.Billing.Providers.Entities;
+using Bit.Core.Billing.Providers.Models;
 using Bit.Core.Billing.Tax.Models;
 using Bit.Core.Models.Business;
 using Stripe;
 
-namespace Bit.Core.Billing.Services;
+namespace Bit.Core.Billing.Providers.Services;
 
 public interface IProviderBillingService
 {

src/Core/Billing/Tax/Models/AutomaticTaxFactoryParameters.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Billing.Enums;
 using Bit.Core.Entities;
 
-namespace Bit.Core.Billing.Services.Contracts;
+namespace Bit.Core.Billing.Tax.Models;
 
 public class AutomaticTaxFactoryParameters
 {

src/Core/Billing/Tax/Services/IAutomaticTaxFactory.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Billing.Services.Contracts;
+using Bit.Core.Billing.Tax.Models;
 
 namespace Bit.Core.Billing.Tax.Services;
 

src/Core/Billing/Tax/Services/Implementations/AutomaticTaxFactory.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Services.Contracts;
+using Bit.Core.Billing.Tax.Models;
 using Bit.Core.Entities;
 using Bit.Core.Services;
 

src/Core/Constants.cs

@@ -150,6 +150,7 @@ public static class FeatureFlagKeys
     public const string UseOrganizationWarningsService = "use-organization-warnings-service";
     public const string PM20322_AllowTrialLength0 = "pm-20322-allow-trial-length-0";
     public const string PM21092_SetNonUSBusinessUseToReverseCharge = "pm-21092-set-non-us-business-use-to-reverse-charge";
+    public const string PM21383_GetProviderPriceFromStripe = "pm-21383-get-provider-price-from-stripe";
 
     /* Data Insights and Reporting Team */
     public const string RiskInsightsCriticalApplication = "pm-14466-risk-insights-critical-application";

src/Core/Services/IStripeAdapter.cs

@@ -57,4 +57,5 @@ public interface IStripeAdapter
     Task<SetupIntent> SetupIntentGet(string id, SetupIntentGetOptions options = null);
     Task SetupIntentVerifyMicroDeposit(string id, SetupIntentVerifyMicrodepositsOptions options);
     Task<List<Stripe.TestHelpers.TestClock>> TestClockListAsync();
+    Task<Price> PriceGetAsync(string id, PriceGetOptions options = null);
 }

src/Core/Services/Implementations/StripeAdapter.cs

@@ -283,4 +283,7 @@ public class StripeAdapter : IStripeAdapter
         }
         return items;
     }
+
+    public Task<Price> PriceGetAsync(string id, PriceGetOptions options = null)
+        => _priceService.GetAsync(id, options);
 }

src/Core/Services/Implementations/StripePaymentService.cs

@@ -7,7 +7,7 @@ using Bit.Core.Billing.Extensions;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Models.Business;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Services.Contracts;
+using Bit.Core.Billing.Tax.Models;
 using Bit.Core.Billing.Tax.Requests;
 using Bit.Core.Billing.Tax.Responses;
 using Bit.Core.Billing.Tax.Services;

src/Infrastructure.Dapper/Billing/Repositories/ClientOrganizationMigrationRecordRepository.cs

@@ -1,6 +1,6 @@
 using System.Data;
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Providers.Entities;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Settings;
 using Bit.Infrastructure.Dapper.Repositories;
 using Dapper;

src/Infrastructure.Dapper/Billing/Repositories/ProviderInvoiceItemRepository.cs

@@ -1,6 +1,6 @@
 using System.Data;
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Providers.Entities;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Settings;
 using Bit.Infrastructure.Dapper.Repositories;
 using Dapper;

src/Infrastructure.Dapper/Billing/Repositories/ProviderPlanRepository.cs

@@ -1,6 +1,6 @@
 using System.Data;
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Providers.Entities;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Settings;
 using Bit.Infrastructure.Dapper.Repositories;
 using Dapper;

src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs

@@ -1,5 +1,6 @@
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Repositories;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Billing.Repositories;
 using Bit.Core.KeyManagement.Repositories;
 using Bit.Core.NotificationCenter.Repositories;

src/Infrastructure.EntityFramework/Billing/Models/ClientOrganizationMigrationRecord.cs

@@ -2,7 +2,7 @@
 
 namespace Bit.Infrastructure.EntityFramework.Billing.Models;
 
-public class ClientOrganizationMigrationRecord : Core.Billing.Entities.ClientOrganizationMigrationRecord
+public class ClientOrganizationMigrationRecord : Core.Billing.Providers.Entities.ClientOrganizationMigrationRecord
 {
 
 }
@@ -11,6 +11,6 @@ public class ClientOrganizationMigrationRecordProfile : Profile
 {
     public ClientOrganizationMigrationRecordProfile()
     {
-        CreateMap<Core.Billing.Entities.ClientOrganizationMigrationRecord, ClientOrganizationMigrationRecord>().ReverseMap();
+        CreateMap<Core.Billing.Providers.Entities.ClientOrganizationMigrationRecord, ClientOrganizationMigrationRecord>().ReverseMap();
     }
 }

src/Infrastructure.EntityFramework/Billing/Models/ProviderInvoiceItem.cs

@@ -4,7 +4,7 @@ using Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider;
 namespace Bit.Infrastructure.EntityFramework.Billing.Models;
 
 // ReSharper disable once ClassWithVirtualMembersNeverInherited.Global
-public class ProviderInvoiceItem : Core.Billing.Entities.ProviderInvoiceItem
+public class ProviderInvoiceItem : Core.Billing.Providers.Entities.ProviderInvoiceItem
 {
     public virtual Provider Provider { get; set; }
 }
@@ -13,6 +13,6 @@ public class ProviderInvoiceItemMapperProfile : Profile
 {
     public ProviderInvoiceItemMapperProfile()
     {
-        CreateMap<Core.Billing.Entities.ProviderInvoiceItem, ProviderInvoiceItem>().ReverseMap();
+        CreateMap<Core.Billing.Providers.Entities.ProviderInvoiceItem, ProviderInvoiceItem>().ReverseMap();
     }
 }

src/Infrastructure.EntityFramework/Billing/Models/ProviderPlan.cs

@@ -4,7 +4,7 @@ using Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider;
 namespace Bit.Infrastructure.EntityFramework.Billing.Models;
 
 // ReSharper disable once ClassWithVirtualMembersNeverInherited.Global
-public class ProviderPlan : Core.Billing.Entities.ProviderPlan
+public class ProviderPlan : Core.Billing.Providers.Entities.ProviderPlan
 {
     public virtual Provider Provider { get; set; }
 }
@@ -13,6 +13,6 @@ public class ProviderPlanMapperProfile : Profile
 {
     public ProviderPlanMapperProfile()
     {
-        CreateMap<Core.Billing.Entities.ProviderPlan, ProviderPlan>().ReverseMap();
+        CreateMap<Core.Billing.Providers.Entities.ProviderPlan, ProviderPlan>().ReverseMap();
     }
 }

src/Infrastructure.EntityFramework/Billing/Repositories/ClientOrganizationMigrationRecordRepository.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Providers.Entities;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;

src/Infrastructure.EntityFramework/Billing/Repositories/ProviderInvoiceItemRepository.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Providers.Entities;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using LinqToDB;
 using Microsoft.Extensions.DependencyInjection;

src/Infrastructure.EntityFramework/Billing/Repositories/ProviderPlanRepository.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Providers.Entities;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;

src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs

@@ -1,5 +1,6 @@
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Repositories;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Billing.Repositories;
 using Bit.Core.Enums;
 using Bit.Core.KeyManagement.Repositories;

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

@@ -5,7 +5,7 @@ using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Enums;
-using Bit.Core.Billing.Services;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Test.Common.AutoFixture;

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

@@ -21,7 +21,7 @@ using Bit.Core.Auth.Repositories;
 using Bit.Core.Auth.Services;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Services;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;

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

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

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

@@ -1,14 +1,17 @@
 using Bit.Api.Billing.Controllers;
 using Bit.Api.Billing.Models.Requests;
 using Bit.Api.Billing.Models.Responses;
+using Bit.Commercial.Core.Billing.Providers.Services;
+using Bit.Core;
 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.Entities;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Entities;
+using Bit.Core.Billing.Providers.Repositories;
+using Bit.Core.Billing.Providers.Services;
 using Bit.Core.Billing.Services;
 using Bit.Core.Billing.Tax.Models;
 using Bit.Core.Context;
@@ -285,6 +288,19 @@ public class ProviderBillingControllerTests
                 Discount = new Discount { Coupon = new Coupon { PercentOff = 10 } },
                 TaxIds = new StripeList<TaxId> { Data = [new TaxId { Value = "123456789" }] }
             },
+            Items = new StripeList<SubscriptionItem>
+            {
+                Data = [
+                    new SubscriptionItem
+                    {
+                        Price = new Price { Id = ProviderPriceAdapter.MSP.Active.Enterprise }
+                    },
+                    new SubscriptionItem
+                    {
+                        Price = new Price { Id = ProviderPriceAdapter.MSP.Active.Teams }
+                    }
+                ]
+            },
             Status = "unpaid",
         };
 
@@ -330,11 +346,21 @@ public class ProviderBillingControllerTests
             }
         };
 
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.PM21383_GetProviderPriceFromStripe)
+            .Returns(true);
+
         sutProvider.GetDependency<IProviderPlanRepository>().GetByProviderId(provider.Id).Returns(providerPlans);
 
         foreach (var providerPlan in providerPlans)
         {
-            sutProvider.GetDependency<IPricingClient>().GetPlanOrThrow(providerPlan.PlanType).Returns(StaticStore.GetPlan(providerPlan.PlanType));
+            var plan = StaticStore.GetPlan(providerPlan.PlanType);
+            sutProvider.GetDependency<IPricingClient>().GetPlanOrThrow(providerPlan.PlanType).Returns(plan);
+            var priceId = ProviderPriceAdapter.GetPriceId(provider, subscription, providerPlan.PlanType);
+            sutProvider.GetDependency<IStripeAdapter>().PriceGetAsync(priceId)
+                .Returns(new Price
+                {
+                    UnitAmountDecimal = plan.PasswordManager.ProviderPortalSeatPrice * 100
+                });
         }
 
         var result = await sutProvider.Sut.GetSubscriptionAsync(provider.Id);

test/Billing.Test/Services/ProviderEventServiceTests.cs

@@ -4,10 +4,10 @@ using Bit.Billing.Test.Utilities;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Models.Data.Provider;
 using Bit.Core.AdminConsole.Repositories;
-using Bit.Core.Billing.Entities;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Repositories;
+using Bit.Core.Billing.Providers.Entities;
+using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Core.Utilities;

test/Core.Test/Billing/Tax/Services/AutomaticTaxFactoryTests.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Models.StaticStore.Plans;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Services.Contracts;
+using Bit.Core.Billing.Tax.Models;
 using Bit.Core.Billing.Tax.Services.Implementations;
 using Bit.Core.Entities;
 using Bit.Test.Common.AutoFixture;

test/Core.Test/Services/StripePaymentServiceTests.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Models.StaticStore.Plans;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Services.Contracts;
+using Bit.Core.Billing.Tax.Models;
 using Bit.Core.Billing.Tax.Requests;
 using Bit.Core.Billing.Tax.Services;
 using Bit.Core.Enums;