Remove consolidated billing feature flag (#11969)

bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts

@@ -8,11 +8,9 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import { ProviderUserType } from "@bitwarden/common/admin-console/enums";
+import { ProviderStatusType, ProviderUserType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { hasConsolidatedBilling } from "@bitwarden/common/billing/abstractions/provider-billing.service.abstraction";
 import { PlanType } from "@bitwarden/common/billing/enums";
-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 { DialogService, ToastService } from "@bitwarden/components";
@@ -46,7 +44,6 @@ export class ClientsComponent extends BaseClientsComponent implements OnInit, On
     private apiService: ApiService,
     private organizationService: OrganizationService,
     private organizationApiService: OrganizationApiServiceAbstraction,
-    private configService: ConfigService,
     activatedRoute: ActivatedRoute,
     dialogService: DialogService,
     i18nService: I18nService,
@@ -72,9 +69,9 @@ export class ClientsComponent extends BaseClientsComponent implements OnInit, On
         switchMap((params) => {
           this.providerId = params.providerId;
           return this.providerService.get$(this.providerId).pipe(
-            hasConsolidatedBilling(this.configService),
-            map((hasConsolidatedBilling) => {
-              if (hasConsolidatedBilling) {
+            map((provider) => provider?.providerStatus === ProviderStatusType.Billable),
+            map((isBillable) => {
+              if (isBillable) {
                 return from(
                   this.router.navigate(["../manage-client-organizations"], {
                     relativeTo: this.activatedRoute,

bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html

@@ -5,7 +5,7 @@
     <bit-nav-item
       icon="bwi-bank"
       [text]="'clients' | i18n"
-      [route]="(hasConsolidatedBilling$ | async) ? 'manage-client-organizations' : 'clients'"
+      [route]="(isBillable | async) ? 'manage-client-organizations' : 'clients'"
     ></bit-nav-item>
     <bit-nav-group
       icon="bwi-sliders"

bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts

@@ -1,13 +1,13 @@
 import { CommonModule } from "@angular/common";
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute, RouterModule } from "@angular/router";
-import { switchMap, Observable, Subject, combineLatest, map } from "rxjs";
+import { combineLatest, map, Observable, Subject, switchMap } from "rxjs";
 import { takeUntil } from "rxjs/operators";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
+import { ProviderStatusType } from "@bitwarden/common/admin-console/enums";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
-import { hasConsolidatedBilling } from "@bitwarden/common/billing/abstractions/provider-billing.service.abstraction";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { BannerModule, IconModule, LinkModule } from "@bitwarden/components";
@@ -36,7 +36,7 @@ export class ProvidersLayoutComponent implements OnInit, OnDestroy {
   private destroy$ = new Subject<void>();
   protected provider$: Observable<Provider>;
 
-  protected hasConsolidatedBilling$: Observable<boolean>;
+  protected isBillable: Observable<boolean>;
   protected canAccessBilling$: Observable<boolean>;
 
   protected showProviderClientVaultPrivacyWarningBanner$ = this.configService.getFeatureFlag$(
@@ -58,12 +58,12 @@ export class ProvidersLayoutComponent implements OnInit, OnDestroy {
       takeUntil(this.destroy$),
     );
 
-    this.hasConsolidatedBilling$ = this.provider$.pipe(
-      hasConsolidatedBilling(this.configService),
+    this.isBillable = this.provider$.pipe(
+      map((provider) => provider?.providerStatus === ProviderStatusType.Billable),
       takeUntil(this.destroy$),
     );
 
-    this.canAccessBilling$ = combineLatest([this.hasConsolidatedBilling$, this.provider$]).pipe(
+    this.canAccessBilling$ = combineLatest([this.isBillable, this.provider$]).pipe(
       map(
         ([hasConsolidatedBilling, provider]) => hasConsolidatedBilling && provider.isProviderAdmin,
       ),

bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html

@@ -24,13 +24,11 @@
         <bit-form-field>
           <bit-label>{{ "billingEmail" | i18n }}</bit-label>
           <input type="email" bitInput formControlName="billingEmail" />
-          <bit-hint *ngIf="enableConsolidatedBilling$ | async">{{
-            "providerBillingEmailHint" | i18n
-          }}</bit-hint>
+          <bit-hint>{{ "providerBillingEmailHint" | i18n }}</bit-hint>
         </bit-form-field>
       </div>
     </div>
-    <app-manage-tax-information *ngIf="enableConsolidatedBilling$ | async" />
+    <app-manage-tax-information />
     <button bitButton bitFormButton buttonType="primary" type="submit">
       {{ "submit" | i18n }}
     </button>

bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts

@@ -1,14 +1,13 @@
 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";
 import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
 import { ProviderSetupRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-setup.request";
 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";
@@ -34,10 +33,6 @@ export class SetupComponent implements OnInit, OnDestroy {
     billingEmail: ["", [Validators.required, Validators.email]],
   });
 
-  protected enableConsolidatedBilling$ = this.configService.getFeatureFlag$(
-    FeatureFlag.EnableConsolidatedBilling,
-  );
-
   private destroy$ = new Subject<void>();
 
   constructor(
@@ -112,13 +107,9 @@ export class SetupComponent implements OnInit, OnDestroy {
 
   submit = async () => {
     try {
-      const consolidatedBillingEnabled = await firstValueFrom(this.enableConsolidatedBilling$);
-
       this.formGroup.markAllAsTouched();
 
-      const formIsValid = consolidatedBillingEnabled
-        ? this.formGroup.valid && this.manageTaxInformationComponent.touch()
-        : this.formGroup.valid;
+      const formIsValid = this.formGroup.valid && this.manageTaxInformationComponent.touch();
 
       if (!formIsValid) {
         return;
@@ -133,19 +124,18 @@ export class SetupComponent implements OnInit, OnDestroy {
       request.token = this.token;
       request.key = key;
 
-      if (consolidatedBillingEnabled) {
-        request.taxInfo = new ExpandedTaxInfoUpdateRequest();
-        const taxInformation = this.manageTaxInformationComponent.getTaxInformation();
+      request.taxInfo = new ExpandedTaxInfoUpdateRequest();
+      const taxInformation = this.manageTaxInformationComponent.getTaxInformation();
 
-        request.taxInfo.country = taxInformation.country;
-        request.taxInfo.postalCode = taxInformation.postalCode;
-        if (taxInformation.includeTaxId) {
-          request.taxInfo.taxId = taxInformation.taxId;
-          request.taxInfo.line1 = taxInformation.line1;
-          request.taxInfo.line2 = taxInformation.line2;
-          request.taxInfo.city = taxInformation.city;
-          request.taxInfo.state = taxInformation.state;
-        }
+      request.taxInfo.country = taxInformation.country;
+      request.taxInfo.postalCode = taxInformation.postalCode;
+
+      if (taxInformation.includeTaxId) {
+        request.taxInfo.taxId = taxInformation.taxId;
+        request.taxInfo.line1 = taxInformation.line1;
+        request.taxInfo.line2 = taxInformation.line2;
+        request.taxInfo.city = taxInformation.city;
+        request.taxInfo.state = taxInformation.state;
       }
 
       const provider = await this.providerApiService.postProviderSetup(this.providerId, request);