@rebilly/instruments 4.4.0 → 4.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebilly/instruments",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "author": "Rebilly",
   "license": "MIT",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
     "build": "yarn rollup -c --environment NODE_ENV:production",
     "dev": "yarn rollup -c --watch --environment NODE_ENV:development",
     "test:unit": "vitest run",
-    "test:unit:watch": "vitest --watchAll"
+    "test:unit:watch": "vitest"
   },
   "dependencies": {
     "@babel/cli": "^7.21.5",
@@ -26,7 +26,7 @@
     "lodash.kebabcase": "^4.1.1",
     "lodash.merge": "^4.6.2",
     "popostmate": "2.0.0",
-    "rebilly-js-sdk": "^47.14.2",
+    "rebilly-js-sdk": "*",
     "values.js": "^2.0.0"
   },
   "devDependencies": {

package/src/data/options-schema/schemas/options-schema.js

@@ -343,6 +343,10 @@ export default {
           type: 'boolean',
           default: true,
         },
+        fullPageRedirect: {
+          type: 'boolean',
+          default: false,
+        },
         showCoupons: {
           type: 'array',
           items: {

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

@@ -19,7 +19,7 @@ describe('Setup options function', () => {
         errorLogs.push(error.message);
       }
     });
-    
+
     const options = {
       apiMode: 'sandbox',
       items: [{
@@ -94,7 +94,7 @@ describe('Setup options function', () => {
         },
         paymentCard: { popup: false }
       },
-      features: { autoConfirmation: true, autoResult: true },
+      features: { autoConfirmation: true, autoResult: true, fullPageRedirect: false },
       _computed: { paymentMethodsUrl: 'https://forms.secure-payments.app' },
       organizationId: 'MERCHANT-TEST-ID-A',
       invoiceId: 'in_TEST-A',
@@ -109,7 +109,7 @@ describe('Setup options function', () => {
         errorLogs.push(error);
       }
     });
-    
+
     expect(() => setupOptions()).toThrow(RebillyInstrumentsConfigError);
     expect(errorLogs.length).toEqual(6);
     const expectedResults = [
@@ -161,7 +161,7 @@ describe('Setup options function', () => {
           apiMode: 'sandbox',
           ...test
         }
-  
+
         expect(() => setupOptions({options})).toThrow(RebillyInstrumentsConfigError);
         expect(errorLogs.length).toEqual(1);
         expect(errorLogs[0]).toEqual(`options must have property jwt when property ${key} is present`);
@@ -264,7 +264,7 @@ describe('Setup options handleNestedPropertiesDefaultValues function', () => {
 
 describe('Setup options handleJwtDestructuring function', () => {
   const testJwt = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJqd3RfVEVTVC1BIiwiZXhwIjoxNzE0ODQwNDg5LCJpYXQiOjE2ODMyMTY1ODkuNTYwMjU2LCJhY2wiOlt7InNjb3BlIjp7Im9yZ2FuaXphdGlvbklkIjpbIm9yZ19URVNULUEiXSwiaW52b2ljZUlkIjpbImluX1RFU1QtQSJdLCJjdXN0b21GaWVsZE5hbWUiOlsiU0lOTGFzdDQiXX0sInBlcm1pc3Npb25zIjpbMjg0LDI4Niw0MTQsNDE1LDQzNCw0MTIsNDI0LDQyNSw0MjYsNDI3LDQyOCw0MjksNDA5LDQxMCw0MDEsNDAyLDQzMyw0MzFdfV0sImNsYWltcyI6eyJ3ZWJzaXRlSWQiOiJ3ZWJfVEVTVC1BIiwiaW52b2ljZUlkIjoiaW5fVEVTVC1BIiwicGF5bWVudE1ldGhvZHMiOltdfSwibWVyY2hhbnQiOiJNRVJDSEFOVC1URVNULUlELUEiLCJjdXN0b21lciI6eyJpZCI6ImN1c19URVNULUEiLCJuYW1lIjoiQ2FyZCBIb2xkZXIgTmFtZSIsImNyZWF0ZWRUaW1lIjoiMjAyMi0wOS0yMVQxODo1MDoyMiswMDowMCJ9fQ.tm33uioGUSpEedHeYufDGm-p1YW40eufNovppcU6-xg';
-  
+
   it('should destructure when jwt is present', () => {
     const options = {
       jwt: testJwt,

package/src/functions/purchase.js

@@ -103,6 +103,13 @@ export async function makePurchase({ payload }) {
 }
 
 export function handleApprovalUrl({fields, payload}) {
+  if (state.options.features.fullPageRedirect && 
+    (payload.redirectUrl || fields.transaction?.approvalUrl)
+  ) {
+    window.location = payload.redirectUrl || fields.transaction?.approvalUrl;
+    return;
+  }
+
   if (payload.redirectUrl || !fields.transaction?.approvalUrl) {
     const { paymentMethodsUrl } = state.options._computed;
     const modelSafeFields = JSON.parse(JSON.stringify(fields));
@@ -140,13 +147,16 @@ export async function purchase({ payload }) {
   try {
     let fields;
     if (state.data.isPayment) {
-      fields = await makePayment({ state, payload });
+      fields = await makePayment({ payload });
     } else {
-      fields = await makePurchase({ state, payload });
+      fields = await makePurchase({ payload });
     }
-
     if (fields.transaction?.approvalUrl && fields.transaction?.result === 'unknown') {
-      handleApprovalUrl({state, fields, payload});
+      if (state.options.features.fullPageRedirect) {
+        window.location = fields.transaction?.approvalUrl
+      } else {
+        handleApprovalUrl({fields, payload});
+      }
     } else {
       Events.purchaseCompleted.dispatch(fields);
     }

package/src/functions/setup.js

@@ -36,20 +36,24 @@ export async function setup({ payload }) {
     state.data = new DataInstance({instrument, transaction});
 
     if (transaction.approvalUrl && transaction.result === 'unknown') {
-      const { paymentMethodsUrl } = state.options._computed;
-      mountModal({
-        name: 'rebilly-instruments-approval-url',
-        url: `${paymentMethodsUrl}/approval-url`,
-        model: {
-          setup: {transaction}
-        },
-        close: ({transaction: updatedTransaction = transaction}) => {
-          Events.setupCompleted.dispatch({
-            instrument,
-            transaction: updatedTransaction
-          });
-        }
-      });
+      if (state.options.features.fullPageRedirect) {
+        window.location = transaction.approvalUrl
+      } else {
+        const { paymentMethodsUrl } = state.options._computed;
+        mountModal({
+          name: 'rebilly-instruments-approval-url',
+          url: `${paymentMethodsUrl}/approval-url`,
+          model: {
+            setup: {transaction}
+          },
+          close: ({transaction: updatedTransaction = transaction}) => {
+            Events.setupCompleted.dispatch({
+              instrument,
+              transaction: updatedTransaction
+            });
+          }
+        });
+      }
     } else {
       Events.setupCompleted.dispatch({instrument, transaction});
     }