@rebilly/instruments 3.25.0-beta.0 → 3.26.0-beta.0

package/package.json

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

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

@@ -106,7 +106,7 @@ export class DataInstance {
   }
 
   toPostmatesModel() {
-    return {
+    return JSON.parse(JSON.stringify({
       ...this,
       amountAndCurrency: this.amountAndCurrency,
       isPayment: this.isPayment,
@@ -115,7 +115,7 @@ export class DataInstance {
       summaryItems: this.summaryItems,
       summaryLineItems: this.summaryLineItems,
       isShippingRequired: this.isShippingRequired
-    }
+    }))
   }
 }
 

package/src/functions/mount/setup-options.js

@@ -60,24 +60,23 @@ export function sanitizeOptions(options) {
 export function validateOptions(options) {
   // TODO: validate more options
   const purchaseData = [
-    options.jwt,
     options.items,
     options.invoiceId,
     options.money,
     options.transactionId,
   ].filter(v => v);
 
-  if (purchaseData.length === 0) {
+  if (!options.jwt && purchaseData.length === 0) {
     throw new Error('Must provide purchase data');
   }
 
   if (purchaseData.length > 1) {
-    // JWT can be alone or with specific invoiceId or transactionId
-    if (options.jwt && (options.invoiceId || options.transactionId)) {
-      return
-    }
     throw new Error('Must provide only one purchase data type');
   }
+
+  if (!options.jwt && (options.invoiceId || options.transactionId)) {
+    throw new Error('Must provide a jwt');
+  }
 }
 
 export default ({
@@ -121,6 +120,7 @@ export default ({
       claims: {
         transactionId,
         invoiceId,
+        websiteId,
       }
     } = decodeJwt(combinedOptions.jwt);
 
@@ -133,6 +133,10 @@ export default ({
     if (invoiceId) {
       combinedOptions.invoiceId = invoiceId;
     }
+
+    if (websiteId) {
+      combinedOptions.websiteId = websiteId;
+    }
   }
 
   if (options.items) {

package/src/functions/mount/setup-user-flow.js

@@ -39,9 +39,16 @@ export default ({state = {}}) => {
 
   if (state.options.features.autoResult) {
     on({
-      eventName: state.options.transactionType === 'setup' ?
-        'setup-completed' : 'purchase-completed',
+      eventName: 'purchase-completed',
       callback: (payload) => {
+        payload = JSON.parse(JSON.stringify(payload));
+        showResult({state, payload});
+      }
+    });
+    on({
+      eventName: 'setup-completed',
+      callback: (payload) => {
+        payload = JSON.parse(JSON.stringify(payload));
         showResult({state, payload});
       }
     });

package/src/functions/purchase.js

@@ -99,12 +99,13 @@ export async function makePurchase({ payload }) {
 export function handleApprovalUrl({fields, payload}) {
   if (payload.redirectUrl || !fields.transaction?.approvalUrl) {
     const { paymentMethodsUrl } = state.options._computed;
+    const modelSafeFields = JSON.parse(JSON.stringify(fields));
 
     const model = {};
     if (state.data.isPayment) {
-      model.payment = fields;
+      model.payment = modelSafeFields;
     } else {
-      model.purchase = fields;
+      model.purchase = modelSafeFields;
     }
   
     state.data = new DataInstance({...fields});

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

@@ -16,6 +16,7 @@ export class ReadyToPayFeatureModel {
     // Paypal fields
     paypalMerchantId = '',
     billingAgreementToken = '',
+    paypalClientId = '',
 
     // Plaid fields
     linkToken = '',
@@ -31,6 +32,7 @@ export class ReadyToPayFeatureModel {
 
     this.paypalMerchantId = paypalMerchantId;
     this.billingAgreementToken = billingAgreementToken;
+    this.paypalClientId = paypalClientId;
 
     this.linkToken = linkToken;
   }

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

@@ -5,6 +5,57 @@ import { Endpoint } from './index';
 import state from '../state';
 import { mapItemsQuantities } from '../utils/quantity';
 
+export function filterReadyToPay(readyToPay) {
+  const paymentMethodsMetadata = [...paymentMethodsFile];
+  const EXPRESS_METHODS = [
+    'Google Pay',
+    'Apple Pay',
+    'paypal',
+  ];
+  const BLOCKED_METHODS = [
+    // account number, routing number, and account type required
+    'echeck',
+
+    // payment instrument is required
+    // card number is required
+    // card cvv is required
+    // expiration month is required
+    // expiration year is required
+    'Khelocard',
+    
+    // Klarna authorization token is required
+    // Klarna session ID is required
+    'Klarna',
+  ];
+  const isExpressMethod = ({ method, feature }) => (
+    EXPRESS_METHODS.includes(method) ||
+    EXPRESS_METHODS.includes(feature?.name)
+  );
+  return readyToPay
+    .filter(readyData => {
+      // Remove result for "old" paypal method
+      const isOldPayPal = readyData.method === 'paypal' && !readyData.feature;
+      // Remove result for plaid method
+      const isPlaid = readyData.method === 'ach' && readyData.feature;
+      // Remove result for blocked method
+      const isBlocked = BLOCKED_METHODS.includes(readyData.method)
+
+      return !isOldPayPal && !isPlaid && !isBlocked
+    })
+    .map((fields, index) => {
+      const metadata = paymentMethodsMetadata
+        .find(methodMetadata => methodMetadata.apiName === fields.method) || {};
+      metadata.isExpressMethod = isExpressMethod(fields);
+
+      return new ReadyToPayModel({
+        index,
+        metadata,
+        ...fields
+      });
+    })
+    .filter(({metadata}) => metadata.storefrontEnabled);
+}
+
 export async function fetchReadyToPay({
   riskMetadata = null,
 }) {
@@ -36,22 +87,7 @@ export async function fetchReadyToPay({
 
     const { fields: readyToPayFields } = await state.storefront.purchase.readyToPay({ data });
     const readyToPay = Object.values(readyToPayFields);
-    const paymentMethodsMetadata = [...paymentMethodsFile];
-
-    return readyToPay
-      // Remove result for "old" paypal method
-      .filter((fields) => !(fields.method === 'paypal' && !fields.feature))
-      // Remove Plaid payment method
-      .filter((fields) => !(fields.method === 'ach' && fields.feature))
-      .map((fields, index) => {
-        const metadata = paymentMethodsMetadata
-          .find(methodMetadata => methodMetadata.apiName === fields.method);
-
-        return new ReadyToPayModel({
-          index,
-          metadata,
-          ...fields
-        });
-      });
+    
+    return filterReadyToPay(readyToPay);
   });
 }

package/src/style/base/index.js

@@ -437,8 +437,8 @@ export const vars = (theme) => `
 
 /* Methods */
 .rebilly-instruments-methods-loader-card-icon {
-  width: 32px;
-  height: 22px;
+  width: calc(var(--rebilly-fontLineHeightBase) + 10px);
+  height: var(--rebilly-fontLineHeightBase);
   margin-left: var(--rebilly-spacing2xs);
   margin-bottom: var(--rebilly-spacing2xs);
 }

package/src/views/common/iframe/base-iframe.js

@@ -1,6 +1,4 @@
 import Postmate from 'popostmate';
-import { SUPPORTED_METHODS } from '../../method-selector/get-payment-methods';
-import { basicLoaderHTML } from '../../../loader';
 
 export default class BaseIframe {
   constructor({
@@ -48,10 +46,6 @@ export default class BaseIframe {
       },
     };
 
-    if (SUPPORTED_METHODS.includes(this.name)) {
-      this.container.insertAdjacentHTML('beforeend', basicLoaderHTML);
-    }
-
     const component = await new Postmate({
       name: this.name,
       url: this.url,

package/src/views/errors.js

@@ -60,6 +60,7 @@ export function clearError() {
 }
 
 export function showError(error) {
+  if (!error) return;
   const errorContainer = document.querySelector('#rebilly-instruments-error');
   if (!errorContainer) return ;
 

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

@@ -1,28 +1,5 @@
 import state from '../../state';
 
-// TODO: Express methods should be filtered from RTP some how
-export const SUPPORTED_EXPRESS_METHODS = [
-  'Google Pay',
-  'Apple Pay',
-  'paypal',
-];
-
-// 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) ||
-    SUPPORTED_EXPRESS_METHODS.includes(feature?.name)
-  );
-
-const isSupportedMethod = ({ method }) => SUPPORTED_METHODS.includes(method);
-
 export function getPaymentMethods() {
   const result = {
     EXPRESS_METHODS: [],
@@ -30,9 +7,9 @@ export function getPaymentMethods() {
   };
 
   state.data.readyToPay?.forEach((method) => {
-    if (isExpressMethod(method)) {
+    if (method.metadata.isExpressMethod) {
       result.EXPRESS_METHODS.push(method);
-    } else if (isSupportedMethod(method)) {
+    } else {
       result.METHODS.push(method);
     }
   });

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

@@ -1,31 +1,35 @@
+import { StorefontTestingInstance } from 'tests/mocks/storefront-mock';
 import { getPaymentMethods } from './get-payment-methods';
-import ReadyToPayModel from '@/storefront/models/ready-to-pay-model';
+import { ok, post } from 'msw-when-then';
+import { when } from 'tests/msw/server';
+import { storefrontURL } from 'tests/mocks/storefront-api-mock';
+import { fetchReadyToPay } from '../../storefront/ready-to-pay';
 import state from 'src/state';
 
-it('should only return the allowed methods', () => {
-  state.data = {
-    readyToPay: [
-      new ReadyToPayModel({
-        method: 'payment-card',
-        feature: {
-          name: 'Google Pay',
-          merchantName: 'google-pay-merchant-name',
-          merchantOrigin: 'google-pay-merchant-origin'
-        },
-        brands: ['Visa'],
-        filters: []
-      }),
-      new ReadyToPayModel({
-        method: 'fake-method',
-        filters: []
-      }),
-      new ReadyToPayModel({
-        method: 'payment-card',
-        brands: ['Visa'],
-        filters: []
-      })
-    ]
-  }
+it('should only return the allowed methods', async () => {
+  StorefontTestingInstance();
+  when(
+    post(`${storefrontURL}/ready-to-pay`)
+  ).thenReturn(
+    ok([{
+      method: 'payment-card',
+      feature: {
+        name: 'Google Pay',
+        merchantName: 'google-pay-merchant-name',
+        merchantOrigin: 'google-pay-merchant-origin'
+      },
+      brands: ['Visa'],
+      filters: []
+    }, {
+      method: 'fake-method',
+      filters: []
+    }, {
+      method: 'payment-card',
+      brands: ['Visa'],
+      filters: []
+    }])
+  );
+  state.data.readyToPay = await fetchReadyToPay({});
 
   const results = getPaymentMethods();
   expect(results.hasOwnProperty('EXPRESS_METHODS')).toEqual(true);