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

…13032)

* Remove FF from trial-billing-step.component

* Remove FF from user-subscription.component

* Remove FF from individual-billing-routing.module

* Remove FF from organization-billing.service

* Remove FF from organization-subscription-cloud.component

* Remove FF from organization-billing-routing.mdoule

* Remove FF from organization-plans.component

* Remove FF from change-plan-dialog.component

* Remove FF

* Remove legacy payment.component

* Rename V2: adjust-payment-dialog.component

* Rename V2: adjust-storage-dialog.component

* Rename V2: payment-label.component

* Rename V2: payment.component

* Rename V2: premium.component

* Patrick's feedback

apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts

@@ -10,7 +10,7 @@ import { RegisterFormModule } from "../../auth/register-form/register-form.modul
 import { SecretsManagerTrialFreeStepperComponent } from "../../auth/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component";
 import { SecretsManagerTrialPaidStepperComponent } from "../../auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component";
 import { SecretsManagerTrialComponent } from "../../auth/trial-initiation/secrets-manager/secrets-manager-trial.component";
-import { PaymentComponent, TaxInfoComponent } from "../../billing";
+import { TaxInfoComponent } from "../../billing";
 import { TrialBillingStepComponent } from "../../billing/accounts/trial-initiation/trial-billing-step.component";
 import { EnvironmentSelectorModule } from "../../components/environment-selector/environment-selector.module";
 import { SharedModule } from "../../shared";
@@ -51,7 +51,6 @@ import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.modul
     RegisterFormModule,
     OrganizationCreateModule,
     EnvironmentSelectorModule,
-    PaymentComponent,
     TaxInfoComponent,
     TrialBillingStepComponent,
     InputPasswordComponent,

apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html

@@ -49,15 +49,7 @@ <h2 class="tw-mb-3 tw-text-base tw-font-semibold">{{ "billingPlanLabel" | i18n }
     </div>
     <div class="tw-mb-4">
       <h2 class="tw-mb-3 tw-text-base tw-font-semibold">{{ "paymentType" | i18n }}</h2>
-      <app-payment
-        *ngIf="!deprecateStripeSourcesAPI"
-        [hideCredit]="true"
-        [trialFlow]="true"
-      ></app-payment>
-      <app-payment-v2
-        *ngIf="deprecateStripeSourcesAPI"
-        [showAccountCredit]="false"
-      ></app-payment-v2>
+      <app-payment [showAccountCredit]="false"></app-payment>
       <app-tax-info [trialFlow]="true" (countryChanged)="changedCountry()"></app-tax-info>
     </div>
     <div class="tw-flex tw-space-x-2">

apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts

@@ -13,14 +13,12 @@ import {
 } from "@bitwarden/common/billing/abstractions/organization-billing.service";
 import { PaymentMethodType, PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { ToastService } from "@bitwarden/components";
 
-import { BillingSharedModule, PaymentComponent, TaxInfoComponent } from "../../shared";
-import { PaymentV2Component } from "../../shared/payment/payment-v2.component";
+import { BillingSharedModule, TaxInfoComponent } from "../../shared";
+import { PaymentComponent } from "../../shared/payment/payment.component";
 
 export type TrialOrganizationType = Exclude<ProductTierType, ProductTierType.Free>;
 
@@ -53,7 +51,6 @@ export enum SubscriptionProduct {
 })
 export class TrialBillingStepComponent implements OnInit {
   @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
-  @ViewChild(PaymentV2Component) paymentV2Component: PaymentV2Component;
   @ViewChild(TaxInfoComponent) taxInfoComponent: TaxInfoComponent;
   @Input() organizationInfo: OrganizationInfo;
   @Input() subscriptionProduct: SubscriptionProduct = SubscriptionProduct.PasswordManager;
@@ -74,11 +71,8 @@ export class TrialBillingStepComponent implements OnInit {
   annualPlan?: PlanResponse;
   monthlyPlan?: PlanResponse;
 
-  deprecateStripeSourcesAPI: boolean;
-
   constructor(
     private apiService: ApiService,
-    private configService: ConfigService,
     private i18nService: I18nService,
     private formBuilder: FormBuilder,
     private messagingService: MessagingService,
@@ -87,9 +81,6 @@ export class TrialBillingStepComponent implements OnInit {
   ) {}
 
   async ngOnInit(): Promise<void> {
-    this.deprecateStripeSourcesAPI = await this.configService.getFeatureFlag(
-      FeatureFlag.AC2476_DeprecateStripeSourcesAPI,
-    );
     const plans = await this.apiService.getPlans();
     this.applicablePlans = plans.data.filter(this.isApplicable);
     this.annualPlan = this.findPlanFor(SubscriptionCadence.Annual);
@@ -124,23 +115,12 @@ export class TrialBillingStepComponent implements OnInit {
   }
 
   protected changedCountry() {
-    if (this.deprecateStripeSourcesAPI) {
-      this.paymentV2Component.showBankAccount = this.taxInfoComponent.country === "US";
-      if (
-        !this.paymentV2Component.showBankAccount &&
-        this.paymentV2Component.selected === PaymentMethodType.BankAccount
-      ) {
-        this.paymentV2Component.select(PaymentMethodType.Card);
-      }
-    } else {
-      this.paymentComponent.hideBank = this.taxInfoComponent.taxFormGroup.value.country !== "US";
-      if (
-        this.paymentComponent.hideBank &&
-        this.paymentComponent.method === PaymentMethodType.BankAccount
-      ) {
-        this.paymentComponent.method = PaymentMethodType.Card;
-        this.paymentComponent.changeMethod();
-      }
+    this.paymentComponent.showBankAccount = this.taxInfoComponent.country === "US";
+    if (
+      !this.paymentComponent.showBankAccount &&
+      this.paymentComponent.selected === PaymentMethodType.BankAccount
+    ) {
+      this.paymentComponent.select(PaymentMethodType.Card);
     }
   }
 
@@ -162,14 +142,8 @@ export class TrialBillingStepComponent implements OnInit {
   private async createOrganization(): Promise<string> {
     const planResponse = this.findPlanFor(this.formGroup.value.cadence);
 
-    let paymentMethod: [string, PaymentMethodType];
-
-    if (this.deprecateStripeSourcesAPI) {
-      const { type, token } = await this.paymentV2Component.tokenize();
-      paymentMethod = [token, type];
-    } else {
-      paymentMethod = await this.paymentComponent.createPaymentToken();
-    }
+    const { type, token } = await this.paymentComponent.tokenize();
+    const paymentMethod: [string, PaymentMethodType] = [token, type];
 
     const organization: OrganizationInformation = {
       name: this.organizationInfo.name,

apps/web/src/app/billing/index.ts

@@ -1,2 +1,2 @@
 export { OrganizationPlansComponent } from "./organizations";
-export { PaymentComponent, TaxInfoComponent } from "./shared";
+export { TaxInfoComponent } from "./shared";

apps/web/src/app/billing/individual/individual-billing-routing.module.ts

@@ -1,13 +1,9 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { featureFlaggedRoute } from "@bitwarden/angular/platform/utils/feature-flagged-route";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-
 import { PaymentMethodComponent } from "../shared";
 
 import { BillingHistoryViewComponent } from "./billing-history-view.component";
-import { PremiumV2Component } from "./premium/premium-v2.component";
 import { PremiumComponent } from "./premium/premium.component";
 import { SubscriptionComponent } from "./subscription.component";
 import { UserSubscriptionComponent } from "./user-subscription.component";
@@ -24,15 +20,11 @@ const routes: Routes = [
         component: UserSubscriptionComponent,
         data: { titleId: "premiumMembership" },
       },
-      ...featureFlaggedRoute({
-        defaultComponent: PremiumComponent,
-        flaggedComponent: PremiumV2Component,
-        featureFlag: FeatureFlag.AC2476_DeprecateStripeSourcesAPI,
-        routeOptions: {
-          path: "premium",
-          data: { titleId: "goPremium" },
-        },
-      }),
+      {
+        path: "premium",
+        component: PremiumComponent,
+        data: { titleId: "goPremium" },
+      },
       {
         path: "payment-method",
         component: PaymentMethodComponent,

apps/web/src/app/billing/individual/individual-billing.module.ts

@@ -5,7 +5,6 @@ import { BillingSharedModule } from "../shared";
 
 import { BillingHistoryViewComponent } from "./billing-history-view.component";
 import { IndividualBillingRoutingModule } from "./individual-billing-routing.module";
-import { PremiumV2Component } from "./premium/premium-v2.component";
 import { PremiumComponent } from "./premium/premium.component";
 import { SubscriptionComponent } from "./subscription.component";
 import { UserSubscriptionComponent } from "./user-subscription.component";
@@ -17,7 +16,6 @@ import { UserSubscriptionComponent } from "./user-subscription.component";
     BillingHistoryViewComponent,
     UserSubscriptionComponent,
     PremiumComponent,
-    PremiumV2Component,
   ],
 })
 export class IndividualBillingModule {}