mirror of
https://github.com/bitwarden/server
synced 2025-12-17 16:53:23 +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>
81 lines
2.6 KiB
C#
81 lines
2.6 KiB
C#
using Bit.Core.AdminConsole.Entities.Provider;
|
|
using Bit.Core.AdminConsole.Enums.Provider;
|
|
using Bit.Core.Billing.Enums;
|
|
using Bit.Core.Billing.Extensions;
|
|
using Bit.Core.Billing.Models;
|
|
using Bit.Core.Billing.Providers.Models;
|
|
using Bit.Core.Billing.Tax.Models;
|
|
using Stripe;
|
|
|
|
namespace Bit.Api.Billing.Models.Responses;
|
|
|
|
public record ProviderSubscriptionResponse(
|
|
string Status,
|
|
DateTime? CurrentPeriodEndDate,
|
|
decimal? DiscountPercentage,
|
|
string CollectionMethod,
|
|
IEnumerable<ProviderPlanResponse> Plans,
|
|
decimal AccountCredit,
|
|
TaxInformation TaxInformation,
|
|
DateTime? CancelAt,
|
|
SubscriptionSuspension Suspension,
|
|
ProviderType ProviderType,
|
|
PaymentSource PaymentSource)
|
|
{
|
|
private const string _annualCadence = "Annual";
|
|
private const string _monthlyCadence = "Monthly";
|
|
|
|
public static ProviderSubscriptionResponse From(
|
|
Subscription subscription,
|
|
ICollection<ConfiguredProviderPlan> providerPlans,
|
|
TaxInformation taxInformation,
|
|
SubscriptionSuspension subscriptionSuspension,
|
|
Provider provider,
|
|
PaymentSource paymentSource)
|
|
{
|
|
var providerPlanResponses = providerPlans
|
|
.Select(providerPlan =>
|
|
{
|
|
var plan = providerPlan.Plan;
|
|
var cost = (providerPlan.SeatMinimum + providerPlan.PurchasedSeats) * providerPlan.Price;
|
|
var cadence = plan.IsAnnual ? _annualCadence : _monthlyCadence;
|
|
return new ProviderPlanResponse(
|
|
plan.Name,
|
|
plan.Type,
|
|
plan.ProductTier,
|
|
providerPlan.SeatMinimum,
|
|
providerPlan.PurchasedSeats,
|
|
providerPlan.AssignedSeats,
|
|
cost,
|
|
cadence);
|
|
});
|
|
|
|
var accountCredit = Convert.ToDecimal(subscription.Customer?.Balance) * -1 / 100;
|
|
|
|
var discount = subscription.Customer?.Discount ?? subscription.Discounts?.FirstOrDefault();
|
|
|
|
return new ProviderSubscriptionResponse(
|
|
subscription.Status,
|
|
subscription.GetCurrentPeriodEnd(),
|
|
discount?.Coupon?.PercentOff,
|
|
subscription.CollectionMethod,
|
|
providerPlanResponses,
|
|
accountCredit,
|
|
taxInformation,
|
|
subscription.CancelAt,
|
|
subscriptionSuspension,
|
|
provider.Type,
|
|
paymentSource);
|
|
}
|
|
}
|
|
|
|
public record ProviderPlanResponse(
|
|
string PlanName,
|
|
PlanType Type,
|
|
ProductTierType ProductTier,
|
|
int SeatMinimum,
|
|
int PurchasedSeats,
|
|
int AssignedSeats,
|
|
decimal Cost,
|
|
string Cadence);
|