bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-14 23:33:41 +00:00
Code Issues Releases Wiki Activity

add support for passing payment method type

Browse Source
This commit is contained in:
Kyle Spearrin
2019-02-19 17:13:21 -05:00
parent de85dbc67c
commit a9336a0e02
12 changed files with 91 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/Core/Services/Implementations/OrganizationService.cs
View File

@@ -71,7 +71,8 @@ namespace Bit.Core.Services
_globalSettings = globalSettings;
}
public async Task ReplacePaymentMethodAsync(Guid organizationId, string paymentToken)
public async Task ReplacePaymentMethodAsync(Guid organizationId, string paymentToken,
PaymentMethodType? paymentMethodType)
{
var organization = await GetOrgById(organizationId);
if(organization == null)
@@ -79,22 +80,24 @@ namespace Bit.Core.Services
throw new NotFoundException();
}
PaymentMethodType paymentMethodType;
if(paymentToken.StartsWith("btok_"))
if(!paymentMethodType.HasValue)
{
paymentMethodType = PaymentMethodType.BankAccount;
}
else if(paymentToken.StartsWith("tok_"))
{
paymentMethodType = PaymentMethodType.Card;
}
else
{
paymentMethodType = PaymentMethodType.PayPal;
if(paymentToken.StartsWith("tok_"))
{
paymentMethodType = PaymentMethodType.Card;
}
else if(paymentToken.StartsWith("btok_"))
{
paymentMethodType = PaymentMethodType.BankAccount;
}
else
{
paymentMethodType = PaymentMethodType.PayPal;
}
}
var updated = await _paymentService.UpdatePaymentMethodAsync(organization,
paymentMethodType, paymentToken);
paymentMethodType.Value, paymentToken);
if(updated)
{
await ReplaceAndUpdateCache(organization);
@@ -547,21 +550,23 @@ namespace Bit.Core.Services
}
else
{
PaymentMethodType paymentMethodType;
if(signup.PaymentToken.StartsWith("btok_"))
if(!signup.PaymentMethodType.HasValue)
{
paymentMethodType = PaymentMethodType.BankAccount;
}
else if(signup.PaymentToken.StartsWith("tok_"))
{
paymentMethodType = PaymentMethodType.Card;
}
else
{
paymentMethodType = PaymentMethodType.PayPal;
if(signup.PaymentToken.StartsWith("btok_"))
{
signup.PaymentMethodType = PaymentMethodType.BankAccount;
}
else if(signup.PaymentToken.StartsWith("tok_"))
{
signup.PaymentMethodType = PaymentMethodType.Card;
}
else
{
signup.PaymentMethodType = PaymentMethodType.PayPal;
}
}
await _paymentService.PurchaseOrganizationAsync(organization, paymentMethodType,
await _paymentService.PurchaseOrganizationAsync(organization, signup.PaymentMethodType.Value,
signup.PaymentToken, plan, signup.AdditionalStorageGb, signup.AdditionalSeats,
signup.PremiumAccessAddon);
}
@@ -1205,7 +1210,7 @@ namespace Bit.Core.Services
{
throw new BadRequestException("Invalid installation id");
}
var subInfo = await _paymentService.GetSubscriptionAsync(organization);
return new OrganizationLicense(organization, subInfo, installationId, _licensingService);
}