[BEEEP][PM-16921] Improve validation tax information when subscribing to pre…

src/Api/Auth/Controllers/AccountsController.cs

@@ -666,7 +666,11 @@
             new TaxInfo
             {
                 BillingAddressCountry = model.Country,
-                BillingAddressPostalCode = model.PostalCode
+                BillingAddressPostalCode = model.PostalCode,
+                BillingAddressCity = model.City,
+                BillingAddressLine1 = model.Line1,
+                BillingAddressLine2 = model.Line2,
+                BillingAddressState = model.State,
             });
 
         var userTwoFactorEnabled = await _userService.TwoFactorIsEnabledAsync(user);
@@ -726,8 +730,7 @@
                 BillingAddressCity = model.City,
                 BillingAddressState = model.State,
                 BillingAddressCountry = model.Country,
-                BillingAddressPostalCode = model.PostalCode,
-                TaxIdNumber = model.TaxId
+                BillingAddressPostalCode = model.PostalCode
             });
     }
 

src/Api/Models/Request/Accounts/PremiumRequestModel.cs

@@ -12,9 +12,19 @@
     [Range(0, 99)]
     public short? AdditionalStorageGb { get; set; }
     public IFormFile License { get; set; }
-    public string Country { get; set; }
+
+    public string Line1 { get; set; }
+    public string Line2 { get; set; }
+
+    [Required]
     public string PostalCode { get; set; }
 
+    public string City { get; set; }
+    public string State { get; set; }
+
+    [Required]
+    public string Country { get; set; }
+
     public bool Validate(GlobalSettings globalSettings)
     {
         if (!(License == null && !globalSettings.SelfHosted) ||
@@ -32,10 +42,5 @@
         {
             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) });
-        }
     }
 }

src/Core/Services/Implementations/StripePaymentService.cs

@@ -1394,15 +1394,9 @@
 
         try
         {
-            if (!string.IsNullOrWhiteSpace(taxInfo.TaxIdNumber))
-            {
-                taxInfo.TaxIdType = taxInfo.TaxIdType ??
-                                    _taxService.GetStripeTaxCode(taxInfo.BillingAddressCountry, taxInfo.TaxIdNumber);
-            }
-
             if (customer == null)
             {
-                customer = await _stripeAdapter.CustomerCreateAsync(new CustomerCreateOptions
+                var customerCreateOptions = new CustomerCreateOptions
                 {
                     Description = subscriber.BillingName(),
                     Email = subscriber.BillingEmailAddress(),
@@ -1422,26 +1416,32 @@
 
                         ]
                     },
-                    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
-                    },
-                    TaxIdData = string.IsNullOrWhiteSpace(taxInfo.TaxIdNumber)
-                    ? []
-                    : [
-                        new CustomerTaxIdDataOptions
+                    Address = taxInfo == null
+                        ? null
+                        : new AddressOptions
                         {
-                            Type = taxInfo.TaxIdType,
-                            Value = taxInfo.TaxIdNumber
-                        }
-                    ],
+                            Country = taxInfo.BillingAddressCountry,
+                            PostalCode = taxInfo.BillingAddressPostalCode,
+                            Line1 = taxInfo.BillingAddressLine1 ?? string.Empty,
+                            Line2 = taxInfo.BillingAddressLine2,
+                            City = taxInfo.BillingAddressCity,
+                            State = taxInfo.BillingAddressState
+                        },
                     Expand = ["sources", "tax", "subscriptions"],
-                });
+                };
+
+                if (!string.IsNullOrWhiteSpace(taxInfo.TaxIdNumber))
+                {
+                    taxInfo.TaxIdType = taxInfo.TaxIdType ??
+                                        _taxService.GetStripeTaxCode(taxInfo.BillingAddressCountry, taxInfo.TaxIdNumber);
+
+                    customerCreateOptions.TaxIdData =
+                    [
+                        new CustomerTaxIdDataOptions { Type = taxInfo.TaxIdType, Value = taxInfo.TaxIdNumber }
+                    ];
+                }
+
+                customer = await _stripeAdapter.CustomerCreateAsync(customerCreateOptions);
 
                 subscriber.Gateway = GatewayType.Stripe;
                 subscriber.GatewayCustomerId = customer.Id;