[PM-11730] Remove feature flag: AC-2476-deprecate-stripe-sources-api (#5201)

* Removed feature flag

* Run dotnet format

* Fix integration tests

Author: amorask-bitwarden

src/Api/Billing/Controllers/OrganizationBillingController.cs

@@ -2,7 +2,6 @@
 using Bit.Api.AdminConsole.Models.Request.Organizations;
 using Bit.Api.Billing.Models.Requests;
 using Bit.Api.Billing.Models.Responses;
-using Bit.Core;
 using Bit.Core.Billing.Models.Sales;
 using Bit.Core.Billing.Services;
 using Bit.Core.Context;
@@ -139,11 +138,6 @@ public async Task<IResult> GetBillingAsync(Guid organizationId)
     [HttpGet("payment-method")]
     public async Task<IResult> GetPaymentMethodAsync([FromRoute] Guid organizationId)
     {
-        if (!featureService.IsEnabled(FeatureFlagKeys.AC2476_DeprecateStripeSourcesAPI))
-        {
-            return Error.NotFound();
-        }
-
         if (!await currentContext.EditPaymentMethods(organizationId))
         {
             return Error.Unauthorized();
@@ -168,11 +162,6 @@ public async Task<IResult> UpdatePaymentMethodAsync(
         [FromRoute] Guid organizationId,
         [FromBody] UpdatePaymentMethodRequestBody requestBody)
     {
-        if (!featureService.IsEnabled(FeatureFlagKeys.AC2476_DeprecateStripeSourcesAPI))
-        {
-            return Error.NotFound();
-        }
-
         if (!await currentContext.EditPaymentMethods(organizationId))
         {
             return Error.Unauthorized();
@@ -199,11 +188,6 @@ public async Task<IResult> VerifyBankAccountAsync(
         [FromRoute] Guid organizationId,
         [FromBody] VerifyBankAccountRequestBody requestBody)
     {
-        if (!featureService.IsEnabled(FeatureFlagKeys.AC2476_DeprecateStripeSourcesAPI))
-        {
-            return Error.NotFound();
-        }
-
         if (!await currentContext.EditPaymentMethods(organizationId))
         {
             return Error.Unauthorized();
@@ -229,11 +213,6 @@ public async Task<IResult> VerifyBankAccountAsync(
     [HttpGet("tax-information")]
     public async Task<IResult> GetTaxInformationAsync([FromRoute] Guid organizationId)
     {
-        if (!featureService.IsEnabled(FeatureFlagKeys.AC2476_DeprecateStripeSourcesAPI))
-        {
-            return Error.NotFound();
-        }
-
         if (!await currentContext.EditPaymentMethods(organizationId))
         {
             return Error.Unauthorized();
@@ -258,11 +237,6 @@ public async Task<IResult> UpdateTaxInformationAsync(
         [FromRoute] Guid organizationId,
         [FromBody] TaxInformationRequestBody requestBody)
     {
-        if (!featureService.IsEnabled(FeatureFlagKeys.AC2476_DeprecateStripeSourcesAPI))
-        {
-            return Error.NotFound();
-        }
-
         if (!await currentContext.EditPaymentMethods(organizationId))
         {
             return Error.Unauthorized();
@@ -292,11 +266,6 @@ public async Task<IResult> RestartSubscriptionAsync([FromRoute] Guid organizatio
             throw new UnauthorizedAccessException();
         }
 
-        if (!featureService.IsEnabled(FeatureFlagKeys.AC2476_DeprecateStripeSourcesAPI))
-        {
-            return Error.NotFound();
-        }
-
         if (!await currentContext.EditPaymentMethods(organizationId))
         {
             return Error.Unauthorized();

src/Core/AdminConsole/OrganizationFeatures/Organizations/CloudOrganizationSignUpCommand.cs

@@ -125,28 +125,8 @@ public async Task<SignUpOrganizationResponse> SignUpOrganizationAsync(Organizati
         }
         else if (plan.Type != PlanType.Free)
         {
-            if (featureService.IsEnabled(FeatureFlagKeys.AC2476_DeprecateStripeSourcesAPI))
-            {
-                var sale = OrganizationSale.From(organization, signup);
-                await organizationBillingService.Finalize(sale);
-            }
-            else
-            {
-                if (signup.PaymentMethodType != null)
-                {
-                    await paymentService.PurchaseOrganizationAsync(organization, signup.PaymentMethodType.Value,
-                        signup.PaymentToken, plan, signup.AdditionalStorageGb, signup.AdditionalSeats,
-                        signup.PremiumAccessAddon, signup.TaxInfo, signup.IsFromProvider, signup.AdditionalSmSeats.GetValueOrDefault(),
-                        signup.AdditionalServiceAccounts.GetValueOrDefault(), signup.IsFromSecretsManagerTrial);
-                }
-                else
-                {
-                    await paymentService.PurchaseOrganizationNoPaymentMethod(organization, plan, signup.AdditionalSeats,
-                        signup.PremiumAccessAddon, signup.AdditionalSmSeats.GetValueOrDefault(),
-                        signup.AdditionalServiceAccounts.GetValueOrDefault(), signup.IsFromSecretsManagerTrial);
-                }
-
-            }
+            var sale = OrganizationSale.From(organization, signup);
+            await organizationBillingService.Finalize(sale);
         }
 
         var ownerId = signup.IsFromProvider ? default : signup.Owner.Id;

src/Core/Constants.cs

@@ -137,7 +137,6 @@ public static class FeatureFlagKeys
     public const string NotificationBarAddLoginImprovements = "notification-bar-add-login-improvements";
     public const string BlockBrowserInjectionsByDomain = "block-browser-injections-by-domain";
     public const string NotificationRefresh = "notification-refresh";
-    public const string AC2476_DeprecateStripeSourcesAPI = "AC-2476-deprecate-stripe-sources-api";
     public const string PersistPopupView = "persist-popup-view";
     public const string CipherKeyEncryption = "cipher-key-encryption";
     public const string EnableNewCardCombinedExpiryAutofill = "enable-new-card-combined-expiry-autofill";

src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs

@@ -224,27 +224,8 @@ await _organizationUserRepository.GetManyByOrganizationAsync(organization.Id,
 
         if (string.IsNullOrWhiteSpace(organization.GatewaySubscriptionId))
         {
-            if (_featureService.IsEnabled(FeatureFlagKeys.AC2476_DeprecateStripeSourcesAPI))
-            {
-                var sale = OrganizationSale.From(organization, upgrade);
-                await _organizationBillingService.Finalize(sale);
-            }
-            else
-            {
-                try
-                {
-                    paymentIntentClientSecret = await _paymentService.UpgradeFreeOrganizationAsync(organization,
-                        newPlan, upgrade);
-                    success = string.IsNullOrWhiteSpace(paymentIntentClientSecret);
-                }
-                catch
-                {
-                    await _paymentService.CancelAndRecoverChargesAsync(organization);
-                    organization.GatewayCustomerId = null;
-                    await _organizationService.ReplaceAndUpdateCacheAsync(organization);
-                    throw;
-                }
-            }
+            var sale = OrganizationSale.From(organization, upgrade);
+            await _organizationBillingService.Finalize(sale);
         }
         else
         {

src/Core/Services/Implementations/UserService.cs

@@ -933,18 +933,8 @@ public async Task<Tuple<bool, string>> SignUpPremiumAsync(User user, string paym
         }
         else
         {
-            var deprecateStripeSourcesAPI = _featureService.IsEnabled(FeatureFlagKeys.AC2476_DeprecateStripeSourcesAPI);
-
-            if (deprecateStripeSourcesAPI)
-            {
-                var sale = PremiumUserSale.From(user, paymentMethodType, paymentToken, taxInfo, additionalStorageGb);
-                await _premiumUserBillingService.Finalize(sale);
-            }
-            else
-            {
-                paymentIntentClientSecret = await _paymentService.PurchasePremiumAsync(user, paymentMethodType,
-                    paymentToken, additionalStorageGb, taxInfo);
-            }
+            var sale = PremiumUserSale.From(user, paymentMethodType, paymentToken, taxInfo, additionalStorageGb);
+            await _premiumUserBillingService.Finalize(sale);
         }
 
         user.Premium = true;

test/Api.IntegrationTest/Helpers/OrganizationTestHelpers.cs

@@ -36,7 +36,13 @@ public static async Task<Tuple<Organization, OrganizationUser>> SignUpAsync<T>(W
             OwnerKey = ownerKey,
             Owner = owner,
             AdditionalSeats = passwordManagerSeats,
-            PaymentMethodType = paymentMethod
+            PaymentMethodType = paymentMethod,
+            PaymentToken = "TOKEN",
+            TaxInfo = new TaxInfo
+            {
+                BillingAddressCountry = "US",
+                BillingAddressPostalCode = "12345"
+            }
         });
 
         Debug.Assert(signUpResult.OrganizationUser is not null);

test/Core.Test/AdminConsole/OrganizationFeatures/Organizations/OrganizationSignUp/CloudOrganizationSignUpCommandTests.cs

@@ -1,14 +1,14 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.OrganizationFeatures.Organizations;
 using Bit.Core.Billing.Enums;
+using Bit.Core.Billing.Models.Sales;
+using Bit.Core.Billing.Services;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.StaticStore;
 using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Bit.Core.Tools.Enums;
 using Bit.Core.Tools.Models.Business;
 using Bit.Core.Tools.Services;
@@ -60,20 +60,16 @@ await sutProvider.GetDependency<IReferenceEventService>().Received(1)
         Assert.NotNull(result.Organization);
         Assert.NotNull(result.OrganizationUser);
 
-        await sutProvider.GetDependency<IPaymentService>().Received(1).PurchaseOrganizationAsync(
-            Arg.Any<Organization>(),
-            signup.PaymentMethodType.Value,
-            signup.PaymentToken,
-            plan,
-            signup.AdditionalStorageGb,
-            signup.AdditionalSeats,
-            signup.PremiumAccessAddon,
-            signup.TaxInfo,
-            false,
-            signup.AdditionalSmSeats.GetValueOrDefault(),
-            signup.AdditionalServiceAccounts.GetValueOrDefault(),
-            signup.UseSecretsManager
-        );
+        await sutProvider.GetDependency<IOrganizationBillingService>().Received(1).Finalize(
+            Arg.Is<OrganizationSale>(sale =>
+                sale.CustomerSetup.TokenizedPaymentSource.Type == signup.PaymentMethodType.Value &&
+                sale.CustomerSetup.TokenizedPaymentSource.Token == signup.PaymentToken &&
+                sale.CustomerSetup.TaxInformation.Country == signup.TaxInfo.BillingAddressCountry &&
+                sale.CustomerSetup.TaxInformation.PostalCode == signup.TaxInfo.BillingAddressPostalCode &&
+                sale.SubscriptionSetup.Plan == plan &&
+                sale.SubscriptionSetup.PasswordManagerOptions.Seats == signup.AdditionalSeats &&
+                sale.SubscriptionSetup.PasswordManagerOptions.Storage == signup.AdditionalStorageGb &&
+                sale.SubscriptionSetup.SecretsManagerOptions == null));
     }
 
     [Theory]
@@ -155,20 +151,17 @@ await sutProvider.GetDependency<IReferenceEventService>().Received(1)
         Assert.NotNull(result.Organization);
         Assert.NotNull(result.OrganizationUser);
 
-        await sutProvider.GetDependency<IPaymentService>().Received(1).PurchaseOrganizationAsync(
-            Arg.Any<Organization>(),
-            signup.PaymentMethodType.Value,
-            signup.PaymentToken,
-            Arg.Is<Plan>(plan),
-            signup.AdditionalStorageGb,
-            signup.AdditionalSeats,
-            signup.PremiumAccessAddon,
-            signup.TaxInfo,
-            false,
-            signup.AdditionalSmSeats.GetValueOrDefault(),
-            signup.AdditionalServiceAccounts.GetValueOrDefault(),
-            signup.IsFromSecretsManagerTrial
-        );
+        await sutProvider.GetDependency<IOrganizationBillingService>().Received(1).Finalize(
+            Arg.Is<OrganizationSale>(sale =>
+                sale.CustomerSetup.TokenizedPaymentSource.Type == signup.PaymentMethodType.Value &&
+                sale.CustomerSetup.TokenizedPaymentSource.Token == signup.PaymentToken &&
+                sale.CustomerSetup.TaxInformation.Country == signup.TaxInfo.BillingAddressCountry &&
+                sale.CustomerSetup.TaxInformation.PostalCode == signup.TaxInfo.BillingAddressPostalCode &&
+                sale.SubscriptionSetup.Plan == plan &&
+                sale.SubscriptionSetup.PasswordManagerOptions.Seats == signup.AdditionalSeats &&
+                sale.SubscriptionSetup.PasswordManagerOptions.Storage == signup.AdditionalStorageGb &&
+                sale.SubscriptionSetup.SecretsManagerOptions.Seats == signup.AdditionalSmSeats &&
+                sale.SubscriptionSetup.SecretsManagerOptions.ServiceAccounts == signup.AdditionalServiceAccounts));
     }
 
     [Theory]

test/Core.Test/OrganizationFeatures/OrganizationSubscriptionUpdate/UpgradeOrganizationPlanCommandTests.cs

@@ -139,7 +139,7 @@ await sutProvider.GetDependency<IOrganizationService>().Received(1).ReplaceAndUp
                 && o.SmServiceAccounts == plan.SecretsManager.BaseServiceAccount + upgrade.AdditionalServiceAccounts));
 
         Assert.True(result.Item1);
-        Assert.NotNull(result.Item2);
+        Assert.Null(result.Item2);
     }
 
     [Theory, FreeOrganizationUpgradeCustomize]

test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs

@@ -1,5 +1,6 @@
 using AspNetCoreRateLimit;
 using Bit.Core.Auth.Services;
+using Bit.Core.Billing.Services;
 using Bit.Core.Platform.Push;
 using Bit.Core.Platform.Push.Internal;
 using Bit.Core.Repositories;
@@ -247,6 +248,11 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
             var stripePaymentService = services.First(sd => sd.ServiceType == typeof(IPaymentService));
             services.Remove(stripePaymentService);
             services.AddSingleton(Substitute.For<IPaymentService>());
+
+            var organizationBillingService =
+                services.First(sd => sd.ServiceType == typeof(IOrganizationBillingService));
+            services.Remove(organizationBillingService);
+            services.AddSingleton(Substitute.For<IOrganizationBillingService>());
         });
 
         foreach (var configureTestService in _configureTestServices)