Merge pull request #15012 from mozilla/train-253-uplift-4

Train 253 - Uplift 4

Author: StaberindeZA

packages/fxa-auth-server/test/local/payments/stripe.js

@@ -4607,6 +4607,47 @@ describe('#integration - StripeHelper', () => {
             const actual = await stripeHelper.subscriptionsToResponse(input);
             assert.deepEqual(actual, expected);
           });
+
+          it('formats the subscription, when total_excluding_tax and subtotal_excluding_tax are not set', async () => {
+            const missingExcludingTaxPaidInvoice = deepCopy(paidInvoice);
+            delete missingExcludingTaxPaidInvoice.total_excluding_tax;
+            delete missingExcludingTaxPaidInvoice.subtotal_excluding_tax;
+            const latestInvoiceItems = stripeInvoiceToLatestInvoiceItemsDTO(
+              missingExcludingTaxPaidInvoice
+            );
+            const input = { data: [subscription1] };
+            sandbox
+              .stub(stripeHelper.stripe.invoices, 'retrieve')
+              .resolves(missingExcludingTaxPaidInvoice);
+            const callback = sandbox.stub(stripeHelper, 'expandResource');
+            callback.onCall(0).resolves(missingExcludingTaxPaidInvoice);
+            callback.onCall(1).resolves({ id: productId, name: productName });
+            const expected = [
+              {
+                _subscription_type: MozillaSubscriptionTypes.WEB,
+                created: subscription1.created,
+                current_period_end: subscription1.current_period_end,
+                current_period_start: subscription1.current_period_start,
+                cancel_at_period_end: false,
+                end_at: null,
+                plan_id: subscription1.plan.id,
+                product_id: product1.id,
+                product_name: productName,
+                status: 'active',
+                subscription_id: subscription1.id,
+                failure_code: undefined,
+                failure_message: undefined,
+                latest_invoice: paidInvoice.number,
+                latest_invoice_items: latestInvoiceItems,
+                promotion_code: null,
+                promotion_duration: null,
+                promotion_end: null,
+              },
+            ];
+
+            const actual = await stripeHelper.subscriptionsToResponse(input);
+            assert.deepEqual(actual, expected);
+          });
         });
 
         describe('when the subscription is set to cancel', () => {

packages/fxa-auth-server/test/local/routes/validators.js

@@ -849,6 +849,20 @@ describe('lib/routes/validators:', () => {
       assert.ok(!res.error);
     });
 
+    it('accepts a Stripe subscription with missing or undefined optional parameters', () => {
+      const stripeSubMissing = deepCopy(stripeSub);
+      const stripeSubUndefined = deepCopy(stripeSub);
+      delete stripeSubMissing.latest_invoice_items.subtotal_excluding_tax;
+      stripeSubUndefined.latest_invoice_items.subtotal_excluding_tax =
+        undefined;
+
+      const res =
+        validators.subscriptionsMozillaSubscriptionsValidator.validate({
+          subscriptions: [stripeSubMissing, stripeSubUndefined],
+        });
+      assert.ok(!res.error);
+    });
+
     it('accepts a list with only Google Play subscriptions', () => {
       const res =
         validators.subscriptionsMozillaSubscriptionsValidator.validate({

packages/fxa-payments-server/src/components/PaymentConfirmation/index.stories.tsx

@@ -9,7 +9,7 @@ import { Customer, Profile, Plan } from '../../store/types';
 import { PAYPAL_CUSTOMER } from '../../lib/mock-data';
 import { MozillaSubscriptionTypes } from 'fxa-shared/subscriptions/types';
 import { Meta } from '@storybook/react';
-import { LatestInvoiceItems } from 'fxa-shared/dto/auth/payments/invoice';
+import { FirstInvoicePreview } from 'fxa-shared/dto/auth/payments/invoice';
 
 export default {
   title: 'components/PaymentConfirmation',
@@ -49,7 +49,7 @@ const selectedPlanWithMetadata: Plan = {
   },
 };
 
-const invoice: LatestInvoiceItems = {
+const invoice: FirstInvoicePreview = {
   line_items: [],
   subtotal: 735,
   subtotal_excluding_tax: null,

packages/fxa-shared/dto/auth/payments/invoice.ts

@@ -137,8 +137,21 @@ export type subsequentInvoicePreview = {
 
 export type subsequentInvoicePreviewsSchema = Array<subsequentInvoicePreview>;
 
-export interface LatestInvoiceItems extends FirstInvoicePreview {}
+export interface LatestInvoiceItems
+  extends Omit<
+    FirstInvoicePreview,
+    'subtotal_excluding_tax' | 'total_excluding_tax'
+  > {
+  subtotal_excluding_tax?: number | null;
+  total_excluding_tax?: number | null;
+}
 
-export const latestInvoiceItemsSchema = firstInvoicePreviewSchema;
+export const latestInvoiceItemsSchema = firstInvoicePreviewSchema.fork(
+  ['subtotal_excluding_tax', 'total_excluding_tax'],
+  (schema) => schema.optional().allow(null)
+);
 
-export type latestInvoiceItemsSchema = firstInvoicePreviewSchema;
+export type latestInvoiceItemsSchema = firstInvoicePreviewSchema & {
+  subtotal_excluding_tax?: number | null;
+  total_excluding_tax?: number | null;
+};