mirror of
https://github.com/bitwarden/server
synced 2025-12-21 10:43:44 +00:00
* move billing services+tests to billing namespaces * reorganized methods in file and added comment headers * renamed StripeAdapter methods for better clarity * clean up redundant qualifiers * Upgrade Stripe.net to v48.4.0 * Update PreviewTaxAmountCommand * Remove unused UpcomingInvoiceOptionExtensions * Added SubscriptionExtensions with GetCurrentPeriodEnd * Update PremiumUserBillingService * Update OrganizationBillingService * Update GetOrganizationWarningsQuery * Update BillingHistoryInfo * Update SubscriptionInfo * Remove unused Sql Billing folder * Update StripeAdapter * Update StripePaymentService * Update InvoiceCreatedHandler * Update PaymentFailedHandler * Update PaymentSucceededHandler * Update ProviderEventService * Update StripeEventUtilityService * Update SubscriptionDeletedHandler * Update SubscriptionUpdatedHandler * Update UpcomingInvoiceHandler * Update ProviderSubscriptionResponse * Remove unused Stripe Subscriptions Admin Tool * Update RemoveOrganizationFromProviderCommand * Update ProviderBillingService * Update RemoveOrganizatinoFromProviderCommandTests * Update PreviewTaxAmountCommandTests * Update GetCloudOrganizationLicenseQueryTests * Update GetOrganizationWarningsQueryTests * Update StripePaymentServiceTests * Update ProviderBillingControllerTests * Update ProviderEventServiceTests * Update SubscriptionDeletedHandlerTests * Update SubscriptionUpdatedHandlerTests * Resolve Billing test failures I completely removed tests for the StripeEventService as they were using a system I setup a while back that read JSON files of the Stripe event structure. I did not anticipate how frequently these structures would change with each API version and the cost of trying to update these specific JSON files to test a very static data retrieval service far outweigh the benefit. * Resolve Core test failures * Run dotnet format * Remove unused provider migration * Fixed failing tests * Run dotnet format * Replace the old webhook secret key with new one (#6223) * Fix compilation failures in additions * Run dotnet format * Bump Stripe API version * Fix recent addition: CreatePremiumCloudHostedSubscriptionCommand * Fix new code in main according to Stripe update * Fix InvoiceExtensions * Bump SDK version to match API Version * cleanup * fixing items missed after the merge * use expression body for all simple returns * forgot fixes, format, and pr feedback * claude pr feedback * pr feedback and cleanup * more claude feedback --------- Co-authored-by: Alex Morask <amorask@bitwarden.com> Co-authored-by: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
141 lines
5.3 KiB
C#
141 lines
5.3 KiB
C#
using Bit.Core.Billing.Commands;
|
|
using Bit.Core.Billing.Constants;
|
|
using Bit.Core.Billing.Extensions;
|
|
using Bit.Core.Billing.Payment.Models;
|
|
using Bit.Core.Billing.Services;
|
|
using Bit.Core.Entities;
|
|
using Microsoft.Extensions.Logging;
|
|
using Stripe;
|
|
|
|
namespace Bit.Core.Billing.Payment.Commands;
|
|
|
|
public interface IUpdateBillingAddressCommand
|
|
{
|
|
Task<BillingCommandResult<BillingAddress>> Run(
|
|
ISubscriber subscriber,
|
|
BillingAddress billingAddress);
|
|
}
|
|
|
|
public class UpdateBillingAddressCommand(
|
|
ILogger<UpdateBillingAddressCommand> logger,
|
|
ISubscriberService subscriberService,
|
|
IStripeAdapter stripeAdapter) : BaseBillingCommand<UpdateBillingAddressCommand>(logger), IUpdateBillingAddressCommand
|
|
{
|
|
protected override Conflict DefaultConflict =>
|
|
new("We had a problem updating your billing address. Please contact support for assistance.");
|
|
|
|
public Task<BillingCommandResult<BillingAddress>> Run(
|
|
ISubscriber subscriber,
|
|
BillingAddress billingAddress) => HandleAsync(async () =>
|
|
{
|
|
if (string.IsNullOrEmpty(subscriber.GatewayCustomerId))
|
|
{
|
|
await subscriberService.CreateStripeCustomer(subscriber);
|
|
}
|
|
|
|
return subscriber.GetProductUsageType() switch
|
|
{
|
|
ProductUsageType.Personal => await UpdatePersonalBillingAddressAsync(subscriber, billingAddress),
|
|
ProductUsageType.Business => await UpdateBusinessBillingAddressAsync(subscriber, billingAddress)
|
|
};
|
|
});
|
|
|
|
private async Task<BillingCommandResult<BillingAddress>> UpdatePersonalBillingAddressAsync(
|
|
ISubscriber subscriber,
|
|
BillingAddress billingAddress)
|
|
{
|
|
var customer =
|
|
await stripeAdapter.UpdateCustomerAsync(subscriber.GatewayCustomerId,
|
|
new CustomerUpdateOptions
|
|
{
|
|
Address = new AddressOptions
|
|
{
|
|
Country = billingAddress.Country,
|
|
PostalCode = billingAddress.PostalCode,
|
|
Line1 = billingAddress.Line1,
|
|
Line2 = billingAddress.Line2,
|
|
City = billingAddress.City,
|
|
State = billingAddress.State
|
|
},
|
|
Expand = ["subscriptions"]
|
|
});
|
|
|
|
await EnableAutomaticTaxAsync(subscriber, customer);
|
|
|
|
return BillingAddress.From(customer.Address);
|
|
}
|
|
|
|
private async Task<BillingCommandResult<BillingAddress>> UpdateBusinessBillingAddressAsync(
|
|
ISubscriber subscriber,
|
|
BillingAddress billingAddress)
|
|
{
|
|
var customer =
|
|
await stripeAdapter.UpdateCustomerAsync(subscriber.GatewayCustomerId,
|
|
new CustomerUpdateOptions
|
|
{
|
|
Address = new AddressOptions
|
|
{
|
|
Country = billingAddress.Country,
|
|
PostalCode = billingAddress.PostalCode,
|
|
Line1 = billingAddress.Line1,
|
|
Line2 = billingAddress.Line2,
|
|
City = billingAddress.City,
|
|
State = billingAddress.State
|
|
},
|
|
Expand = ["subscriptions", "tax_ids"],
|
|
TaxExempt = billingAddress.Country != Core.Constants.CountryAbbreviations.UnitedStates
|
|
? StripeConstants.TaxExempt.Reverse
|
|
: StripeConstants.TaxExempt.None
|
|
});
|
|
|
|
await EnableAutomaticTaxAsync(subscriber, customer);
|
|
|
|
var deleteExistingTaxIds = customer.TaxIds?.Any() ?? false
|
|
? customer.TaxIds.Select(taxId => stripeAdapter.DeleteTaxIdAsync(customer.Id, taxId.Id)).ToList()
|
|
: [];
|
|
|
|
if (billingAddress.TaxId == null)
|
|
{
|
|
await Task.WhenAll(deleteExistingTaxIds);
|
|
return BillingAddress.From(customer.Address);
|
|
}
|
|
|
|
var updatedTaxId = await stripeAdapter.CreateTaxIdAsync(customer.Id,
|
|
new TaxIdCreateOptions { Type = billingAddress.TaxId.Code, Value = billingAddress.TaxId.Value });
|
|
|
|
if (billingAddress.TaxId.Code == StripeConstants.TaxIdType.SpanishNIF)
|
|
{
|
|
updatedTaxId = await stripeAdapter.CreateTaxIdAsync(customer.Id,
|
|
new TaxIdCreateOptions
|
|
{
|
|
Type = StripeConstants.TaxIdType.EUVAT,
|
|
Value = $"ES{billingAddress.TaxId.Value}"
|
|
});
|
|
}
|
|
|
|
await Task.WhenAll(deleteExistingTaxIds);
|
|
|
|
return BillingAddress.From(customer.Address, updatedTaxId);
|
|
}
|
|
|
|
private async Task EnableAutomaticTaxAsync(
|
|
ISubscriber subscriber,
|
|
Customer customer)
|
|
{
|
|
if (!string.IsNullOrEmpty(subscriber.GatewaySubscriptionId))
|
|
{
|
|
var subscription = customer.Subscriptions.FirstOrDefault(subscription =>
|
|
subscription.Id == subscriber.GatewaySubscriptionId);
|
|
|
|
if (subscription is { AutomaticTax.Enabled: false })
|
|
{
|
|
await stripeAdapter.UpdateSubscriptionAsync(subscriber.GatewaySubscriptionId,
|
|
new SubscriptionUpdateOptions
|
|
{
|
|
AutomaticTax = new SubscriptionAutomaticTaxOptions { Enabled = true }
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|