mirror of
https://github.com/bitwarden/server
synced 2025-12-20 02:03:46 +00:00
* 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 * Fix provider invoice generation validation * More QA fixes * Fix tests * QA defect resolutions * QA defect resolutions * Run dotnet format * Fix tests --------- Co-authored-by: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
66 lines
2.3 KiB
C#
66 lines
2.3 KiB
C#
using Bit.Core.Billing.Commands;
|
|
using Bit.Core.Billing.Constants;
|
|
using Bit.Core.Billing.Payment.Models;
|
|
using Bit.Core.Services;
|
|
using Microsoft.Extensions.Logging;
|
|
using Stripe;
|
|
|
|
namespace Bit.Core.Billing.Premium.Commands;
|
|
|
|
using static StripeConstants;
|
|
|
|
public interface IPreviewPremiumTaxCommand
|
|
{
|
|
Task<BillingCommandResult<(decimal Tax, decimal Total)>> Run(
|
|
int additionalStorage,
|
|
BillingAddress billingAddress);
|
|
}
|
|
|
|
public class PreviewPremiumTaxCommand(
|
|
ILogger<PreviewPremiumTaxCommand> logger,
|
|
IStripeAdapter stripeAdapter) : BaseBillingCommand<PreviewPremiumTaxCommand>(logger), IPreviewPremiumTaxCommand
|
|
{
|
|
public Task<BillingCommandResult<(decimal Tax, decimal Total)>> Run(
|
|
int additionalStorage,
|
|
BillingAddress billingAddress)
|
|
=> HandleAsync<(decimal, decimal)>(async () =>
|
|
{
|
|
var options = new InvoiceCreatePreviewOptions
|
|
{
|
|
AutomaticTax = new InvoiceAutomaticTaxOptions { Enabled = true },
|
|
CustomerDetails = new InvoiceCustomerDetailsOptions
|
|
{
|
|
Address = new AddressOptions
|
|
{
|
|
Country = billingAddress.Country,
|
|
PostalCode = billingAddress.PostalCode
|
|
}
|
|
},
|
|
Currency = "usd",
|
|
SubscriptionDetails = new InvoiceSubscriptionDetailsOptions
|
|
{
|
|
Items =
|
|
[
|
|
new InvoiceSubscriptionDetailsItemOptions { Price = Prices.PremiumAnnually, Quantity = 1 }
|
|
]
|
|
}
|
|
};
|
|
|
|
if (additionalStorage > 0)
|
|
{
|
|
options.SubscriptionDetails.Items.Add(new InvoiceSubscriptionDetailsItemOptions
|
|
{
|
|
Price = Prices.StoragePlanPersonal,
|
|
Quantity = additionalStorage
|
|
});
|
|
}
|
|
|
|
var invoice = await stripeAdapter.InvoiceCreatePreviewAsync(options);
|
|
return GetAmounts(invoice);
|
|
});
|
|
|
|
private static (decimal, decimal) GetAmounts(Invoice invoice) => (
|
|
Convert.ToDecimal(invoice.TotalTaxes.Sum(invoiceTotalTax => invoiceTotalTax.Amount)) / 100,
|
|
Convert.ToDecimal(invoice.Total) / 100);
|
|
}
|