nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 08:02:49 -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

21
src/Api/Controllers/AccountsController.cs
View File

@ -467,7 +467,8 @@ namespace Bit.Api.Controllers
{
license = await ApiHelpers.ReadJsonFileFromBody<UserLicense>(HttpContext, model.License);
}
else if (!valid && !_globalSettings.SelfHosted)
if (!valid && !_globalSettings.SelfHosted && string.IsNullOrWhiteSpace(model.Country))
{
throw new BadRequestException("Country is required.");
}
@ -479,7 +480,11 @@ namespace Bit.Api.Controllers
var result = await _userService.SignUpPremiumAsync(user, model.PaymentToken,
model.PaymentMethodType.Value, model.AdditionalStorageGb.GetValueOrDefault(0), license,
model.Country, model.PostalCode);
new TaxInfo
{
BillingAddressCountry = model.Country,
BillingAddressPostalCode = model.PostalCode,
});
var profile = new ProfileResponseModel(user, null, await _userService.TwoFactorIsEnabledAsync(user));
return new PaymentResponseModel
{
@ -539,12 +544,12 @@ namespace Bit.Api.Controllers
throw new UnauthorizedAccessException();
}
await _paymentService.SaveTaxInfoAsync(user, new TaxInfo
{
BillingAddressCountry = model.Country,
BillingAddressPostalCode = model.PostalCode,
});
await _userService.ReplacePaymentMethodAsync(user, model.PaymentToken, model.PaymentMethodType.Value);
await _userService.ReplacePaymentMethodAsync(user, model.PaymentToken, model.PaymentMethodType.Value,
new TaxInfo
{
BillingAddressCountry = model.Country,
BillingAddressPostalCode = model.PostalCode,
});
}
[HttpPost("storage")]