Merge pull request #18948 from mozilla/FXA-11770

fix(payments): Customers with saved card and no active subs should see PayPal privacy policy link on Checkout

Author: xlisachan

libs/payments/cart/src/lib/cart.service.spec.ts

@@ -1427,6 +1427,73 @@ describe('CartService', () => {
       );
     });
 
+    it('returns cart with success state', async () => {
+      const mockCart = ResultCartFactory({
+        state: CartState.SUCCESS,
+        stripeSubscriptionId: mockSubscription.id,
+      });
+      const mockCustomer = StripeResponseFactory(StripeCustomerFactory());
+      const mockPrice = StripePriceFactory();
+      const mockUpcomingInvoicePreview = InvoicePreviewFactory();
+      const mockLatestInvoicePreview = InvoicePreviewFactory();
+      const mockPaymentMethod = StripeResponseFactory(
+        StripePaymentMethodFactory({})
+      );
+      jest.spyOn(eligibilityService, 'checkEligibility').mockResolvedValue({
+        subscriptionEligibilityResult: EligibilityStatus.CREATE,
+      });
+
+      jest.spyOn(cartManager, 'fetchCartById').mockResolvedValue(mockCart);
+      jest
+        .spyOn(productConfigurationManager, 'retrieveStripePrice')
+        .mockResolvedValue(mockPrice);
+      jest.spyOn(customerManager, 'retrieve').mockResolvedValue(mockCustomer);
+      jest
+        .spyOn(invoiceManager, 'previewUpcoming')
+        .mockResolvedValue(mockUpcomingInvoicePreview);
+      jest
+        .spyOn(invoiceManager, 'preview')
+        .mockResolvedValue(mockLatestInvoicePreview);
+      jest
+        .spyOn(paymentMethodManager, 'retrieve')
+        .mockResolvedValue(mockPaymentMethod);
+
+      const result = await cartService.getCart(mockCart.id);
+      expect(result).toEqual({
+        ...mockCart,
+        upcomingInvoicePreview: mockUpcomingInvoicePreview,
+        latestInvoicePreview: mockLatestInvoicePreview,
+        metricsOptedOut: false,
+        paymentInfo: {
+          type: mockPaymentMethod.type,
+          last4: mockPaymentMethod.card?.last4,
+          brand: mockPaymentMethod.card?.brand,
+          customerSessionClientSecret: mockCustomerSession.client_secret,
+        },
+        hasActiveSubscriptions: true,
+      });
+      expect(
+        'latestInvoicePreview' in result && result.latestInvoicePreview
+      ).not.toEqual(result.upcomingInvoicePreview);
+
+      expect(cartManager.fetchCartById).toHaveBeenCalledWith(mockCart.id);
+      expect(
+        productConfigurationManager.retrieveStripePrice
+      ).toHaveBeenCalledWith(mockCart.offeringConfigId, mockCart.interval);
+      expect(customerManager.retrieve).toHaveBeenCalledWith(
+        mockCart.stripeCustomerId
+      );
+      expect(invoiceManager.previewUpcoming).toHaveBeenCalledWith({
+        priceId: mockPrice.id,
+        currency: mockCart.currency,
+        customer: mockCustomer,
+        taxAddress: mockCart.taxAddress,
+      });
+      expect(invoiceManager.preview).toHaveBeenCalledWith(
+        mockSubscription.latest_invoice
+      );
+    });
+
     it('returns cart and upcomingInvoicePreview if customer is undefined', async () => {
       const mockCart = ResultCartFactory({
         stripeCustomerId: null,

libs/payments/cart/src/lib/cart.service.ts

@@ -789,6 +789,7 @@ export class CartService {
         metricsOptedOut,
         latestInvoicePreview,
         paymentInfo,
+        hasActiveSubscriptions: !!subscriptions.length,
       };
     }
 

libs/payments/cart/src/lib/cart.types.ts

@@ -91,6 +91,7 @@ export type SuccessCartDTO = BaseCartDTO & {
   state: CartState.SUCCESS;
   latestInvoicePreview: Invoice;
   paymentInfo: PaymentInfo;
+  hasActiveSubscriptions: boolean;
 };
 
 export type NeedsInputCartDTO = BaseCartDTO & {

libs/payments/ui/src/lib/server/components/TermsAndPrivacy/index.tsx

@@ -68,6 +68,7 @@ export interface TermsAndPrivacyProps {
   privacyNoticeUrl: string;
   contentServerUrl: string;
   showFXALinks?: boolean;
+  hasActiveSubscriptions?: boolean;
 }
 
 export async function TermsAndPrivacy({
@@ -79,9 +80,10 @@ export async function TermsAndPrivacy({
   privacyNoticeUrl,
   contentServerUrl,
   showFXALinks = false,
+  hasActiveSubscriptions,
 }: TermsAndPrivacyProps) {
   const terms: GenericTermItem[] = [
-    ...buildPaymentTerms(paymentInfo),
+    ...buildPaymentTerms(paymentInfo, hasActiveSubscriptions),
     ...buildFirefoxAccountsTerms(showFXALinks, contentServerUrl),
     ...buildProductTerms(
       productName,

libs/payments/ui/src/lib/utils/terms-and-privacy.ts

@@ -29,10 +29,14 @@ export const PaymentProviders = {
 export type PaymentProvidersType = typeof PaymentProviders;
 export type PaymentProvider = PaymentProvidersType[keyof PaymentProvidersType];
 
-export function buildPaymentTerms(provider?: PaymentInfo): GenericTermItem[] {
+export function buildPaymentTerms(
+  provider?: PaymentInfo,
+  hasActiveSubscriptions?: boolean
+): GenericTermItem[] {
   let providerString = '';
   let titleLocalizationId = '';
-  const providerType = provider ? provider.type : undefined;
+  const providerType =
+    hasActiveSubscriptions && provider ? provider.type : undefined;
   const items: GenericTermsListItem[] = [];
   switch (providerType) {
     case PaymentProviders.stripe: