mirror of
https://github.com/bitwarden/server
synced 2026-01-08 11:33:26 +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>
130 lines
4.5 KiB
C#
130 lines
4.5 KiB
C#
// FIXME: Update this file to be null safe and then delete the line below
|
|
#nullable disable
|
|
|
|
using Bit.Core.Billing.Extensions;
|
|
using Stripe;
|
|
|
|
namespace Bit.Core.Models.Business;
|
|
|
|
public class SubscriptionInfo
|
|
{
|
|
public BillingCustomerDiscount CustomerDiscount { get; set; }
|
|
public BillingSubscription Subscription { get; set; }
|
|
public BillingUpcomingInvoice UpcomingInvoice { get; set; }
|
|
|
|
public class BillingCustomerDiscount
|
|
{
|
|
public BillingCustomerDiscount() { }
|
|
|
|
public BillingCustomerDiscount(Discount discount)
|
|
{
|
|
Id = discount.Coupon?.Id;
|
|
Active = discount.End == null;
|
|
PercentOff = discount.Coupon?.PercentOff;
|
|
AppliesTo = discount.Coupon?.AppliesTo?.Products ?? [];
|
|
}
|
|
|
|
public string Id { get; set; }
|
|
public bool Active { get; set; }
|
|
public decimal? PercentOff { get; set; }
|
|
public List<string> AppliesTo { get; set; }
|
|
}
|
|
|
|
public class BillingSubscription
|
|
{
|
|
public BillingSubscription(Subscription sub)
|
|
{
|
|
Status = sub.Status;
|
|
TrialStartDate = sub.TrialStart;
|
|
TrialEndDate = sub.TrialEnd;
|
|
var currentPeriod = sub.GetCurrentPeriod();
|
|
if (currentPeriod != null)
|
|
{
|
|
var (start, end) = currentPeriod.Value;
|
|
PeriodStartDate = start;
|
|
PeriodEndDate = end;
|
|
}
|
|
CancelledDate = sub.CanceledAt;
|
|
CancelAtEndDate = sub.CancelAtPeriodEnd;
|
|
Cancelled = sub.Status == "canceled" || sub.Status == "unpaid" || sub.Status == "incomplete_expired";
|
|
if (sub.Items?.Data != null)
|
|
{
|
|
Items = sub.Items.Data.Select(i => new BillingSubscriptionItem(i));
|
|
}
|
|
CollectionMethod = sub.CollectionMethod;
|
|
GracePeriod = sub.CollectionMethod == "charge_automatically"
|
|
? 14
|
|
: 30;
|
|
}
|
|
|
|
public DateTime? TrialStartDate { get; set; }
|
|
public DateTime? TrialEndDate { get; set; }
|
|
public DateTime? PeriodStartDate { get; set; }
|
|
public DateTime? PeriodEndDate { get; set; }
|
|
public TimeSpan? PeriodDuration => PeriodEndDate - PeriodStartDate;
|
|
public DateTime? CancelledDate { get; set; }
|
|
public bool CancelAtEndDate { get; set; }
|
|
public string Status { get; set; }
|
|
public bool Cancelled { get; set; }
|
|
public IEnumerable<BillingSubscriptionItem> Items { get; set; } = new List<BillingSubscriptionItem>();
|
|
public string CollectionMethod { get; set; }
|
|
public DateTime? SuspensionDate { get; set; }
|
|
public DateTime? UnpaidPeriodEndDate { get; set; }
|
|
public int GracePeriod { get; set; }
|
|
|
|
public class BillingSubscriptionItem
|
|
{
|
|
public BillingSubscriptionItem(SubscriptionItem item)
|
|
{
|
|
if (item.Plan != null)
|
|
{
|
|
ProductId = item.Plan.ProductId;
|
|
Name = item.Plan.Nickname;
|
|
Amount = item.Plan.Amount.GetValueOrDefault() / 100M;
|
|
Interval = item.Plan.Interval;
|
|
|
|
if (item.Metadata != null)
|
|
{
|
|
AddonSubscriptionItem = item.Metadata.TryGetValue("isAddOn", out var value) && bool.Parse(value);
|
|
}
|
|
}
|
|
|
|
Quantity = (int)item.Quantity;
|
|
SponsoredSubscriptionItem = Utilities.StaticStore.SponsoredPlans.Any(p => p.StripePlanId == item.Plan.Id);
|
|
}
|
|
|
|
public bool AddonSubscriptionItem { get; set; }
|
|
public string ProductId { get; set; }
|
|
public string Name { get; set; }
|
|
public decimal Amount { get; set; }
|
|
public int Quantity { get; set; }
|
|
public string Interval { get; set; }
|
|
public bool SponsoredSubscriptionItem { get; set; }
|
|
}
|
|
}
|
|
|
|
public class BillingUpcomingInvoice
|
|
{
|
|
public BillingUpcomingInvoice() { }
|
|
|
|
public BillingUpcomingInvoice(Invoice inv)
|
|
{
|
|
Amount = inv.AmountDue / 100M;
|
|
Date = inv.Created;
|
|
}
|
|
|
|
public BillingUpcomingInvoice(Braintree.Subscription sub)
|
|
{
|
|
Amount = sub.NextBillAmount.GetValueOrDefault() + sub.Balance.GetValueOrDefault();
|
|
if (Amount < 0)
|
|
{
|
|
Amount = 0;
|
|
}
|
|
Date = sub.NextBillingDate;
|
|
}
|
|
|
|
public decimal Amount { get; set; }
|
|
public DateTime? Date { get; set; }
|
|
}
|
|
}
|