nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 09:32:48 -05:00
Code Activity

Consistency on TaxInfo use in service params

Browse Source
This commit is contained in:
Chad Scharf
2020-06-18 10:41:55 -04:00
parent 1b027cab59
commit 0f28ac45f9
5 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Core/Services/Implementations/StripePaymentService.cs
View File

@ -345,7 +345,7 @@ namespace Bit.Core.Services
}
public async Task<string> PurchasePremiumAsync(User user, PaymentMethodType paymentMethodType,
string paymentToken, short additionalStorageGb, string country, string postalCode)
string paymentToken, short additionalStorageGb, TaxInfo taxInfo)
{
if (paymentMethodType != PaymentMethodType.Credit && string.IsNullOrWhiteSpace(paymentToken))
{
@ -393,7 +393,7 @@ namespace Bit.Core.Services
{
try
{
await UpdatePaymentMethodAsync(user, paymentMethodType, paymentToken, true);
await UpdatePaymentMethodAsync(user, paymentMethodType, paymentToken, true, taxInfo);
}
catch (Exception e)
{
@ -467,24 +467,12 @@ namespace Bit.Core.Services
Address = new AddressOptions
{
Line1 = string.Empty,
Country = country,
PostalCode = postalCode,
Country = taxInfo.BillingAddressCountry,
PostalCode = taxInfo.BillingAddressPostalCode,
},
});
createdStripeCustomer = true;
}
else if (customer != null)
{
await customerService.UpdateAsync(customer.Id, new CustomerUpdateOptions
{
Address = new AddressOptions
{
Line1 = string.Empty,
Country = country,
PostalCode = postalCode,
}
});
}
if (customer == null)
{
@ -1116,7 +1104,7 @@ namespace Bit.Core.Services
}
public async Task<bool> UpdatePaymentMethodAsync(ISubscriber subscriber, PaymentMethodType paymentMethodType,
string paymentToken, bool allowInAppPurchases = false)
string paymentToken, bool allowInAppPurchases = false, TaxInfo taxInfo = null)
{
if (subscriber == null)
{
@ -1304,7 +1292,16 @@ namespace Bit.Core.Services
InvoiceSettings = new CustomerInvoiceSettingsOptions
{
DefaultPaymentMethod = stipeCustomerPaymentMethodId
}
},
Address = taxInfo == null ? null : new AddressOptions
{
Country = taxInfo.BillingAddressCountry,
PostalCode = taxInfo.BillingAddressPostalCode,
Line1 = taxInfo.BillingAddressLine1 ?? string.Empty,
Line2 = taxInfo.BillingAddressLine2,
City = taxInfo.BillingAddressCity,
State = taxInfo.BillingAddressState,
},
});
subscriber.Gateway = GatewayType.Stripe;
@ -1363,7 +1360,16 @@ namespace Bit.Core.Services
InvoiceSettings = new CustomerInvoiceSettingsOptions
{
DefaultPaymentMethod = defaultPaymentMethodId
}
},
Address = taxInfo == null ? null : new AddressOptions
{
Country = taxInfo.BillingAddressCountry,
PostalCode = taxInfo.BillingAddressPostalCode,
Line1 = taxInfo.BillingAddressLine1 ?? string.Empty,
Line2 = taxInfo.BillingAddressLine2,
City = taxInfo.BillingAddressCity,
State = taxInfo.BillingAddressState,
},
});
}
}

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

@ -704,7 +704,7 @@ namespace Bit.Core.Services
public async Task<Tuple<bool, string>> SignUpPremiumAsync(User user, string paymentToken,
PaymentMethodType paymentMethodType, short additionalStorageGb, UserLicense license,
string country, string postalCode)
TaxInfo taxInfo)
{
if (user.Premium)
{
@ -743,7 +743,7 @@ namespace Bit.Core.Services
else
{
paymentIntentClientSecret = await _paymentService.PurchasePremiumAsync(user, paymentMethodType,
paymentToken, additionalStorageGb, country, postalCode);
paymentToken, additionalStorageGb, taxInfo);
}
user.Premium = true;
@ -845,14 +845,14 @@ namespace Bit.Core.Services
return secret;
}
public async Task ReplacePaymentMethodAsync(User user, string paymentToken, PaymentMethodType paymentMethodType)
public async Task ReplacePaymentMethodAsync(User user, string paymentToken, PaymentMethodType paymentMethodType, TaxInfo taxInfo)
{
if (paymentToken.StartsWith("btok_"))
{
throw new BadRequestException("Invalid token.");
}
var updated = await _paymentService.UpdatePaymentMethodAsync(user, paymentMethodType, paymentToken);
var updated = await _paymentService.UpdatePaymentMethodAsync(user, paymentMethodType, paymentToken, taxInfo: taxInfo);
if (updated)
{
await SaveUserAsync(user);