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

null checked Stripe.Customer.Address for org seat and storage upgrades (#1099)

Browse Source
This commit is contained in:
Addison Beck 2021-01-20 12:40:45 -05:00 committed by GitHub
parent fe4c36c04a
commit 001bbf2f2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,6 +415,9 @@ namespace Bit.Core.Services
}; };
var customer = await new CustomerService().GetAsync(sub.CustomerId); var customer = await new CustomerService().GetAsync(sub.CustomerId);
if (!string.IsNullOrWhiteSpace(customer?.Address?.Country)
&& !string.IsNullOrWhiteSpace(customer?.Address?.PostalCode))
{
var taxRates = await _taxRateRepository.GetByLocationAsync( var taxRates = await _taxRateRepository.GetByLocationAsync(
new Bit.Core.Models.Table.TaxRate() new Bit.Core.Models.Table.TaxRate()
{ {
@ -430,6 +433,7 @@ namespace Bit.Core.Services
taxRate.Id taxRate.Id
}; };
} }
}
var subResponse = await subscriptionService.UpdateAsync(sub.Id, subUpdateOptions); var subResponse = await subscriptionService.UpdateAsync(sub.Id, subUpdateOptions);

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

@ -719,6 +719,9 @@ namespace Bit.Core.Services
}; };
var customer = await new CustomerService().GetAsync(sub.CustomerId); var customer = await new CustomerService().GetAsync(sub.CustomerId);
if (!string.IsNullOrWhiteSpace(customer?.Address?.Country)
&& !string.IsNullOrWhiteSpace(customer?.Address?.PostalCode))
{
var taxRates = await _taxRateRepository.GetByLocationAsync( var taxRates = await _taxRateRepository.GetByLocationAsync(
new Bit.Core.Models.Table.TaxRate() new Bit.Core.Models.Table.TaxRate()
{ {
@ -734,6 +737,7 @@ namespace Bit.Core.Services
taxRate.Id taxRate.Id
}; };
} }
}
var subResponse = await subscriptionService.UpdateAsync(sub.Id, subUpdateOptions); var subResponse = await subscriptionService.UpdateAsync(sub.Id, subUpdateOptions);