Pass boolean to check whether payment is configured to reduce code duplication

Author: jonashendrickx

apps/web/src/app/admin-console/organizations/collections/vault.component.ts

@@ -641,7 +641,11 @@ export class VaultComponent implements OnInit, OnDestroy {
         ]),
       ),
       map(([org, sub, metadata]) =>
-        this.trialFlowService.organizationHasUpcomingPaymentIssues(org, sub, metadata),
+        this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
+          org,
+          sub,
+          metadata.isPaymentMethodConfigured,
+        ),
       ),
       filter((result) => result !== null),
     );

apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts

@@ -144,7 +144,7 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
         this.freeTrialData = this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
           this.organization,
           this.organizationSubscriptionResponse,
-          paymentSource,
+          !!paymentSource,
         );
       }
       this.isUnpaid = this.subscriptionStatus === "unpaid" ?? false;

apps/web/src/app/billing/services/trial-flow.service.ts

@@ -7,10 +7,8 @@ import { lastValueFrom } from "rxjs";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
-import { BillingSourceResponse } from "@bitwarden/common/billing/models/response/billing.response";
 import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
-import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { DialogService } from "@bitwarden/components";
 
@@ -32,33 +30,11 @@ export class TrialFlowService {
   checkForOrgsWithUpcomingPaymentIssues(
     organization: Organization,
     organizationSubscription: OrganizationSubscriptionResponse,
-    paymentSource: BillingSourceResponse | PaymentSourceResponse,
+    isPaymentConfigured: boolean,
   ): FreeTrial {
     const trialEndDate = organizationSubscription?.subscription?.trialEndDate;
     const displayBanner =
-      !paymentSource &&
-      organization?.isOwner &&
-      organizationSubscription?.subscription?.status === "trialing";
-    const trialRemainingDays = trialEndDate ? this.calculateTrialRemainingDays(trialEndDate) : 0;
-    const freeTrialMessage = this.getFreeTrialMessage(trialRemainingDays);
-
-    return {
-      remainingDays: trialRemainingDays,
-      message: freeTrialMessage,
-      shownBanner: displayBanner,
-      organizationId: organization.id,
-      organizationName: organization.name,
-    };
-  }
-
-  organizationHasUpcomingPaymentIssues(
-    organization: Organization,
-    organizationSubscription: OrganizationSubscriptionResponse,
-    metadata: OrganizationBillingMetadataResponse,
-  ): FreeTrial {
-    const trialEndDate = organizationSubscription?.subscription?.trialEndDate;
-    const displayBanner =
-      metadata.isPaymentMethodConfigured === false &&
+      isPaymentConfigured === false &&
       organization?.isOwner &&
       organizationSubscription?.subscription?.status === "trialing";
     const trialRemainingDays = trialEndDate ? this.calculateTrialRemainingDays(trialEndDate) : 0;

apps/web/src/app/billing/shared/payment-method.component.ts

@@ -209,7 +209,7 @@ export class PaymentMethodComponent implements OnInit, OnDestroy {
     this.freeTrialData = this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
       this.organization,
       this.org,
-      this.billing?.paymentSource,
+      !!this.billing?.paymentSource,
     );
   }
 

apps/web/src/app/vault/individual-vault/vault.component.ts

@@ -225,7 +225,7 @@ export class VaultComponent implements OnInit, OnDestroy {
               this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
                 org,
                 subscription,
-                paymentSource,
+                !!paymentSource,
               ),
             ),
           ),

bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts

@@ -174,7 +174,11 @@ export class OverviewComponent implements OnInit, OnDestroy {
         ]),
       ),
       map(([org, sub, paymentSource]) => {
-        return this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(org, sub, paymentSource);
+        return this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
+          org,
+          sub,
+          !!paymentSource,
+        );
       }),
       filter((result) => result !== null),
       takeUntil(this.destroy$),