From 0de108e0518e5b47c6b3204c53deb2b82221dfc6 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Mon, 20 Jan 2025 16:50:11 +0100
Subject: [PATCH] [PM-16682] Fix tax id not being saved for providers (#5257)

---
 .../Commercial.Core/Billing/ProviderBillingService.cs  | 10 ++++------
 src/Core/Models/Business/TaxInfo.cs                    |  6 ------
 .../Services/Implementations/StripePaymentService.cs   |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs b/bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs
index 57349042d1..2b834947af 100644
--- a/bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs
+++ b/bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs
@@ -352,12 +352,10 @@ public class ProviderBillingService(
                 throw new BadRequestException("billingTaxIdTypeInferenceError");
             }
 
-            customerCreateOptions.TaxIdData = taxInfo.HasTaxId
-                ?
-                [
-                    new CustomerTaxIdDataOptions { Type = taxIdType, Value = taxInfo.TaxIdNumber }
-                ]
-                : null;
+            customerCreateOptions.TaxIdData =
+            [
+                new CustomerTaxIdDataOptions { Type = taxIdType, Value = taxInfo.TaxIdNumber }
+            ];
         }
 
         try
diff --git a/src/Core/Models/Business/TaxInfo.cs b/src/Core/Models/Business/TaxInfo.cs
index 82a6ddfc3e..80a63473a7 100644
--- a/src/Core/Models/Business/TaxInfo.cs
+++ b/src/Core/Models/Business/TaxInfo.cs
@@ -11,10 +11,4 @@ public class TaxInfo
     public string BillingAddressState { get; set; }
     public string BillingAddressPostalCode { get; set; }
     public string BillingAddressCountry { get; set; } = "US";
-
-    public bool HasTaxId
-    {
-        get => !string.IsNullOrWhiteSpace(TaxIdNumber) &&
-            !string.IsNullOrWhiteSpace(TaxIdType);
-    }
 }
diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs
index e14467f943..3f9c5c53c6 100644
--- a/src/Core/Services/Implementations/StripePaymentService.cs
+++ b/src/Core/Services/Implementations/StripePaymentService.cs
@@ -167,7 +167,7 @@ public class StripePaymentService : IPaymentService
                     City = taxInfo?.BillingAddressCity,
                     State = taxInfo?.BillingAddressState,
                 },
-                TaxIdData = taxInfo.HasTaxId
+                TaxIdData = !string.IsNullOrWhiteSpace(taxInfo.TaxIdNumber)
                     ? [new CustomerTaxIdDataOptions { Type = taxInfo.TaxIdType, Value = taxInfo.TaxIdNumber }]
                     : null
             };