nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

WIP

Browse Source
This commit is contained in:
Jonas Hendrickx 2025-03-18 11:46:34 +01:00
parent 8e5bd1fa61
commit cae8835e27
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Core/Billing/Extensions/CustomerExtensions.cs
View File

@ -5,23 +5,13 @@ namespace Bit.Core.Billing.Extensions;
public static class CustomerExtensions public static class CustomerExtensions
{ {
public static bool HasBillingLocation(this Customer customer)
=> customer is
{
Address:
{
Country: not null and not "",
PostalCode: not null and not ""
}
};
/// <summary> /// <summary>
/// Determines if a Stripe customer supports automatic tax /// Determines if a Stripe customer supports automatic tax
/// </summary> /// </summary>
/// <param name="customer"></param> /// <param name="customer"></param>
/// <returns></returns> /// <returns></returns>
public static bool HasTaxLocationVerified(this Customer customer) => public static bool HasTaxLocationVerified(this Customer customer) =>
customer?.Tax?.AutomaticTax == StripeConstants.AutomaticTaxStatus.Supported; customer?.Tax?.AutomaticTax != StripeConstants.AutomaticTaxStatus.UnrecognizedLocation;
public static decimal GetBillingBalance(this Customer customer) public static decimal GetBillingBalance(this Customer customer)
{ {

10
src/Core/Billing/Services/Implementations/AutomaticTax/IndividualAutomaticTaxStrategy.cs
View File

@ -1,4 +1,4 @@
using Bit.Core.Billing.Constants; using Bit.Core.Billing.Extensions;
using Stripe; using Stripe;
namespace Bit.Core.Billing.Services.Implementations.AutomaticTax; namespace Bit.Core.Billing.Services.Implementations.AutomaticTax;
@ -20,14 +20,8 @@ public class IndividualAutomaticTaxStrategy : IIndividualAutomaticTaxStrategy
public Task SetUpdateOptionsAsync(SubscriptionUpdateOptions options, Subscription subscription) public Task SetUpdateOptionsAsync(SubscriptionUpdateOptions options, Subscription subscription)
{ {
ArgumentNullException.ThrowIfNull(options); ArgumentNullException.ThrowIfNull(options);
if (subscription.AutomaticTax.Enabled == ShouldEnable(subscription.Customer))
{
return Task.CompletedTask;
}
options.AutomaticTax = new SubscriptionAutomaticTaxOptions options.AutomaticTax = new SubscriptionAutomaticTaxOptions
{ {
Enabled = ShouldEnable(subscription.Customer) Enabled = ShouldEnable(subscription.Customer)
@ -58,6 +52,6 @@ public class IndividualAutomaticTaxStrategy : IIndividualAutomaticTaxStrategy
private static bool ShouldEnable(Customer customer) private static bool ShouldEnable(Customer customer)
{ {
return customer.Tax?.AutomaticTax == StripeConstants.AutomaticTaxStatus.Supported; return customer.HasTaxLocationVerified();
} }
} }

14
src/Core/Billing/Services/Implementations/AutomaticTax/OrganizationAutomaticTaxStrategy.cs
View File

@ -74,8 +74,13 @@ public class OrganizationAutomaticTaxStrategy(
private async Task<bool?> IsEnabledAsync(Subscription subscription) private async Task<bool?> IsEnabledAsync(Subscription subscription)
{ {
if (!subscription.Customer.HasTaxLocationVerified())
{
return false;
}
bool shouldBeEnabled; bool shouldBeEnabled;
if (subscription.Customer.HasBillingLocation() && subscription.Customer.Address.Country == "US") if (subscription.Customer.Address.Country == "US")
{ {
shouldBeEnabled = true; shouldBeEnabled = true;
} }
@ -95,7 +100,12 @@ public class OrganizationAutomaticTaxStrategy(
private async Task<bool?> IsEnabledAsync(SubscriptionCreateOptions options, Customer customer) private async Task<bool?> IsEnabledAsync(SubscriptionCreateOptions options, Customer customer)
{ {
if (customer.HasBillingLocation() && customer.Address.Country == "US") if (!customer.HasTaxLocationVerified())
{
return false;
}
if (customer.Address.Country == "US")
{ {
return true; return true;
} }