+
+
+ {{ "providerName" | i18n }}
+
+
-
- } @else {
-
{{ "billingInformation" | i18n }}
-
-
-
- {{ "providerName" | i18n }}
-
-
-
-
-
- {{ "billingEmail" | i18n }}
-
- {{ "providerBillingEmailHint" | i18n }}
-
-
+
+
+ {{ "billingEmail" | i18n }}
+
+ {{ "providerBillingEmailHint" | i18n }}
+
-
{{ "paymentMethod" | i18n }}
-
-
- }
+
+
{{ "paymentMethod" | i18n }}
+
+
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
index 53b54e459ea..edad6616fb3 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
@@ -3,7 +3,7 @@
import { Component, OnDestroy, OnInit, ViewChild } from "@angular/core";
import { FormBuilder, Validators } from "@angular/forms";
import { ActivatedRoute, Router } from "@angular/router";
-import { firstValueFrom, Subject, switchMap } from "rxjs";
+import { Subject, switchMap } from "rxjs";
import { first, takeUntil } from "rxjs/operators";
import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
@@ -11,8 +11,6 @@ import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/a
import { ProviderSetupRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-setup.request";
import { PaymentMethodType } from "@bitwarden/common/billing/enums";
import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
-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 { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
import { ProviderKey } from "@bitwarden/common/types/key";
@@ -41,10 +39,6 @@ export class SetupComponent implements OnInit, OnDestroy {
private destroy$ = new Subject
();
- requireProviderPaymentMethodDuringSetup$ = this.configService.getFeatureFlag$(
- FeatureFlag.PM19956_RequireProviderPaymentMethodDuringSetup,
- );
-
constructor(
private router: Router,
private i18nService: I18nService,
@@ -52,7 +46,6 @@ export class SetupComponent implements OnInit, OnDestroy {
private keyService: KeyService,
private syncService: SyncService,
private validationService: ValidationService,
- private configService: ConfigService,
private providerApiService: ProviderApiServiceAbstraction,
private formBuilder: FormBuilder,
private toastService: ToastService,
@@ -117,15 +110,9 @@ export class SetupComponent implements OnInit, OnDestroy {
submit = async () => {
try {
- const requireProviderPaymentMethodDuringSetup = await firstValueFrom(
- this.requireProviderPaymentMethodDuringSetup$,
- );
-
this.formGroup.markAllAsTouched();
- const paymentValid = requireProviderPaymentMethodDuringSetup
- ? this.paymentComponent.validate()
- : true;
+ const paymentValid = this.paymentComponent.validate();
const taxInformationValid = this.taxInformationComponent.validate();
if (!paymentValid || !taxInformationValid || !this.formGroup.valid) {
@@ -152,9 +139,7 @@ export class SetupComponent implements OnInit, OnDestroy {
request.taxInfo.city = taxInformation.city;
request.taxInfo.state = taxInformation.state;
- if (requireProviderPaymentMethodDuringSetup) {
- request.paymentSource = await this.paymentComponent.tokenize();
- }
+ request.paymentSource = await this.paymentComponent.tokenize();
const provider = await this.providerApiService.postProviderSetup(this.providerId, request);
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 5a4e5ff5dde..81cc3b305dc 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -27,7 +27,6 @@ export enum FeatureFlag {
TrialPaymentOptional = "PM-8163-trial-payment",
PM12276_BreadcrumbEventLogs = "pm-12276-breadcrumbing-for-business-features",
PM17772_AdminInitiatedSponsorships = "pm-17772-admin-initiated-sponsorships",
- PM19956_RequireProviderPaymentMethodDuringSetup = "pm-19956-require-provider-payment-method-during-setup",
UseOrganizationWarningsService = "use-organization-warnings-service",
AllowTrialLengthZero = "pm-20322-allow-trial-length-0",
PM21881_ManagePaymentDetailsOutsideCheckout = "pm-21881-manage-payment-details-outside-checkout",
@@ -104,7 +103,6 @@ export const DefaultFeatureFlagValue = {
[FeatureFlag.TrialPaymentOptional]: FALSE,
[FeatureFlag.PM12276_BreadcrumbEventLogs]: FALSE,
[FeatureFlag.PM17772_AdminInitiatedSponsorships]: FALSE,
- [FeatureFlag.PM19956_RequireProviderPaymentMethodDuringSetup]: FALSE,
[FeatureFlag.UseOrganizationWarningsService]: FALSE,
[FeatureFlag.AllowTrialLengthZero]: FALSE,
[FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout]: FALSE,