From 00e808d73187adfd2bc8d79cc85f0dd9fcbd414b Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 9 Aug 2019 23:56:26 -0400 Subject: [PATCH] payment intent/method support for incomplete status --- src/Api/Controllers/AccountsController.cs | 14 +++- .../Controllers/OrganizationsController.cs | 9 ++- src/Billing/Controllers/StripeController.cs | 34 ++++++++ .../Api/Response/PaymentResponseModel.cs | 13 ++++ src/Core/Services/IOrganizationService.cs | 3 +- src/Core/Services/IPaymentService.cs | 4 +- src/Core/Services/IUserService.cs | 6 +- .../Implementations/OrganizationService.cs | 24 +++++- .../Implementations/StripePaymentService.cs | 78 ++++++++++++++----- .../Services/Implementations/UserService.cs | 27 ++++++- 10 files changed, 173 insertions(+), 39 deletions(-) create mode 100644 src/Core/Models/Api/Response/PaymentResponseModel.cs diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs index 04a6b62306..7583e1644d 100644 --- a/src/Api/Controllers/AccountsController.cs +++ b/src/Api/Controllers/AccountsController.cs @@ -443,7 +443,7 @@ namespace Bit.Api.Controllers } [HttpPost("premium")] - public async Task PostPremium(PremiumRequestModel model) + public async Task PostPremium(PremiumRequestModel model) { var user = await _userService.GetUserByPrincipalAsync(User); if(user == null) @@ -463,9 +463,15 @@ namespace Bit.Api.Controllers throw new BadRequestException("Invalid license."); } - await _userService.SignUpPremiumAsync(user, model.PaymentToken, model.PaymentMethodType.Value, - model.AdditionalStorageGb.GetValueOrDefault(0), license); - return new ProfileResponseModel(user, null, await _userService.TwoFactorIsEnabledAsync(user)); + var result = await _userService.SignUpPremiumAsync(user, model.PaymentToken, + model.PaymentMethodType.Value, model.AdditionalStorageGb.GetValueOrDefault(0), license); + var profile = new ProfileResponseModel(user, null, await _userService.TwoFactorIsEnabledAsync(user)); + return new PaymentResponseModel + { + UserProfile = profile, + PaymentIntentClientSecret = result.Item2, + Success = result.Item1 + }; } [HttpGet("billing")] diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs index 91cce7f3f8..08b97335e7 100644 --- a/src/Api/Controllers/OrganizationsController.cs +++ b/src/Api/Controllers/OrganizationsController.cs @@ -215,7 +215,7 @@ namespace Bit.Api.Controllers [HttpPost("{id}/upgrade")] [SelfHosted(NotSelfHostedOnly = true)] - public async Task PostUpgrade(string id, [FromBody]OrganizationUpgradeRequestModel model) + public async Task PostUpgrade(string id, [FromBody]OrganizationUpgradeRequestModel model) { var orgIdGuid = new Guid(id); if(!_currentContext.OrganizationOwner(orgIdGuid)) @@ -223,7 +223,12 @@ namespace Bit.Api.Controllers throw new NotFoundException(); } - await _organizationService.UpgradePlanAsync(orgIdGuid, model.ToOrganizationUpgrade()); + var result = await _organizationService.UpgradePlanAsync(orgIdGuid, model.ToOrganizationUpgrade()); + return new PaymentResponseModel + { + Success = result.Item1, + PaymentIntentClientSecret = result.Item2 + }; } [HttpPost("{id}/seat")] diff --git a/src/Billing/Controllers/StripeController.cs b/src/Billing/Controllers/StripeController.cs index 279ae41565..7372443028 100644 --- a/src/Billing/Controllers/StripeController.cs +++ b/src/Billing/Controllers/StripeController.cs @@ -3,6 +3,7 @@ using Bit.Core.Enums; using Bit.Core.Models.Table; using Bit.Core.Repositories; using Bit.Core.Services; +using Bit.Core.Utilities; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; @@ -338,6 +339,39 @@ namespace Bit.Billing.Controllers _logger.LogWarning("Charge refund amount doesn't seem correct. " + charge.Id); } } + else if(parsedEvent.Type.Equals("invoice.payment_succeeded")) + { + if(!(parsedEvent.Data.Object is Invoice invoice)) + { + throw new Exception("Invoice is null. " + parsedEvent.Id); + } + + if(invoice.Paid && invoice.BillingReason == "subscription_create") + { + var subscriptionService = new SubscriptionService(); + var subscription = await subscriptionService.GetAsync(invoice.SubscriptionId); + if(subscription?.Status == "active") + { + var ids = GetIdsFromMetaData(subscription.Metadata); + // org + if(ids.Item1.HasValue) + { + if(subscription.Items.Any(i => StaticStore.Plans.Any(p => p.StripePlanId == i.Plan.Id))) + { + await _organizationService.EnableAsync(ids.Item1.Value, subscription.CurrentPeriodEnd); + } + } + // user + else if(ids.Item2.HasValue) + { + if(subscription.Items.Any(i => i.Plan.Id == "premium-annually")) + { + await _userService.EnablePremiumAsync(ids.Item2.Value, subscription.CurrentPeriodEnd); + } + } + } + } + } else if(parsedEvent.Type.Equals("invoice.payment_failed")) { if(!(parsedEvent.Data.Object is Invoice invoice)) diff --git a/src/Core/Models/Api/Response/PaymentResponseModel.cs b/src/Core/Models/Api/Response/PaymentResponseModel.cs new file mode 100644 index 0000000000..d701e108b0 --- /dev/null +++ b/src/Core/Models/Api/Response/PaymentResponseModel.cs @@ -0,0 +1,13 @@ +namespace Bit.Core.Models.Api +{ + public class PaymentResponseModel : ResponseModel + { + public PaymentResponseModel() + : base("payment") + { } + + public ProfileResponseModel UserProfile { get; set; } + public string PaymentIntentClientSecret { get; set; } + public bool Success { get; set; } + } +} diff --git a/src/Core/Services/IOrganizationService.cs b/src/Core/Services/IOrganizationService.cs index 3e4180c0eb..ac63a19401 100644 --- a/src/Core/Services/IOrganizationService.cs +++ b/src/Core/Services/IOrganizationService.cs @@ -13,7 +13,7 @@ namespace Bit.Core.Services Task ReplacePaymentMethodAsync(Guid organizationId, string paymentToken, PaymentMethodType paymentMethodType); Task CancelSubscriptionAsync(Guid organizationId, bool? endOfPeriod = null); Task ReinstateSubscriptionAsync(Guid organizationId); - Task UpgradePlanAsync(Guid organizationId, OrganizationUpgrade upgrade); + Task> UpgradePlanAsync(Guid organizationId, OrganizationUpgrade upgrade); Task AdjustStorageAsync(Guid organizationId, short storageAdjustmentGb); Task AdjustSeatsAsync(Guid organizationId, int seatAdjustment); Task VerifyBankAsync(Guid organizationId, int amount1, int amount2); @@ -22,6 +22,7 @@ namespace Bit.Core.Services string ownerKey, string collectionName); Task UpdateLicenseAsync(Guid organizationId, OrganizationLicense license); Task DeleteAsync(Organization organization); + Task EnableAsync(Guid organizationId, DateTime? expirationDate); Task DisableAsync(Guid organizationId, DateTime? expirationDate); Task UpdateExpirationDateAsync(Guid organizationId, DateTime? expirationDate); Task EnableAsync(Guid organizationId); diff --git a/src/Core/Services/IPaymentService.cs b/src/Core/Services/IPaymentService.cs index a07b6bba46..11e7af3d3a 100644 --- a/src/Core/Services/IPaymentService.cs +++ b/src/Core/Services/IPaymentService.cs @@ -10,9 +10,9 @@ namespace Bit.Core.Services Task CancelAndRecoverChargesAsync(ISubscriber subscriber); Task PurchaseOrganizationAsync(Organization org, PaymentMethodType paymentMethodType, string paymentToken, Models.StaticStore.Plan plan, short additionalStorageGb, short additionalSeats, bool premiumAccessAddon); - Task UpgradeFreeOrganizationAsync(Organization org, Models.StaticStore.Plan plan, + Task UpgradeFreeOrganizationAsync(Organization org, Models.StaticStore.Plan plan, short additionalStorageGb, short additionalSeats, bool premiumAccessAddon); - Task PurchasePremiumAsync(User user, PaymentMethodType paymentMethodType, string paymentToken, + Task PurchasePremiumAsync(User user, PaymentMethodType paymentMethodType, string paymentToken, short additionalStorageGb); Task AdjustStorageAsync(IStorableSubscriber storableSubscriber, int additionalStorage, string storagePlanId); Task CancelSubscriptionAsync(ISubscriber subscriber, bool endOfPeriod = false); diff --git a/src/Core/Services/IUserService.cs b/src/Core/Services/IUserService.cs index a585374c3f..cf0a273838 100644 --- a/src/Core/Services/IUserService.cs +++ b/src/Core/Services/IUserService.cs @@ -43,13 +43,15 @@ namespace Bit.Core.Services Task DeleteAsync(User user); Task DeleteAsync(User user, string token); Task SendDeleteConfirmationAsync(string email); - Task SignUpPremiumAsync(User user, string paymentToken, PaymentMethodType paymentMethodType, - short additionalStorageGb, UserLicense license); + Task> SignUpPremiumAsync(User user, string paymentToken, + PaymentMethodType paymentMethodType, short additionalStorageGb, UserLicense license); Task UpdateLicenseAsync(User user, UserLicense license); Task AdjustStorageAsync(User user, short storageAdjustmentGb); Task ReplacePaymentMethodAsync(User user, string paymentToken, PaymentMethodType paymentMethodType); Task CancelPremiumAsync(User user, bool? endOfPeriod = null); Task ReinstatePremiumAsync(User user); + Task EnablePremiumAsync(Guid userId, DateTime? expirationDate); + Task EnablePremiumAsync(User user, DateTime? expirationDate); Task DisablePremiumAsync(Guid userId, DateTime? expirationDate); Task DisablePremiumAsync(User user, DateTime? expirationDate); Task UpdatePremiumExpirationAsync(Guid userId, DateTime? expirationDate); diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 289974f187..f952f15c61 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -117,7 +117,7 @@ namespace Bit.Core.Services await _paymentService.ReinstateSubscriptionAsync(organization); } - public async Task UpgradePlanAsync(Guid organizationId, OrganizationUpgrade upgrade) + public async Task> UpgradePlanAsync(Guid organizationId, OrganizationUpgrade upgrade) { var organization = await GetOrgById(organizationId); if(organization == null) @@ -195,10 +195,13 @@ namespace Bit.Core.Services // TODO: Check storage? + string paymentIntentClientSecret = null; + var success = true; if(string.IsNullOrWhiteSpace(organization.GatewaySubscriptionId)) { - await _paymentService.UpgradeFreeOrganizationAsync(organization, newPlan, + paymentIntentClientSecret = await _paymentService.UpgradeFreeOrganizationAsync(organization, newPlan, upgrade.AdditionalStorageGb, upgrade.AdditionalSeats, upgrade.PremiumAccessAddon); + success = string.IsNullOrWhiteSpace(paymentIntentClientSecret); } else { @@ -221,9 +224,10 @@ namespace Bit.Core.Services organization.SelfHost = newPlan.SelfHost; organization.UsersGetPremium = newPlan.UsersGetPremium || upgrade.PremiumAccessAddon; organization.Plan = newPlan.Name; - organization.Enabled = true; - organization.RevisionDate = DateTime.UtcNow; + organization.Enabled = success; await ReplaceAndUpdateCache(organization); + + return new Tuple(success, paymentIntentClientSecret); } public async Task AdjustStorageAsync(Guid organizationId, short storageAdjustmentGb) @@ -710,6 +714,18 @@ namespace Bit.Core.Services await _applicationCacheService.DeleteOrganizationAbilityAsync(organization.Id); } + public async Task EnableAsync(Guid organizationId, DateTime? expirationDate) + { + var org = await GetOrgById(organizationId); + if(org != null && !org.Enabled) + { + org.Enabled = true; + org.ExpirationDate = expirationDate; + org.RevisionDate = DateTime.UtcNow; + await ReplaceAndUpdateCache(org); + } + } + public async Task DisableAsync(Guid organizationId, DateTime? expirationDate) { var org = await GetOrgById(organizationId); diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs index 61b4887dbd..fed1dbc622 100644 --- a/src/Core/Services/Implementations/StripePaymentService.cs +++ b/src/Core/Services/Implementations/StripePaymentService.cs @@ -161,7 +161,7 @@ namespace Bit.Core.Services org.ExpirationDate = subscription.CurrentPeriodEnd; } - public async Task UpgradeFreeOrganizationAsync(Organization org, Models.StaticStore.Plan plan, + public async Task UpgradeFreeOrganizationAsync(Organization org, Models.StaticStore.Plan plan, short additionalStorageGb, short additionalSeats, bool premiumAccessAddon) { if(!string.IsNullOrWhiteSpace(org.GatewaySubscriptionId)) @@ -231,28 +231,53 @@ namespace Bit.Core.Services { paymentMethodType = PaymentMethodType.PayPal; } - if(!hasBtCustomerId && customer.DefaultSource != null) + else { - if(customer.DefaultSource is Card || customer.DefaultSource is SourceCard) + if(customer.DefaultSource != null) { - paymentMethodType = PaymentMethodType.Card; - stripePaymentMethod = true; + if(customer.DefaultSource is Card || customer.DefaultSource is SourceCard) + { + paymentMethodType = PaymentMethodType.Card; + stripePaymentMethod = true; + } + else if(customer.DefaultSource is BankAccount || customer.DefaultSource is SourceAchDebit) + { + paymentMethodType = PaymentMethodType.BankAccount; + stripePaymentMethod = true; + } } - else if(customer.DefaultSource is BankAccount || customer.DefaultSource is SourceAchDebit) + else { - paymentMethodType = PaymentMethodType.BankAccount; - stripePaymentMethod = true; + var paymentMethod = GetDefaultCardPaymentMethod(customer.Id); + if(paymentMethod != null) + { + paymentMethodType = PaymentMethodType.Card; + stripePaymentMethod = true; + subCreateOptions.DefaultPaymentMethodId = paymentMethod.Id; + } } } var subscription = await ChargeForNewSubscriptionAsync(org, customer, false, stripePaymentMethod, paymentMethodType, subCreateOptions, null); org.GatewaySubscriptionId = subscription.Id; - org.ExpirationDate = subscription.CurrentPeriodEnd; + + if(subscription.Status == "incomplete" && + subscription.LatestInvoice?.PaymentIntent?.Status == "requires_action") + { + org.Enabled = false; + return subscription.LatestInvoice.PaymentIntent.ClientSecret; + } + else + { + org.Enabled = true; + org.ExpirationDate = subscription.CurrentPeriodEnd; + return null; + } } - public async Task PurchasePremiumAsync(User user, PaymentMethodType paymentMethodType, string paymentToken, - short additionalStorageGb) + public async Task PurchasePremiumAsync(User user, PaymentMethodType paymentMethodType, + string paymentToken, short additionalStorageGb) { if(paymentMethodType != PaymentMethodType.Credit && string.IsNullOrWhiteSpace(paymentToken)) { @@ -384,8 +409,18 @@ namespace Bit.Core.Services user.Gateway = GatewayType.Stripe; user.GatewayCustomerId = customer.Id; user.GatewaySubscriptionId = subscription.Id; - user.Premium = true; - user.PremiumExpirationDate = subscription.CurrentPeriodEnd; + + if(subscription.Status == "incomplete" && + subscription.LatestInvoice?.PaymentIntent?.Status == "requires_action") + { + return subscription.LatestInvoice.PaymentIntent.ClientSecret; + } + else + { + user.Premium = true; + user.PremiumExpirationDate = subscription.CurrentPeriodEnd; + return null; + } } private async Task ChargeForNewSubscriptionAsync(ISubscriber subcriber, Customer customer, @@ -481,10 +516,6 @@ namespace Bit.Core.Services await subscriptionService.CancelAsync(subscription.Id, new SubscriptionCancelOptions()); throw new GatewayException("Payment method failed."); } - else if(subscription.LatestInvoice.PaymentIntent.Status == "requires_action") - { - // Needs SCA. Send email? Should be handled by Stripe. - } } if(!stripePaymentMethod && subInvoiceMetadata.Any()) @@ -1237,10 +1268,7 @@ namespace Bit.Core.Services } if(billingInfo.PaymentSource == null) { - var paymentMethodService = new PaymentMethodService(); - var cardPaymentMethods = paymentMethodService.ListAutoPaging( - new PaymentMethodListOptions { CustomerId = customer.Id, Type = "card" }); - var paymentMethod = cardPaymentMethods.OrderByDescending(m => m.Created).FirstOrDefault(); + var paymentMethod = GetDefaultCardPaymentMethod(customer.Id); if(paymentMethod != null) { billingInfo.PaymentSource = new BillingInfo.BillingSource(paymentMethod); @@ -1292,5 +1320,13 @@ namespace Bit.Core.Services return subscriptionInfo; } + + private PaymentMethod GetDefaultCardPaymentMethod(string customerId) + { + var paymentMethodService = new PaymentMethodService(); + var cardPaymentMethods = paymentMethodService.ListAutoPaging( + new PaymentMethodListOptions { CustomerId = customerId, Type = "card" }); + return cardPaymentMethods.OrderByDescending(m => m.Created).FirstOrDefault(); + } } } diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs index cccf40c2ec..922f1e7870 100644 --- a/src/Core/Services/Implementations/UserService.cs +++ b/src/Core/Services/Implementations/UserService.cs @@ -679,8 +679,8 @@ namespace Bit.Core.Services return true; } - public async Task SignUpPremiumAsync(User user, string paymentToken, PaymentMethodType paymentMethodType, - short additionalStorageGb, UserLicense license) + public async Task> SignUpPremiumAsync(User user, string paymentToken, + PaymentMethodType paymentMethodType, short additionalStorageGb, UserLicense license) { if(user.Premium) { @@ -692,6 +692,7 @@ namespace Bit.Core.Services throw new BadRequestException("You can't subtract storage!"); } + string paymentIntentClientSecret = null; IPaymentService paymentService = null; if(_globalSettings.SelfHosted) { @@ -711,7 +712,8 @@ namespace Bit.Core.Services } else { - await _paymentService.PurchasePremiumAsync(user, paymentMethodType, paymentToken, additionalStorageGb); + paymentIntentClientSecret = await _paymentService.PurchasePremiumAsync(user, paymentMethodType, + paymentToken, additionalStorageGb); } user.Premium = true; @@ -739,6 +741,8 @@ namespace Bit.Core.Services await paymentService.CancelAndRecoverChargesAsync(user); throw; } + return new Tuple(string.IsNullOrWhiteSpace(paymentIntentClientSecret), + paymentIntentClientSecret); } public async Task UpdateLicenseAsync(User user, UserLicense license) @@ -816,6 +820,23 @@ namespace Bit.Core.Services await _paymentService.ReinstateSubscriptionAsync(user); } + public async Task EnablePremiumAsync(Guid userId, DateTime? expirationDate) + { + var user = await _userRepository.GetByIdAsync(userId); + await EnablePremiumAsync(user, expirationDate); + } + + public async Task EnablePremiumAsync(User user, DateTime? expirationDate) + { + if(user != null && !user.Premium) + { + user.Premium = true; + user.PremiumExpirationDate = expirationDate; + user.RevisionDate = DateTime.UtcNow; + await _userRepository.ReplaceAsync(user); + } + } + public async Task DisablePremiumAsync(Guid userId, DateTime? expirationDate) { var user = await _userRepository.GetByIdAsync(userId);