@rebilly/instruments 3.16.5-beta.0 → 3.19.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebilly/instruments",
-  "version": "3.16.5-beta.0",
+  "version": "3.19.0-beta.0",
   "author": "Rebilly",
   "license": "MIT",
   "main": "dist/index.js",

package/src/functions/purchase.js

@@ -81,30 +81,40 @@ export async function makePurchase({ state, payload }) {
   return fields;
 }
 
-export function handleApprovalUrl({state, fields}) {
-  const { paymentMethodsUrl } = state.options._computed;
+export function handleApprovalUrl({state, fields, payload}) {
+  if (payload.redirectUrl || !fields.transaction?.approvalUrl) {
+    const { paymentMethodsUrl } = state.options._computed;
 
-  const model = {};
-  if (state.data.isPayment) {
-    model.payment = fields;
-  } else {
-    model.purchase = fields;
-  }
-
-  state.data = new DataInstance({state, ...fields});
-
-  mountModal({
-    state,
-    name: 'rebilly-instruments-approval-url',
-    url: `${paymentMethodsUrl}/approval-url`,
-    model,
-    close: (updatedPurchase) => {
-      Events.purchaseCompleted.dispatch(updatedPurchase);
+    const model = {};
+    if (state.data.isPayment) {
+      model.payment = fields;
+    } else {
+      model.purchase = fields;
     }
-  });
+  
+    state.data = new DataInstance({state, ...fields});
+  
+    mountModal({
+      state,
+      name: 'rebilly-instruments-approval-url',
+      url: `${paymentMethodsUrl}/approval-url`,
+      model,
+      close: (updatedPurchase) => {
+        Events.purchaseCompleted.dispatch(updatedPurchase);
+      }
+    });
+  } else if (fields.transaction?.approvalUrl) {
+    window.location = fields.transaction?.approvalUrl
+  }  
 }
 
 export async function purchase({ state, payload }) {
+  Object.keys(payload).forEach(key => {
+    if (payload[key] === null) {
+      delete payload[key];
+    }
+  });
+
   try {
     let fields;
     if (state.data.isPayment) {
@@ -114,7 +124,7 @@ export async function purchase({ state, payload }) {
     }
 
     if (fields.transaction?.approvalUrl && fields.transaction?.result === 'unknown') {
-      handleApprovalUrl({state, fields});
+      handleApprovalUrl({state, fields, payload});
     } else {
       Events.purchaseCompleted.dispatch(fields);
     }

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/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();