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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebilly/instruments",
-  "version": "3.25.0-beta.0",
+  "version": "3.25.1-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/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);
 }