mirror of
https://github.com/bitwarden/server
synced 2025-12-19 09:43:25 +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>
26 lines
1.0 KiB
C#
26 lines
1.0 KiB
C#
using Stripe;
|
|
|
|
namespace Bit.Core.Billing.Extensions;
|
|
|
|
public static class SubscriptionExtensions
|
|
{
|
|
/*
|
|
* For the time being, this is the simplest migration approach from v45 to v48 as
|
|
* we do not support multi-cadence subscriptions. Each subscription item should be on the
|
|
* same billing cycle. If this changes, we'll need a significantly more robust approach.
|
|
*
|
|
* Because we can't guarantee a subscription will have items, this has to be nullable.
|
|
*/
|
|
public static (DateTime? Start, DateTime? End)? GetCurrentPeriod(this Subscription subscription)
|
|
{
|
|
var item = subscription.Items?.FirstOrDefault();
|
|
return item is null ? null : (item.CurrentPeriodStart, item.CurrentPeriodEnd);
|
|
}
|
|
|
|
public static DateTime? GetCurrentPeriodStart(this Subscription subscription) =>
|
|
subscription.Items?.FirstOrDefault()?.CurrentPeriodStart;
|
|
|
|
public static DateTime? GetCurrentPeriodEnd(this Subscription subscription) =>
|
|
subscription.Items?.FirstOrDefault()?.CurrentPeriodEnd;
|
|
}
|