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

Replace StripePaymentService with PremiumUserBillingService in ReplacePaymentMethodAsync call (#5350)

Browse Source
This commit is contained in:
Alex Morask 2025-01-30 11:55:05 -05:00 committed by GitHub
parent 23dce58103
commit 443a147433
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/Billing/Services/IPremiumUserBillingService.cs
View File

@ -1,4 +1,5 @@
using Bit.Core.Billing.Models.Sales; using Bit.Core.Billing.Models;
using Bit.Core.Billing.Models.Sales;
using Bit.Core.Entities; using Bit.Core.Entities;
namespace Bit.Core.Billing.Services; namespace Bit.Core.Billing.Services;
@ -27,4 +28,9 @@ public interface IPremiumUserBillingService
/// </code> /// </code>
/// </example> /// </example>
Task Finalize(PremiumUserSale sale); Task Finalize(PremiumUserSale sale);
Task UpdatePaymentMethod(
User user,
TokenizedPaymentSource tokenizedPaymentSource,
TaxInformation taxInformation);
} }

23
src/Core/Billing/Services/Implementations/PremiumUserBillingService.cs
View File

@ -1,5 +1,6 @@
using Bit.Core.Billing.Caches; using Bit.Core.Billing.Caches;
using Bit.Core.Billing.Constants; using Bit.Core.Billing.Constants;
using Bit.Core.Billing.Models;
using Bit.Core.Billing.Models.Sales; using Bit.Core.Billing.Models.Sales;
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.Enums; using Bit.Core.Enums;
@ -58,6 +59,28 @@ public class PremiumUserBillingService(
await userRepository.ReplaceAsync(user); await userRepository.ReplaceAsync(user);
} }
public async Task UpdatePaymentMethod(
User user,
TokenizedPaymentSource tokenizedPaymentSource,
TaxInformation taxInformation)
{
if (string.IsNullOrEmpty(user.GatewayCustomerId))
{
var customer = await CreateCustomerAsync(user,
new CustomerSetup { TokenizedPaymentSource = tokenizedPaymentSource, TaxInformation = taxInformation });
user.Gateway = GatewayType.Stripe;
user.GatewayCustomerId = customer.Id;
await userRepository.ReplaceAsync(user);
}
else
{
await subscriberService.UpdatePaymentSource(user, tokenizedPaymentSource);
await subscriberService.UpdateTaxInformation(user, taxInformation);
}
}
private async Task<Customer> CreateCustomerAsync( private async Task<Customer> CreateCustomerAsync(
User user, User user,
CustomerSetup customerSetup) CustomerSetup customerSetup)

11
src/Core/Services/Implementations/UserService.cs
View File

@ -9,6 +9,7 @@ using Bit.Core.AdminConsole.Services;
using Bit.Core.Auth.Enums; using Bit.Core.Auth.Enums;
using Bit.Core.Auth.Models; using Bit.Core.Auth.Models;
using Bit.Core.Auth.Models.Business.Tokenables; using Bit.Core.Auth.Models.Business.Tokenables;
using Bit.Core.Billing.Models;
using Bit.Core.Billing.Models.Sales; using Bit.Core.Billing.Models.Sales;
using Bit.Core.Billing.Services; using Bit.Core.Billing.Services;
using Bit.Core.Context; using Bit.Core.Context;
@ -1044,11 +1045,11 @@ public class UserService : UserManager<User>, IUserService, IDisposable
throw new BadRequestException("Invalid token."); throw new BadRequestException("Invalid token.");
} }
var updated = await _paymentService.UpdatePaymentMethodAsync(user, paymentMethodType, paymentToken, taxInfo: taxInfo); var tokenizedPaymentSource = new TokenizedPaymentSource(paymentMethodType, paymentToken);
if (updated) var taxInformation = TaxInformation.From(taxInfo);
{
await SaveUserAsync(user); await _premiumUserBillingService.UpdatePaymentMethod(user, tokenizedPaymentSource, taxInformation);
} await SaveUserAsync(user);
} }
public async Task CancelPremiumAsync(User user, bool? endOfPeriod = null) public async Task CancelPremiumAsync(User user, bool? endOfPeriod = null)