@rebilly/instruments 3.16.4-beta.0 → 3.18.1-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebilly/instruments",
-  "version": "3.16.4-beta.0",
+  "version": "3.18.1-beta.0",
   "author": "Rebilly",
   "license": "MIT",
   "main": "dist/index.js",
@@ -37,7 +37,7 @@
     "component-emitter": "^1.3.0",
     "core-js": "3.23.3",
     "jest": "^27.0.6",
-    "msw": "0.38.2",
+    "msw": "0.45.0",
     "msw-when-then": "^1.5.1",
     "rollup": "^2.35.1",
     "rollup-plugin-ignore": "^1.0.10",

package/src/functions/mount/fetch-data.js

@@ -147,11 +147,10 @@ export async function fetchData({
 
     let productsPromise;
     if (state.options?.invoiceId || state.data?.transaction?.hasInvoice) {
-      const { invoice, products } = await fetchInvoiceAndProducts(
-        {
-          data: {
-            id: state.options?.invoiceId || state.data?.transaction?.invoiceId
-          },
+      const { invoice, products } = await fetchInvoiceAndProducts({
+        data: {
+          id: state.options?.invoiceId || state.data?.transaction?.invoiceId
+        },
         state,
       });
       productsPromise = Promise.resolve(products);

package/src/storefront/index.js

@@ -1,6 +1,8 @@
 import RebillyApi, {RebillyStorefrontAPI, RebillyExperimentalAPI} from 'rebilly-js-sdk';
 import { showError } from '../views/errors';
 
+const TIMEOUT = 60000;
+
 export function validateStateForStorefront({state}) {
   if (!state.storefront) {
     throw new Error('Could not access rebilly-js-sdk instance');
@@ -31,7 +33,7 @@ export class StorefrontInstance {
     jwt = null,
     organizationId = null,
     mode = 'live',
-    timeout = 10000,
+    timeout = TIMEOUT,
     liveUrl = null,
     sandboxUrl = null
   } = {}) {
@@ -44,7 +46,7 @@ export class StorefrontInstance {
       organizationId,
       sandbox: mode === 'sandbox',
       timeout: Number.isNaN(parseInt(timeout, 10))
-        ? 10000
+        ? TIMEOUT
         : parseInt(timeout, 10),
       urls
     };

package/src/storefront/invoices.js

@@ -10,7 +10,8 @@ export async function fetchInvoiceAndProducts({ data = null, state = null }) {
       expand: 'items.*.product'
     });
 
-    const products = fields.items.map(items => new ProductModel(items._embedded.product));
+    const products = fields.items.filter(item => item._embedded)
+                                 .map(items => new ProductModel(items._embedded.product));
 
     return {
       products,

package/src/storefront/invoices.spec.js

@@ -53,4 +53,36 @@ describe('Storefront Invoices', () => {
       }
     `);
   });
+
+  it('can fetch an invoice when it does not have any products', async () => {
+    const id = '1234';
+    const testInvoice = {
+      id: 'test-invoice-id-1',
+      items: [
+        {
+          id: 'test',
+          price: 0.99,
+        }
+      ]
+    };
+
+    when(get(`${storefrontURL}/invoices/${id}`)).thenReturn(ok(testInvoice));
+
+    const instance = new StorefontTestingInstance({
+      data: {
+        invoice: {
+          id
+        }
+      }
+    });
+  
+    const { invoice, products } = await fetchInvoiceAndProducts({
+      data: { id },
+      state: instance
+    });
+
+    expect(invoice).toBeInstanceOf(InvoiceModel);
+    expect(products).toBeInstanceOf(Array);
+    expect(products.length).toBe(0);
+  });
 });

package/src/storefront/ready-to-pay.js

@@ -42,9 +42,10 @@ export async function fetchReadyToPay({
     }
 
     const { fields: readyToPayFields } = await state.storefront.purchase.readyToPay({ data });
+    const readyToPay = Object.values(readyToPayFields);
     const paymentMethodsMetadata = [...paymentMethodsFile];
 
-    return Object.values(readyToPayFields)
+    return readyToPay
       // Remove result for "old" paypal method
       .filter((fields) => !(fields.method === 'paypal' && !fields.feature))
       // Remove Plaid payment method

package/src/views/method-selector/get-payment-methods.js

@@ -1,6 +1,18 @@
-const SUPPORTED_EXPRESS_METHODS = ['Google Pay', 'Apple Pay', 'paypal'];
+// TODO: Express methods should be filtered from RTP some how
+export const SUPPORTED_EXPRESS_METHODS = [
+  'Google Pay',
+  'Apple Pay',
+  'paypal',
+];
 
-export const SUPPORTED_METHODS = ['payment-card', 'ach', 'cryptocurrency'];
+// TODO: Supported methods should be aimed to be not needed
+// eventually moving to a BLOCKED_METHODS
+export const SUPPORTED_METHODS = [
+  'payment-card',
+  'ach',
+  'cryptocurrency',
+  'bitcoin'
+];
 
 const isExpressMethod = ({ method, feature }) => (
     SUPPORTED_EXPRESS_METHODS.includes(method) ||

package/src/views/method-selector/get-payment-methods.spec.js

@@ -20,7 +20,7 @@ class TestInstance {
           filters: []
         }),
         new ReadyToPayModel({
-          method: 'bitcoin',
+          method: 'fake-method',
           filters: []
         }),
         new ReadyToPayModel({

package/src/views/modal.js

@@ -67,7 +67,12 @@ export async function mountModal({
     modalOverlay.classList.remove('is-visible');
     setTimeout(() => {
       document.body.style.overflow = 'auto';
-      modalOverlay.children.forEach((child) => child.remove());
+
+      const list = modalOverlay.children;
+      for (let i = 0; i < list.length; i += 1) {
+        list[i].remove();
+      }
+
       modalOverlay.remove();
       close(...args);
       iframe.destroy();