@rebilly/instruments 2.0.0-beta → 3.0.1-beta.0

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

@@ -3,56 +3,76 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.validateOptions = validateOptions;
+exports.default = exports.defaults = void 0;
 
 var _lodash = _interopRequireDefault(require("lodash.merge"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _default = (options = {}) => {
-  const {
-    _dev
-  } = options; // TODO: validate options
-
-  const _computed = {
-    paymentMethodsUrl: _dev ? _dev.paymentMethodsUrl || 'https://forms.local.rebilly.dev:3000' : 'https://forms.secure-payments.app'
-  };
-  const defaults = {
-    countryCode: 'US',
-    locale: 'auto',
-    paymentInstruments: {
-      address: {
-        name: 'default',
-        region: 'default',
-        hide: [],
-        show: [],
-        require: []
-      },
-      compactExpressInstruments: true,
-      googlePay: {
-        displayOptions: {
-          buttonColor: 'black',
-          buttonType: 'short',
-          buttonHeight: '44px'
-        }
-      },
-      applePay: {
-        displayOptions: {
-          buttonColor: 'black',
-          buttonType: 'plain',
-          buttonHeight: '44px'
-        }
-      },
-      paymentCard: {
-        popup: false
+const defaults = {
+  countryCode: 'US',
+  locale: 'auto',
+  theme: {
+    labels: 'floating'
+  },
+  paymentInstruments: {
+    address: {
+      name: 'default',
+      region: 'default',
+      hide: [],
+      show: [],
+      require: []
+    },
+    compactExpressInstruments: true,
+    googlePay: {
+      displayOptions: {
+        buttonColor: 'black',
+        buttonType: 'short',
+        buttonHeight: '44px'
+      }
+    },
+    applePay: {
+      displayOptions: {
+        buttonColor: 'black',
+        buttonType: 'plain',
+        buttonHeight: '44px'
       }
     },
-    features: {
-      autoConfirmation: true,
-      autoResult: true
+    paymentCard: {
+      popup: false
     }
+  },
+  transactionType: 'purchase',
+  features: {
+    autoConfirmation: true,
+    autoResult: true
+  }
+};
+exports.defaults = defaults;
+
+function validateOptions(options) {
+  // TODO: validate more options
+  const purchaseData = [options.items, options.invoiceId, options.money, options.transactionId].filter(v => v);
+
+  if (purchaseData.length === 0) {
+    throw new Error('Must provide purchase data');
+  }
+
+  if (purchaseData.length > 1) {
+    throw new Error('Must provide only one purchase data type');
+  }
+}
+
+var _default = ({
+  options = {}
+} = {}) => {
+  validateOptions(options);
+  const _computed = {
+    paymentMethodsUrl: options._dev ? options._dev.paymentMethodsUrl || 'https://forms.local.rebilly.dev:3000' : 'https://forms.secure-payments.app'
   };
-  const combinedOptions = (0, _lodash.default)(defaults, {
+  const combinedOptions = (0, _lodash.default)({ ...defaults
+  }, {
     organizationId: options.organizationId,
     publishableKey: options.publishableKey,
     websiteId: options.websiteId,
@@ -60,18 +80,19 @@ var _default = (options = {}) => {
     i18n: options.i18n,
     theme: options.theme,
     css: options.css,
-    items: options.items,
     locale: options.locale,
     countryCode: options.countryCode,
     features: options.features,
     paymentInstruments: options.paymentInstruments,
+    transactionType: options.transactionType,
     _computed
-  });
-
-  if (_dev) {
-    combinedOptions._dev = _dev;
-  }
+  }); // Add optional key's
 
+  ['items', 'money', 'invoiceId', 'transactionId', 'customerJwt', '_dev'].forEach(key => {
+    if (options[key]) {
+      combinedOptions[key] = options[key];
+    }
+  });
   return combinedOptions;
 };
 

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

@@ -0,0 +1,66 @@
+"use strict";
+
+var _rebillyInstrumentsMock = require("../../../tests/mocks/rebilly-instruments-mock");
+
+var _setupOptions = _interopRequireWildcard(require("./setup-options"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+describe('Setup mount options', () => {
+  it("should fill with default options", () => {
+    const options = (0, _setupOptions.default)({
+      options: {
+        items: [{
+          planId: "test-plan-id",
+          quantity: 1
+        }]
+      }
+    });
+    expect(options).toMatchObject(_setupOptions.defaults);
+  });
+  it("should setup options from mount", async () => {
+    const options = {
+      publishableKey: 'test-publishable-key',
+      organizationId: 'test-organization-id',
+      websiteId: 'test-website-id',
+      invoiceId: 'test-invoice-id',
+      customerJwt: 'test-customer-jwt'
+    };
+    const rebillyInstruments = await (0, _rebillyInstrumentsMock.RenderMockRebillyInstruments)(options);
+    expect(rebillyInstruments.state.options).toMatchObject(options);
+  });
+});
+describe('Validate mount options', () => {
+  it("should throw an error with no purchase data", async () => {
+    let error = null;
+
+    try {
+      const options = {};
+      (0, _setupOptions.validateOptions)(options);
+    } catch (e) {
+      error = e;
+    }
+
+    expect(error.message).toBe('Must provide purchase data');
+  });
+  it("should throw error if there are more than one purchase property", () => {
+    let error = null;
+
+    try {
+      const options = {
+        invoiceId: "test-invoice-id",
+        items: [{
+          planId: "test-plan-id",
+          quantity: 1
+        }]
+      };
+      (0, _setupOptions.validateOptions)(options);
+    } catch (e) {
+      error = e;
+    }
+
+    expect(error.message).toBe('Must provide only one purchase data type');
+  });
+});

package/dist/functions/mount/setup-storefront.js

@@ -10,10 +10,12 @@ var _storefront = _interopRequireDefault(require("../../storefront"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var _default = ({
-  publishableKey,
-  orgnizationId,
-  apiMode,
-  _dev
+  options: {
+    publishableKey,
+    orgnizationId,
+    apiMode,
+    _dev
+  }
 }) => {
   const storefront = {
     publishableKey,

package/dist/functions/mount/setup-styles.js

@@ -10,8 +10,10 @@ var _style = require("../../style");
 var _utils = require("../../utils");
 
 var _default = async ({
-  theme = {},
-  css
+  options: {
+    theme = {},
+    css
+  }
 } = {}) => {
   // Adds base stylesheet
   const style = await (0, _style.mainStyle)(theme || {});

package/dist/functions/purchase.js

@@ -3,6 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.makePayment = makePayment;
+exports.makePurchase = makePurchase;
+exports.handleApprovalUrl = handleApprovalUrl;
 exports.purchase = purchase;
 
 var _purchase = require("../storefront/purchase");
@@ -11,43 +14,145 @@ var _events = _interopRequireDefault(require("../events"));
 
 var _modal = require("../views/modal");
 
+var _fetchData = require("./mount/fetch-data");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+async function makePayment({
+  state,
+  payload
+}) {
+  const {
+    _raw: {
+      id: token
+    }
+  } = payload;
+  const data = {
+    token,
+    ...payload
+  };
+
+  if (state.options.invoiceId) {
+    data.invoiceId = state.options.invoiceId;
+  }
+
+  if (state.options.transactionId) {
+    data.transactionId = state.options.transactionId;
+  }
+
+  if (state.options.money) {
+    data.websiteId = state.options.websiteId;
+    data.amount = state.options.money.amount;
+    data.currency = state.options.money.currency;
+  }
+
+  let {
+    fields
+  } = await (0, _purchase.postPayment)({
+    state,
+    data
+  });
+  fields = {
+    transaction: fields,
+    token: fields.token || state.options.customerJwt
+  };
+
+  if (state.data.invoice) {
+    fields.invoice = state.data.invoice;
+  }
+
+  return fields;
+}
+
+async function makePurchase({
+  state,
+  payload
+}) {
+  const {
+    fields
+  } = await (0, _purchase.postPurchase)({
+    state,
+    data: {
+      websiteId: state.options.websiteId,
+      items: state.options.items,
+      paymentInstruction: {
+        token: payload._raw.id
+      },
+      ...payload
+    }
+  });
+  return fields;
+}
+
+function handleApprovalUrl({
+  state,
+  fields
+}) {
+  const {
+    paymentMethodsUrl
+  } = state.options._computed;
+  const model = {};
+
+  if (state.data.isPayment) {
+    model.payment = fields;
+  } else {
+    model.purchase = fields;
+  }
+
+  state.data = new _fetchData.DataInstance({
+    state,
+    ...fields
+  });
+  (0, _modal.mountModal)({
+    state,
+    name: 'rebilly-instruments-approval-url',
+    url: `${paymentMethodsUrl}/approval-url`,
+    model,
+    close: updatedPurchase => {
+      _events.default.purchaseCompleted.dispatch(updatedPurchase);
+    }
+  });
+}
+
 async function purchase({
   state,
-  payload: purchasePayload
+  payload
 }) {
   try {
-    const {
-      fields: purchaseFields
-    } = await (0, _purchase.postPurchase)({
-      state,
-      data: purchasePayload
-    });
-
-    if (purchaseFields.transaction.approvalUrl) {
-      const {
-        paymentMethodsUrl
-      } = state.options._computed;
-      (0, _modal.mountModal)({
+    var _fields$transaction;
+
+    let fields;
+
+    if (state.data.isPayment) {
+      fields = await makePayment({
         state,
-        name: 'rebilly-instruments-approval-url',
-        url: `${paymentMethodsUrl}/approval-url`,
-        model: {
-          purchase: purchaseFields
-        },
-        close: updatedPurchase => {
-          // TODO: Check if this is purchase...
-          _events.default.purchaseCompleted.dispatch(updatedPurchase);
-        }
+        payload
       });
     } else {
-      _events.default.purchaseCompleted.dispatch(purchaseFields);
+      fields = await makePurchase({
+        state,
+        payload
+      });
     }
 
-    return purchaseFields;
+    if ((_fields$transaction = fields.transaction) !== null && _fields$transaction !== void 0 && _fields$transaction.approvalUrl) {
+      handleApprovalUrl({
+        state,
+        fields
+      });
+    } else {
+      _events.default.purchaseCompleted.dispatch(fields);
+    }
+
+    return fields;
   } catch (error) {
     // TODO: Display error to customer
+    console.error(error);
+
+    if (error.status === 422) {
+      error.details.forEach(e => console.error(e));
+    }
+
     return error;
   }
 }

package/dist/functions/purchase.spec.js

@@ -18,12 +18,10 @@ describe('RebillyInstruments purchase', () => {
   it('should be able to make a purchase', async () => {
     const options = {
       websiteId: 'test-website-id',
-      intent: {
-        items: [{
-          planId: 'test-plan-id',
-          quantity: 1
-        }]
-      }
+      items: [{
+        planId: 'test-plan-id',
+        quantity: 1
+      }]
     };
     const token = {
       id: 'test-token-id'
@@ -45,11 +43,16 @@ describe('RebillyInstruments purchase', () => {
     };
     (0, _server.when)((0, _mswWhenThen.post)(`${_storefrontApiMock.storefrontURL}/purchase`)).thenReturn((0, _mswWhenThen.ok)(fields));
     const rebillyInstruments = await (0, _rebillyInstrumentsMock.RenderMockRebillyInstruments)(options);
-    jest.spyOn(rebillyInstruments.state.storefront.purchase, 'purchase');
+    const spyStorefrontPurchase = jest.spyOn(rebillyInstruments.state.storefront.purchase, 'purchase');
     jest.spyOn(_events.default.purchaseCompleted, 'dispatch');
     const purchaseCompletedListener = jest.fn();
     rebillyInstruments.on('purchase-completed', purchaseCompletedListener);
     const purchasePayload = {
+      billingAddress,
+      deliveryAddress,
+      _raw: token
+    };
+    const purchasePayloadParsed = {
       websiteId: rebillyInstruments.state.options.websiteId,
       items: rebillyInstruments.state.options.items,
       billingAddress,
@@ -59,9 +62,9 @@ describe('RebillyInstruments purchase', () => {
       }
     };
     await rebillyInstruments.purchase(purchasePayload);
-    expect(rebillyInstruments.state.storefront.purchase.purchase).toBeCalledTimes(1);
-    expect(rebillyInstruments.state.storefront.purchase.purchase).toBeCalledWith(expect.objectContaining({
-      data: purchasePayload
+    expect(spyStorefrontPurchase).toBeCalledTimes(1);
+    expect(spyStorefrontPurchase).toBeCalledWith(expect.objectContaining({
+      data: purchasePayloadParsed
     }));
     expect(_events.default.purchaseCompleted.dispatch).toBeCalledTimes(1);
     expect(purchaseCompletedListener).toBeCalledTimes(1);

package/dist/functions/setup.js

@@ -0,0 +1,85 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setup = setup;
+
+var _paymentInstruments = require("../storefront/payment-instruments");
+
+var _events = _interopRequireDefault(require("../events"));
+
+var _modal = require("../views/modal");
+
+var _fetchData = require("./mount/fetch-data");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+async function setup({
+  state,
+  payload
+}) {
+  try {
+    var _state$options;
+
+    const {
+      instrument,
+      transaction
+    } = await (0, _paymentInstruments.setupPaymentInstrument)({
+      state,
+      data: {
+        token: payload._raw.id,
+        websiteId: (_state$options = state.options) === null || _state$options === void 0 ? void 0 : _state$options.websiteId,
+        ...payload
+      }
+    });
+    state.data = new _fetchData.DataInstance({
+      state,
+      instrument,
+      transaction
+    });
+
+    if (transaction.approvalUrl) {
+      const {
+        paymentMethodsUrl
+      } = state.options._computed;
+      (0, _modal.mountModal)({
+        state,
+        name: 'rebilly-instruments-approval-url',
+        url: `${paymentMethodsUrl}/approval-url`,
+        model: {
+          setup: {
+            transaction
+          }
+        },
+        close: ({
+          transaction: updatedTransaction = transaction
+        }) => {
+          _events.default.setupCompleted.dispatch({
+            instrument,
+            transaction: updatedTransaction
+          });
+        }
+      });
+    } else {
+      _events.default.setupCompleted.dispatch({
+        instrument,
+        transaction
+      });
+    }
+
+    return {
+      instrument,
+      transaction
+    };
+  } catch (error) {
+    // TODO: Display error to customer
+    console.error(error);
+
+    if (error.status === 422) {
+      error.details.forEach(e => console.error(e));
+    }
+
+    return error;
+  }
+}

package/dist/functions/setup.spec.js

@@ -0,0 +1,87 @@
+"use strict";
+
+var _rebillyInstrumentsMock = require("../../tests/mocks/rebilly-instruments-mock");
+
+var _mswWhenThen = require("msw-when-then");
+
+var _server = require("../../tests/msw/server");
+
+var _storefrontApiMock = require("../../tests/mocks/storefront-api-mock");
+
+var _events = _interopRequireDefault(require("../events"));
+
+var _asyncUtilities = require("../../tests/async-utilities");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+describe('RebillyInstruments setup', () => {
+  it('should be able to setup a payment instrument', async () => {
+    const options = {
+      websiteId: 'test-website-id',
+      money: {
+        amount: 30,
+        currency: 'USD'
+      },
+      transactionType: 'setup'
+    };
+    const token = {
+      id: 'test-token-id'
+    };
+    const billingAddress = {
+      billing: 'address'
+    };
+    const deliveryAddress = {
+      delivery: 'address'
+    };
+    const paymentInstrumentFields = {
+      id: 'payment-instrument-id'
+    };
+    const paymentInstrumentSetupFields = {
+      id: 'payment-instrument-id',
+      approvalUrl: null
+    };
+    (0, _server.when)((0, _mswWhenThen.post)(`${_storefrontApiMock.storefrontURL}/payment-instruments`)).thenReturn((0, _mswWhenThen.ok)(paymentInstrumentFields));
+    (0, _server.when)((0, _mswWhenThen.post)(`${_storefrontApiMock.storefrontURL}/payment-instruments/*/setup`)).thenReturn((0, _mswWhenThen.ok)(paymentInstrumentSetupFields));
+    const rebillyInstruments = await (0, _rebillyInstrumentsMock.RenderMockRebillyInstruments)(options);
+    const spyCreatePaymentInstrument = jest.spyOn(rebillyInstruments.state.storefront.paymentInstruments, 'create');
+    const spySetupPaymentInstrument = jest.spyOn(rebillyInstruments.state.storefront.paymentInstruments, 'setup');
+    const spyDispatchSetupCompleted = jest.spyOn(_events.default.setupCompleted, 'dispatch');
+    const setupCompletedListener = jest.fn();
+    rebillyInstruments.on('setup-completed', setupCompletedListener);
+    const setupPayload = {
+      billingAddress,
+      deliveryAddress,
+      ...options.money,
+      _raw: token
+    };
+    rebillyInstruments.mock.data({
+      previewPurchase: {
+        currency: 'USD',
+        total: 30
+      }
+    });
+    await rebillyInstruments.setup(setupPayload);
+    expect(spyCreatePaymentInstrument).toBeCalledTimes(1);
+    expect(spyCreatePaymentInstrument).toBeCalledWith(expect.objectContaining({
+      data: expect.objectContaining({
+        token: token.id
+      })
+    }));
+    expect(spySetupPaymentInstrument).toBeCalledTimes(1);
+    expect(spySetupPaymentInstrument).toBeCalledWith(expect.objectContaining({
+      id: expect.stringContaining(paymentInstrumentFields.id),
+      data: expect.objectContaining({
+        websiteId: rebillyInstruments.state.options.websiteId,
+        currency: 'USD',
+        amount: 30
+      })
+    }));
+    expect(spyDispatchSetupCompleted).toBeCalledTimes(1);
+    expect(setupCompletedListener).toBeCalledTimes(1);
+    expect(setupCompletedListener).toBeCalledWith(expect.objectContaining({
+      instrument: paymentInstrumentFields,
+      transaction: paymentInstrumentSetupFields
+    }));
+    await (0, _asyncUtilities.avoidUnhandledPromises)();
+  });
+});

package/dist/functions/show.js

@@ -32,8 +32,10 @@ async function show({
         iframe.destroy();
         return false;
       });
-      payload.state = state;
-      (0, _result.mountResult)(payload);
+      (0, _result.mountResult)({
+        payload,
+        state
+      });
       break;
 
     case 'confirmation':
@@ -41,8 +43,10 @@ async function show({
         iframe.destroy();
         return false;
       });
-      payload.state = state;
-      (0, _confirmation.mountConfirmation)(payload);
+      (0, _confirmation.mountConfirmation)({
+        payload,
+        state
+      });
       break;
 
     default: