nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 13:38:13 -05:00
Code

ReferenceEvent Rebilled missing data (#1240)

Browse Source
This commit is contained in:
Chad Scharf 2021-03-24 15:27:16 -04:00 committed by GitHub
parent a2f33176aa
commit c09ae5f906
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Billing/Controllers/StripeController.cs
View File

@ -24,6 +24,7 @@ namespace Bit.Billing.Controllers
public class StripeController : Controller public class StripeController : Controller
{ {
private const decimal PremiumPlanAppleIapPrice = 14.99M; private const decimal PremiumPlanAppleIapPrice = 14.99M;
private const string PremiumPlanId = "premium-annually";
private readonly BillingSettings _billingSettings; private readonly BillingSettings _billingSettings;
private readonly IWebHostEnvironment _hostingEnvironment; private readonly IWebHostEnvironment _hostingEnvironment;
@ -37,6 +38,7 @@ namespace Bit.Billing.Controllers
private readonly Braintree.BraintreeGateway _btGateway; private readonly Braintree.BraintreeGateway _btGateway;
private readonly IReferenceEventService _referenceEventService; private readonly IReferenceEventService _referenceEventService;
private readonly ITaxRateRepository _taxRateRepository; private readonly ITaxRateRepository _taxRateRepository;
private readonly IUserRepository _userRepository;
public StripeController( public StripeController(
GlobalSettings globalSettings, GlobalSettings globalSettings,
@ -50,7 +52,8 @@ namespace Bit.Billing.Controllers
IMailService mailService, IMailService mailService,
IReferenceEventService referenceEventService, IReferenceEventService referenceEventService,
ILogger<StripeController> logger, ILogger<StripeController> logger,
ITaxRateRepository taxRateRepository) ITaxRateRepository taxRateRepository,
IUserRepository userRepository)
{ {
_billingSettings = billingSettings?.Value; _billingSettings = billingSettings?.Value;
_hostingEnvironment = hostingEnvironment; _hostingEnvironment = hostingEnvironment;
@ -62,6 +65,7 @@ namespace Bit.Billing.Controllers
_mailService = mailService; _mailService = mailService;
_referenceEventService = referenceEventService; _referenceEventService = referenceEventService;
_taxRateRepository = taxRateRepository; _taxRateRepository = taxRateRepository;
_userRepository = userRepository;
_logger = logger; _logger = logger;
_btGateway = new Braintree.BraintreeGateway _btGateway = new Braintree.BraintreeGateway
{ {
@ -381,27 +385,34 @@ namespace Bit.Billing.Controllers
if (subscription.Items.Any(i => StaticStore.Plans.Any(p => p.StripePlanId == i.Plan.Id))) if (subscription.Items.Any(i => StaticStore.Plans.Any(p => p.StripePlanId == i.Plan.Id)))
{ {
await _organizationService.EnableAsync(ids.Item1.Value, subscription.CurrentPeriodEnd); await _organizationService.EnableAsync(ids.Item1.Value, subscription.CurrentPeriodEnd);
var organization = await _organizationRepository.GetByIdAsync(ids.Item1.Value);
await _referenceEventService.RaiseEventAsync(
new ReferenceEvent(ReferenceEventType.Rebilled, organization)
{
PlanName = organization?.Plan,
PlanType = organization?.PlanType,
Seats = organization?.Seats,
Storage = organization?.MaxStorageGb,
});
} }
} }
// user // user
else if (ids.Item2.HasValue) else if (ids.Item2.HasValue)
{ {
if (subscription.Items.Any(i => i.Plan.Id == "premium-annually")) if (subscription.Items.Any(i => i.Plan.Id == PremiumPlanId))
{ {
await _userService.EnablePremiumAsync(ids.Item2.Value, subscription.CurrentPeriodEnd); await _userService.EnablePremiumAsync(ids.Item2.Value, subscription.CurrentPeriodEnd);
var user = await _userRepository.GetByIdAsync(ids.Item2.Value);
await _referenceEventService.RaiseEventAsync(
new ReferenceEvent(ReferenceEventType.Rebilled, user)
{
PlanName = PremiumPlanId,
Storage = user?.MaxStorageGb,
});
} }
} }
if (ids.Item1.HasValue || ids.Item2.HasValue)
{
await _referenceEventService.RaiseEventAsync(
new ReferenceEvent(ReferenceEventType.Rebilled, null)
{
Id = ids.Item1 ?? ids.Item2 ?? default,
Source = ids.Item1.HasValue
? ReferenceEventSource.Organization
: ReferenceEventSource.User,
});
}
} }
} }
} }