Revert "[PM-13999] Show estimated tax for taxable countries (#5077)" (#…

…5109) This reverts commit 94fdfa4. Co-authored-by: Conner Turnbull <[email protected]>
bitwarden · Dec 4, 2024 · 90a9473 · 90a9473
1 parent 470a126
commit 90a9473
Show file tree

Hide file tree

Showing 30 changed files with 529 additions and 1,791 deletions.
diff --git a/bitwarden_license/test/Commercial.Core.Test/Billing/TaxServiceTests.cs b/bitwarden_license/test/Commercial.Core.Test/Billing/TaxServiceTests.cs
diff --git a/src/Api/Billing/Controllers/AccountsBillingController.cs b/src/Api/Billing/Controllers/AccountsBillingController.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using Bit.Api.Billing.Models.Responses;
-using Bit.Core.Billing.Models.Api.Requests.Accounts;
 using Bit.Core.Billing.Services;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
@@ -78,18 +77,4 @@ public async Task<IResult> GetTransactionsAsync([FromQuery] DateTime? startAfter
 
         return TypedResults.Ok(transactions);
     }
-
-    [HttpPost("preview-invoice")]
-    public async Task<IResult> PreviewInvoiceAsync([FromBody] PreviewIndividualInvoiceRequestBody model)
-    {
-        var user = await userService.GetUserByPrincipalAsync(User);
-        if (user == null)
-        {
-            throw new UnauthorizedAccessException();
-        }
-
-        var invoice = await paymentService.PreviewInvoiceAsync(model, user.GatewayCustomerId, user.GatewaySubscriptionId);
-
-        return TypedResults.Ok(invoice);
-    }
 }
diff --git a/src/Api/Billing/Controllers/InvoicesController.cs b/src/Api/Billing/Controllers/InvoicesController.cs
diff --git a/src/Api/Billing/Controllers/ProviderBillingController.cs b/src/Api/Billing/Controllers/ProviderBillingController.cs
@@ -119,7 +119,6 @@ public async Task<IResult> UpdateTaxInformationAsync(
             requestBody.Country,
             requestBody.PostalCode,
             requestBody.TaxId,
-            requestBody.TaxIdType,
             requestBody.Line1,
             requestBody.Line2,
             requestBody.City,

diff --git a/src/Api/Billing/Controllers/StripeController.cs b/src/Api/Billing/Controllers/StripeController.cs
@@ -1,5 +1,4 @@
-using Bit.Core.Billing.Services;
-using Bit.Core.Services;
+using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Mvc;
@@ -47,15 +46,4 @@ public async Task<Ok<string>> CreateSetupIntentForCardAsync()
 
         return TypedResults.Ok(setupIntent.ClientSecret);
     }
-
-    [HttpGet]
-    [Route("~/tax/is-country-supported")]
-    public IResult IsCountrySupported(
-        [FromQuery] string country,
-        [FromServices] ITaxService taxService)
-    {
-        var isSupported = taxService.IsSupported(country);
-
-        return TypedResults.Ok(isSupported);
-    }
 }
diff --git a/src/Api/Billing/Models/Requests/TaxInformationRequestBody.cs b/src/Api/Billing/Models/Requests/TaxInformationRequestBody.cs
@@ -10,7 +10,6 @@ public class TaxInformationRequestBody
     [Required]
     public string PostalCode { get; set; }
     public string TaxId { get; set; }
-    public string TaxIdType { get; set; }
     public string Line1 { get; set; }
     public string Line2 { get; set; }
     public string City { get; set; }
@@ -20,7 +19,6 @@ public class TaxInformationRequestBody
         Country,
         PostalCode,
         TaxId,
-        TaxIdType,
         Line1,
         Line2,
         City,

diff --git a/src/Core/Billing/Extensions/CurrencyExtensions.cs b/src/Core/Billing/Extensions/CurrencyExtensions.cs
diff --git a/src/Core/Billing/Extensions/ServiceCollectionExtensions.cs b/src/Core/Billing/Extensions/ServiceCollectionExtensions.cs
@@ -11,7 +11,6 @@ public static class ServiceCollectionExtensions
 {
     public static void AddBillingOperations(this IServiceCollection services)
     {
-        services.AddSingleton<ITaxService, TaxService>();
         services.AddTransient<IOrganizationBillingService, OrganizationBillingService>();
         services.AddTransient<IPremiumUserBillingService, PremiumUserBillingService>();
         services.AddTransient<ISetupIntentCache, SetupIntentDistributedCache>();

diff --git a/src/Core/Billing/Models/Api/Requests/Accounts/PreviewIndividualInvoiceRequestModel.cs b/src/Core/Billing/Models/Api/Requests/Accounts/PreviewIndividualInvoiceRequestModel.cs
diff --git a/src/Core/Billing/Models/Api/Requests/Organizations/PreviewOrganizationInvoiceRequestModel.cs b/src/Core/Billing/Models/Api/Requests/Organizations/PreviewOrganizationInvoiceRequestModel.cs
diff --git a/src/Core/Billing/Models/Api/Requests/TaxInformationRequestModel.cs b/src/Core/Billing/Models/Api/Requests/TaxInformationRequestModel.cs
diff --git a/src/Core/Billing/Models/Api/Responses/PreviewInvoiceResponseModel.cs b/src/Core/Billing/Models/Api/Responses/PreviewInvoiceResponseModel.cs
diff --git a/src/Core/Billing/Models/PreviewInvoiceInfo.cs b/src/Core/Billing/Models/PreviewInvoiceInfo.cs