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

API updates for tax info collection

Browse Source
This commit is contained in:
Chad Scharf
2020-06-08 17:40:18 -04:00
parent cad7cf0200
commit d88838f19e
11 changed files with 411 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Core/Models/Api/Request/Accounts/TaxInfoUpdateRequestModel.cs Normal file
View File

@ -0,0 +1,21 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Bit.Core.Models.Api
{
public class TaxInfoUpdateRequestModel : IValidatableObject
{
[Required]
public string Country { get; set; }
public string PostalCode { get; set; }
public virtual IEnumerable<ValidationResult> Validate (ValidationContext validationContext)
{
if (Country == "US" && string.IsNullOrWhiteSpace(PostalCode))
{
yield return new ValidationResult("Zip / postal code is required.",
new string[] { nameof(PostalCode) });
}
}
}
}

32
src/Core/Models/Api/Request/Organizations/OrganizationCreateRequestModel.cs
View File

@ -31,6 +31,15 @@ namespace Bit.Core.Models.Api
[EncryptedString]
[EncryptedStringLength(1000)]
public string CollectionName { get; set; }
public string TaxIdNumber { get; set; }
public string BillingAddressLine1 { get; set; }
public string BillingAddressLine2 { get; set; }
public string BillingAddressCity { get; set; }
public string BillingAddressState { get; set; }
public string BillingAddressPostalCode { get; set; }
[Required]
[StringLength(2)]
public string BillingAddressCountry { get; set; }
public virtual OrganizationSignup ToOrganizationSignup(User user)
{
@ -47,7 +56,17 @@ namespace Bit.Core.Models.Api
PremiumAccessAddon = PremiumAccessAddon,
BillingEmail = BillingEmail,
BusinessName = BusinessName,
CollectionName = CollectionName
CollectionName = CollectionName,
TaxInfo = new TaxInfo
{
TaxIdNumber = TaxIdNumber,
BillingAddressLine1 = BillingAddressLine1,
BillingAddressLine2 = BillingAddressLine2,
BillingAddressCity = BillingAddressCity,
BillingAddressState = BillingAddressState,
BillingAddressPostalCode = BillingAddressPostalCode,
BillingAddressCountry = BillingAddressCountry,
},
};
}
@ -62,6 +81,17 @@ namespace Bit.Core.Models.Api
yield return new ValidationResult("Payment method type required.",
new string[] { nameof(PaymentMethodType) });
}
if (PlanType != PlanType.Free && string.IsNullOrWhiteSpace(BillingAddressCountry))
{
yield return new ValidationResult("Country required.",
new string[] { nameof(BillingAddressCountry) });
}
if (PlanType != PlanType.Free && BillingAddressCountry == "US" &&
string.IsNullOrWhiteSpace(BillingAddressPostalCode))
{
yield return new ValidationResult("Zip / postal code is required.",
new string[] { nameof(BillingAddressPostalCode) });
}
}
}
}

11
src/Core/Models/Api/Request/Organizations/OrganizationTaxInfoUpdateRequestModel.cs Normal file
View File

@ -0,0 +1,11 @@
namespace Bit.Core.Models.Api
{
public class OrganizationTaxInfoUpdateRequestModel : TaxInfoUpdateRequestModel
{
public string TaxId { get; set; }
public string Line1 { get; set; }
public string Line2 { get; set; }
public string City { get; set; }
public string State { get; set; }
}
}

34
src/Core/Models/Api/Response/TaxInfoResponseModel.cs Normal file
View File

@ -0,0 +1,34 @@
using Bit.Core.Models.Business;
namespace Bit.Core.Models.Api
{
public class TaxInfoResponseModel
{
public TaxInfoResponseModel () { }
public TaxInfoResponseModel(TaxInfo taxInfo)
{
if (taxInfo == null)
{
return;
}
TaxIdNumber = taxInfo.TaxIdNumber;
TaxIdType = taxInfo.TaxIdType;
Line1 = taxInfo.BillingAddressLine1;
Line2 = taxInfo.BillingAddressLine2;
City = taxInfo.BillingAddressCity;
State = taxInfo.BillingAddressState;
PostalCode = taxInfo.BillingAddressPostalCode;
Country = taxInfo.BillingAddressCountry;
}
public string TaxIdNumber { get; set; }
public string TaxIdType { get; set; }
public string Line1 { get; set; }
public string Line2 { get; set; }
public string City { get; set; }
public string State { get; set; }
public string PostalCode { get; set; }
public string Country { get; set; }
}
}

1
src/Core/Models/Business/OrganizationSignup.cs
View File

@ -12,5 +12,6 @@ namespace Bit.Core.Models.Business
public string CollectionName { get; set; }
public PaymentMethodType? PaymentMethodType { get; set; }
public string PaymentToken { get; set; }
public TaxInfo TaxInfo { get; set; }
}
}

140
src/Core/Models/Business/TaxInfo.cs Normal file
View File

@ -0,0 +1,140 @@
namespace Bit.Core.Models.Business
{
public class TaxInfo
{
private string _taxIdNumber = null;
private string _taxIdType = null;
public string TaxIdNumber
{
get => _taxIdNumber;
set
{
_taxIdNumber = value;
_taxIdType = null;
}
}
public string BillingAddressLine1 { get; set; }
public string BillingAddressLine2 { get; set; }
public string BillingAddressCity { get; set; }
public string BillingAddressState { get; set; }
public string BillingAddressPostalCode { get; set; }
public string BillingAddressCountry { get; set; } = "US";
public string TaxIdType
{
get
{
if (string.IsNullOrWhiteSpace(BillingAddressCountry) ||
string.IsNullOrWhiteSpace(TaxIdNumber))
return null;
if (!string.IsNullOrWhiteSpace(_taxIdType))
return _taxIdType;
switch (BillingAddressCountry)
{
case "AE":
_taxIdType = "ae_trn";
break;
case "AU":
_taxIdType = "au_abn";
break;
case "BR":
_taxIdType = "br_cnpj";
break;
case "CA":
// May break for those in Québec given the assumption of QST
if (BillingAddressState?.Contains("bec") ?? false)
_taxIdType = "ca_qst";
_taxIdType = "ca_bn";
break;
case "CL":
_taxIdType = "cl_tin";
break;
case "AT":
case "BE":
case "BG":
case "CY":
case "CZ":
case "DE":
case "DK":
case "EE":
case "ES":
case "FI":
case "FR":
case "GB":
case "GR":
case "HR":
case "HU":
case "IE":
case "IT":
case "LT":
case "LU":
case "LV":
case "MT":
case "NL":
case "PL":
case "PT":
case "RO":
case "SE":
case "SI":
case "SK":
_taxIdType = "eu_vat";
break;
case "HK":
_taxIdType = "hk_br";
break;
case "IN":
_taxIdType = "in_gst";
break;
case "JP":
_taxIdType = "jp_cn";
break;
case "KR":
_taxIdType = "kr_brn";
break;
case "LI":
_taxIdType = "li_uid";
break;
case "MX":
_taxIdType = "mx_rfc";
break;
case "MY":
_taxIdType = "my_sst";
break;
case "NO":
_taxIdType = "no_vat";
break;
case "NZ":
_taxIdType = "nz_gst";
break;
case "RU":
_taxIdType = "ru_inn";
break;
case "SA":
_taxIdType = "sa_vat";
break;
case "SG":
_taxIdType = "sg_gst";
break;
case "TH":
_taxIdType = "th_vat";
break;
case "TW":
_taxIdType = "tw_vat";
break;
case "US":
_taxIdType = "us_ein";
break;
case "ZA":
_taxIdType = "za_vat";
break;
default:
_taxIdType = null;
break;
}
return _taxIdType;
}
}
}
}