diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs index f3457cc176..168af1a4a1 100644 --- a/src/Api/Controllers/AccountsController.cs +++ b/src/Api/Controllers/AccountsController.cs @@ -467,6 +467,10 @@ namespace Bit.Api.Controllers { license = await ApiHelpers.ReadJsonFileFromBody(HttpContext, model.License); } + else if (!valid && !_globalSettings.SelfHosted) + { + throw new BadRequestException("Country is required."); + } if (!valid || (_globalSettings.SelfHosted && license == null)) { @@ -474,7 +478,8 @@ namespace Bit.Api.Controllers } var result = await _userService.SignUpPremiumAsync(user, model.PaymentToken, - model.PaymentMethodType.Value, model.AdditionalStorageGb.GetValueOrDefault(0), license); + model.PaymentMethodType.Value, model.AdditionalStorageGb.GetValueOrDefault(0), license, + model.Country, model.PostalCode); var profile = new ProfileResponseModel(user, null, await _userService.TwoFactorIsEnabledAsync(user)); return new PaymentResponseModel { @@ -534,6 +539,11 @@ 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); } diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs index a4dcd4c916..d9f2b545fa 100644 --- a/src/Api/Controllers/OrganizationsController.cs +++ b/src/Api/Controllers/OrganizationsController.cs @@ -208,9 +208,18 @@ namespace Bit.Api.Controllers { throw new NotFoundException(); } - + await _organizationService.ReplacePaymentMethodAsync(orgIdGuid, model.PaymentToken, - model.PaymentMethodType.Value); + model.PaymentMethodType.Value, new TaxInfo + { + BillingAddressLine1 = model.Line1, + BillingAddressLine2 = model.Line2, + BillingAddressState = model.State, + BillingAddressCity = model.City, + BillingAddressPostalCode = model.PostalCode, + BillingAddressCountry = model.Country, + TaxIdNumber = model.TaxId, + }); } [HttpPost("{id}/upgrade")] diff --git a/src/Core/Models/Api/Request/Accounts/PremiumRequestModel.cs b/src/Core/Models/Api/Request/Accounts/PremiumRequestModel.cs index 8fd4c6329d..910f56167e 100644 --- a/src/Core/Models/Api/Request/Accounts/PremiumRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/PremiumRequestModel.cs @@ -13,11 +13,17 @@ namespace Bit.Core.Models.Api [Range(0, 99)] public short? AdditionalStorageGb { get; set; } public IFormFile License { get; set; } + public string Country { get; set; } + public string PostalCode { get; set; } public bool Validate(GlobalSettings globalSettings) { - return (License == null && !globalSettings.SelfHosted) || - (License != null && globalSettings.SelfHosted); + if (!(License == null && !globalSettings.SelfHosted) || + (License != null && globalSettings.SelfHosted)) + { + return false; + } + return globalSettings.SelfHosted || !string.IsNullOrWhiteSpace(Country); } public IEnumerable Validate(ValidationContext validationContext) @@ -27,6 +33,11 @@ namespace Bit.Core.Models.Api { yield return new ValidationResult("Payment token or license is required."); } + if (Country == "US" && string.IsNullOrWhiteSpace(PostalCode)) + { + yield return new ValidationResult("Zip / postal code is required.", + new string[] { nameof(PostalCode) }); + } } } } diff --git a/src/Core/Models/Api/Request/PaymentRequestModel.cs b/src/Core/Models/Api/Request/PaymentRequestModel.cs index 7834805779..84b5dc9759 100644 --- a/src/Core/Models/Api/Request/PaymentRequestModel.cs +++ b/src/Core/Models/Api/Request/PaymentRequestModel.cs @@ -3,7 +3,7 @@ using Bit.Core.Enums; namespace Bit.Core.Models.Api { - public class PaymentRequestModel + public class PaymentRequestModel : OrganizationTaxInfoUpdateRequestModel { [Required] public PaymentMethodType? PaymentMethodType { get; set; } diff --git a/src/Core/Services/IOrganizationService.cs b/src/Core/Services/IOrganizationService.cs index 6b3d64027e..dba1bba8e3 100644 --- a/src/Core/Services/IOrganizationService.cs +++ b/src/Core/Services/IOrganizationService.cs @@ -10,7 +10,8 @@ namespace Bit.Core.Services { public interface IOrganizationService { - Task ReplacePaymentMethodAsync(Guid organizationId, string paymentToken, PaymentMethodType paymentMethodType); + Task ReplacePaymentMethodAsync(Guid organizationId, string paymentToken, PaymentMethodType paymentMethodType, + TaxInfo taxInfo); Task CancelSubscriptionAsync(Guid organizationId, bool? endOfPeriod = null); Task ReinstateSubscriptionAsync(Guid organizationId); Task> UpgradePlanAsync(Guid organizationId, OrganizationUpgrade upgrade); diff --git a/src/Core/Services/IPaymentService.cs b/src/Core/Services/IPaymentService.cs index 2bdb8f4e1f..166fb23c6c 100644 --- a/src/Core/Services/IPaymentService.cs +++ b/src/Core/Services/IPaymentService.cs @@ -14,7 +14,7 @@ namespace Bit.Core.Services Task UpgradeFreeOrganizationAsync(Organization org, Models.StaticStore.Plan plan, short additionalStorageGb, short additionalSeats, bool premiumAccessAddon); Task PurchasePremiumAsync(User user, PaymentMethodType paymentMethodType, string paymentToken, - short additionalStorageGb); + short additionalStorageGb, string country, string postalCode); Task AdjustStorageAsync(IStorableSubscriber storableSubscriber, int additionalStorage, string storagePlanId); Task CancelSubscriptionAsync(ISubscriber subscriber, bool endOfPeriod = false, bool skipInAppPurchaseCheck = false); diff --git a/src/Core/Services/IUserService.cs b/src/Core/Services/IUserService.cs index 5f62c4d4a0..5e51183c3e 100644 --- a/src/Core/Services/IUserService.cs +++ b/src/Core/Services/IUserService.cs @@ -46,7 +46,8 @@ namespace Bit.Core.Services Task DeleteAsync(User user, string token); Task SendDeleteConfirmationAsync(string email); Task> SignUpPremiumAsync(User user, string paymentToken, - PaymentMethodType paymentMethodType, short additionalStorageGb, UserLicense license); + PaymentMethodType paymentMethodType, short additionalStorageGb, UserLicense license, + string country, string postalCode); Task IapCheckAsync(User user, PaymentMethodType paymentMethodType); Task UpdateLicenseAsync(User user, UserLicense license); Task AdjustStorageAsync(User user, short storageAdjustmentGb); diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 4fa4388bfa..a0686d4eb8 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -75,7 +75,7 @@ namespace Bit.Core.Services } public async Task ReplacePaymentMethodAsync(Guid organizationId, string paymentToken, - PaymentMethodType paymentMethodType) + PaymentMethodType paymentMethodType, TaxInfo taxInfo) { var organization = await GetOrgById(organizationId); if (organization == null) @@ -83,6 +83,7 @@ namespace Bit.Core.Services throw new NotFoundException(); } + await _paymentService.SaveTaxInfoAsync(organization, taxInfo); var updated = await _paymentService.UpdatePaymentMethodAsync(organization, paymentMethodType, paymentToken); if (updated) diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs index 4e954b50e5..357c8ea83d 100644 --- a/src/Core/Services/Implementations/StripePaymentService.cs +++ b/src/Core/Services/Implementations/StripePaymentService.cs @@ -345,7 +345,7 @@ namespace Bit.Core.Services } public async Task PurchasePremiumAsync(User user, PaymentMethodType paymentMethodType, - string paymentToken, short additionalStorageGb) + string paymentToken, short additionalStorageGb, string country, string postalCode) { if (paymentMethodType != PaymentMethodType.Credit && string.IsNullOrWhiteSpace(paymentToken)) { @@ -463,10 +463,28 @@ namespace Bit.Core.Services InvoiceSettings = new CustomerInvoiceSettingsOptions { DefaultPaymentMethod = stipeCustomerPaymentMethodId - } + }, + Address = new AddressOptions + { + Line1 = string.Empty, + Country = country, + PostalCode = postalCode, + }, }); 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) { diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs index c666b3b18c..0a2a7452f1 100644 --- a/src/Core/Services/Implementations/UserService.cs +++ b/src/Core/Services/Implementations/UserService.cs @@ -703,7 +703,8 @@ namespace Bit.Core.Services } public async Task> SignUpPremiumAsync(User user, string paymentToken, - PaymentMethodType paymentMethodType, short additionalStorageGb, UserLicense license) + PaymentMethodType paymentMethodType, short additionalStorageGb, UserLicense license, + string country, string postalCode) { if (user.Premium) { @@ -742,7 +743,7 @@ namespace Bit.Core.Services else { paymentIntentClientSecret = await _paymentService.PurchasePremiumAsync(user, paymentMethodType, - paymentToken, additionalStorageGb); + paymentToken, additionalStorageGb, country, postalCode); } user.Premium = true;