From 43e32c9f18802a6226d650c7e64d92ba389c3025 Mon Sep 17 00:00:00 2001 From: Jonas Hendrickx Date: Wed, 2 Apr 2025 13:05:07 +0200 Subject: [PATCH] "customer.tax_ids" isn't expanded in some flows. --- .../RemoveOrganizationFromProviderCommand.cs | 3 ++- .../Billing/ProviderBillingService.cs | 3 ++- .../AutomaticTax/BusinessUseAutomaticTaxStrategy.cs | 7 ++++++- .../Implementations/OrganizationBillingService.cs | 2 +- .../Services/Implementations/SubscriberService.cs | 12 +++++++++--- .../Services/Implementations/StripePaymentService.cs | 10 ++++++---- .../Billing/Stubs/FakeAutomaticTaxStrategy.cs | 6 ------ 7 files changed, 26 insertions(+), 17 deletions(-) diff --git a/bitwarden_license/src/Commercial.Core/AdminConsole/Providers/RemoveOrganizationFromProviderCommand.cs b/bitwarden_license/src/Commercial.Core/AdminConsole/Providers/RemoveOrganizationFromProviderCommand.cs index a01c40c777..2c34e57a92 100644 --- a/bitwarden_license/src/Commercial.Core/AdminConsole/Providers/RemoveOrganizationFromProviderCommand.cs +++ b/bitwarden_license/src/Commercial.Core/AdminConsole/Providers/RemoveOrganizationFromProviderCommand.cs @@ -116,7 +116,8 @@ public class RemoveOrganizationFromProviderCommand : IRemoveOrganizationFromProv var customer = await _stripeAdapter.CustomerUpdateAsync(organization.GatewayCustomerId, new CustomerUpdateOptions { Description = string.Empty, - Email = organization.BillingEmail + Email = organization.BillingEmail, + Expand = ["tax", "tax_ids"] }); var plan = await _pricingClient.GetPlanOrThrow(organization.PlanType); diff --git a/bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs b/bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs index 4dc3812c69..65e41ab586 100644 --- a/bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs +++ b/bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs @@ -562,7 +562,8 @@ public class ProviderBillingService( { ArgumentNullException.ThrowIfNull(provider); - var customer = await subscriberService.GetCustomerOrThrow(provider); + var customerGetOptions = new CustomerGetOptions { Expand = ["tax", "tax_ids"] }; + var customer = await subscriberService.GetCustomerOrThrow(provider, customerGetOptions); var providerPlans = await providerPlanRepository.GetByProviderId(provider.Id); diff --git a/src/Core/Billing/Services/Implementations/AutomaticTax/BusinessUseAutomaticTaxStrategy.cs b/src/Core/Billing/Services/Implementations/AutomaticTax/BusinessUseAutomaticTaxStrategy.cs index 670822afcd..40eb6e4540 100644 --- a/src/Core/Billing/Services/Implementations/AutomaticTax/BusinessUseAutomaticTaxStrategy.cs +++ b/src/Core/Billing/Services/Implementations/AutomaticTax/BusinessUseAutomaticTaxStrategy.cs @@ -86,6 +86,11 @@ public class BusinessUseAutomaticTaxStrategy(IFeatureService featureService) : I return true; } - return customer.TaxIds != null && customer.TaxIds.Any(); + if (customer.TaxIds == null) + { + throw new ArgumentNullException(nameof(customer.TaxIds), "`customer.tax_ids` must be expanded."); + } + + return customer.TaxIds.Any(); } } diff --git a/src/Core/Billing/Services/Implementations/OrganizationBillingService.cs b/src/Core/Billing/Services/Implementations/OrganizationBillingService.cs index df96e3c47c..a4d22cfa3e 100644 --- a/src/Core/Billing/Services/Implementations/OrganizationBillingService.cs +++ b/src/Core/Billing/Services/Implementations/OrganizationBillingService.cs @@ -147,7 +147,7 @@ public class OrganizationBillingService( Coupon = customerSetup.Coupon, Description = organization.DisplayBusinessName(), Email = organization.BillingEmail, - Expand = ["tax"], + Expand = ["tax", "tax_ids"], InvoiceSettings = new CustomerInvoiceSettingsOptions { CustomFields = [ diff --git a/src/Core/Billing/Services/Implementations/SubscriberService.cs b/src/Core/Billing/Services/Implementations/SubscriberService.cs index 3cf09794fd..e4b0594433 100644 --- a/src/Core/Billing/Services/Implementations/SubscriberService.cs +++ b/src/Core/Billing/Services/Implementations/SubscriberService.cs @@ -441,7 +441,8 @@ public class SubscriberService( ArgumentNullException.ThrowIfNull(subscriber); ArgumentNullException.ThrowIfNull(tokenizedPaymentSource); - var customer = await GetCustomerOrThrow(subscriber); + var customerGetOptions = new CustomerGetOptions { Expand = ["tax", "tax_ids"] }; + var customer = await GetCustomerOrThrow(subscriber, customerGetOptions); var (type, token) = tokenizedPaymentSource; @@ -610,7 +611,8 @@ public class SubscriberService( Line2 = taxInformation.Line2, City = taxInformation.City, State = taxInformation.State - } + }, + Expand = ["subscriptions", "tax", "tax_ids"] }); var taxId = customer.TaxIds?.FirstOrDefault(); @@ -668,7 +670,11 @@ public class SubscriberService( { if (!string.IsNullOrEmpty(subscriber.GatewaySubscriptionId)) { - var subscription = await stripeAdapter.SubscriptionGetAsync(subscriber.GatewaySubscriptionId); + var subscriptionGetOptions = new SubscriptionGetOptions + { + Expand = ["customer.tax", "customer.tax_ids"] + }; + var subscription = await stripeAdapter.SubscriptionGetAsync(subscriber.GatewaySubscriptionId, subscriptionGetOptions); var automaticTaxParameters = new AutomaticTaxFactoryParameters(subscriber, subscription.Items.Select(x => x.Price.Id)); var automaticTaxStrategy = await automaticTaxFactory.CreateAsync(automaticTaxParameters); var automaticTaxOptions = automaticTaxStrategy.GetUpdateOptions(subscription); diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs index f79c2f651c..cdcd14ca90 100644 --- a/src/Core/Services/Implementations/StripePaymentService.cs +++ b/src/Core/Services/Implementations/StripePaymentService.cs @@ -100,9 +100,7 @@ public class StripePaymentService : IPaymentService SubscriptionUpdate subscriptionUpdate, bool invoiceNow = false) { // remember, when in doubt, throw - var subGetOptions = new SubscriptionGetOptions(); - // subGetOptions.AddExpand("customer"); - subGetOptions.AddExpand("customer.tax"); + var subGetOptions = new SubscriptionGetOptions { Expand = ["customer.tax", "customer.tax_ids"] }; var sub = await _stripeAdapter.SubscriptionGetAsync(subscriber.GatewaySubscriptionId, subGetOptions); if (sub == null) { @@ -836,7 +834,11 @@ public class StripePaymentService : IPaymentService { if (!string.IsNullOrEmpty(subscriber.GatewaySubscriptionId)) { - var subscription = await _stripeAdapter.SubscriptionGetAsync(subscriber.GatewaySubscriptionId); + var subscriptionGetOptions = new SubscriptionGetOptions + { + Expand = ["customer.tax", "customer.tax_ids"] + }; + var subscription = await _stripeAdapter.SubscriptionGetAsync(subscriber.GatewaySubscriptionId, subscriptionGetOptions); var automaticTaxParameters = new AutomaticTaxFactoryParameters(subscriber, subscription.Items.Select(x => x.Price.Id)); var automaticTaxStrategy = await _automaticTaxFactory.CreateAsync(automaticTaxParameters); diff --git a/test/Core.Test/Billing/Stubs/FakeAutomaticTaxStrategy.cs b/test/Core.Test/Billing/Stubs/FakeAutomaticTaxStrategy.cs index 3e1c8ff154..253aead5c7 100644 --- a/test/Core.Test/Billing/Stubs/FakeAutomaticTaxStrategy.cs +++ b/test/Core.Test/Billing/Stubs/FakeAutomaticTaxStrategy.cs @@ -32,10 +32,4 @@ public class FakeAutomaticTaxStrategy( options.AutomaticTax = new InvoiceAutomaticTaxOptions { Enabled = isAutomaticTaxEnabled }; } - - public void SetInvoiceCreatePreviewOptions(InvoiceCreatePreviewOptions options) - { - options.AutomaticTax = new InvoiceAutomaticTaxOptions { Enabled = IsAutomaticTaxEnabled }; - - } }