@rebilly/instruments 1.0.2-beta.8 → 2.1.1-beta.0

package/dist/functions/update.spec.js

@@ -1,11 +1,13 @@
 "use strict";
 
-var _rebillyInstrumentsMock = require("tests/mocks/rebilly-instruments-mock");
+var _rebillyInstrumentsMock = require("../../tests/mocks/rebilly-instruments-mock");
+
+var _asyncUtilities = require("../../tests/async-utilities");
 
 describe('RebillyInstruments Update', () => {
   it('should throw an error when methods are not mounted', async () => {
     const rebillyInstruments = await (0, _rebillyInstrumentsMock.RenderMockRebillyInstruments)();
-    rebillyInstruments.hasMounted = false;
+    rebillyInstruments.state.hasMounted = false;
     let error;
 
     try {
@@ -15,11 +17,11 @@ describe('RebillyInstruments Update', () => {
     }
 
     expect(error).toEqual(new Error('Update method cannot be called before mounting instruments'));
-  }); // TODO: Un skip this test when we activate real time update (currently disabled by feature toggle in update.js) 
+  }); // TODO: Un skip this test when we activate real time update (currently disabled by feature toggle in update.js)
 
   it.skip('should call changeLocale when updating locale options', async () => {
     const rebillyInstruments = await (0, _rebillyInstrumentsMock.RenderMockRebillyInstruments)();
-    const call = jest.fn(); //Simulate mounted iframe
+    const call = jest.fn(); // Simulate mounted iframe
 
     const fakeIFrameComponent = {
       destroy: jest.fn(),
@@ -27,16 +29,14 @@ describe('RebillyInstruments Update', () => {
         call
       }
     };
-    rebillyInstruments.iframeComponents = [fakeIFrameComponent];
+    rebillyInstruments.state.iframeComponents = [fakeIFrameComponent];
     await rebillyInstruments.update({
-      options: {
-        locale: 'ja'
-      }
+      locale: 'ja'
     });
-    expect(call).toBeCalledWith('changeLocale', 'ja'); // It would be better to match real UI instead of implementation state 
+    expect(call).toBeCalledWith('changeLocale', 'ja'); // It would be better to match real UI instead of implementation state
 
-    expect(rebillyInstruments.options.locale).toBe('ja');
-    expect(rebillyInstruments.translate.locale).toBe('ja');
+    expect(rebillyInstruments.state.options.locale).toBe('ja');
+    expect(rebillyInstruments.state.translate.locale).toBe('ja');
   });
   it('should destroy and update when updating options different than locale', async () => {
     const rebillyInstruments = await (0, _rebillyInstrumentsMock.RenderMockRebillyInstruments)();
@@ -44,24 +44,43 @@ describe('RebillyInstruments Update', () => {
     const summaryElement = document.querySelector('.summary-selector');
     expect(formElement.innerHTML).not.toEqual('');
     expect(summaryElement.innerHTML).not.toEqual('');
-    const call = jest.fn(); //Simulate mounted iframe
+    const call = jest.fn(); // Simulate mounted iframe
 
     const fakeIFrameComponent = {
+      destroy: jest.fn(),
       component: {
-        destroy: jest.fn(),
         call
       }
     };
-    rebillyInstruments.iframeComponents = [fakeIFrameComponent];
+    rebillyInstruments.state.iframeComponents = [fakeIFrameComponent];
     await rebillyInstruments.update({
-      options: {
-        intent: {
-          countryCode: 'ES'
-        }
+      countryCode: 'ES'
+    });
+    expect(rebillyInstruments.state.options.countryCode).toEqual('ES');
+    await (0, _asyncUtilities.avoidUnhandledPromises)();
+  });
+  it('should replace the items with different options', async () => {
+    const rebillyInstruments = await (0, _rebillyInstrumentsMock.RenderMockRebillyInstruments)();
+    const formElement = document.querySelector('.form-selector');
+    const summaryElement = document.querySelector('.summary-selector');
+    expect(formElement.innerHTML).not.toEqual('');
+    expect(summaryElement.innerHTML).not.toEqual('');
+    const call = jest.fn(); // Simulate mounted iframe
+
+    const fakeIFrameComponent = {
+      destroy: jest.fn(),
+      component: {
+        call
       }
+    };
+    rebillyInstruments.iframeComponents = [fakeIFrameComponent];
+    await rebillyInstruments.update({
+      items: [{
+        planId: 'test-plan-id-1',
+        quantity: 5
+      }]
     });
-    expect(rebillyInstruments.options.intent.countryCode).toEqual('ES');
-    expect(formElement.innerHTML).toEqual('');
-    expect(summaryElement.innerHTML).toEqual('');
+    expect(rebillyInstruments.state.options.items[0].quantity).toEqual(5);
+    await (0, _asyncUtilities.avoidUnhandledPromises)();
   });
 });

package/dist/i18n/en.json

@@ -10,7 +10,10 @@
     "form": {
       "expressCheckout": "Express checkout",
       "or": "Or",
-      "popupOverlayText": "Click here to show popup window"
+      "popupOverlayText": "Click here to show popup window",
+      "error": {
+        "noPaymentMethods": "No payment methods available for this transaction, please contact support."
+      }
     },
     "paymentMethods": {
       "payment-card": "Payment card"

package/dist/i18n/es.json

@@ -10,7 +10,10 @@
     "form": {
       "expressCheckout": "Chequeo rápido",
       "or": "O pague con",
-      "popupOverlayText": "Haga clic aquí para mostrar la ventana emergente"
+      "popupOverlayText": "Haga clic aquí para mostrar la ventana emergente",
+      "error": {
+        "noPaymentMethods": "No hay métodos de pago disponibles para esta transacción, por favor, póngase en contacto con el servicio de asistencia."
+      }
     },
     "paymentMethods": {
       "payment-card": "Tarjeta de crédito"

package/dist/index.js

@@ -3,15 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.RebillyInstrumentsInstance = void 0;
-
-var _initialize = require("./functions/initialize");
+exports.default = exports.RebillyInstrumentsInstance = exports.InstrumentsState = void 0;
 
 var _mount = require("./functions/mount");
 
 var _purchase = require("./functions/purchase");
 
-var _show = require("./functions/show");
+var _setup = require("./functions/setup");
 
 var _on = require("./functions/on");
 
@@ -19,34 +17,16 @@ var _update = require("./functions/update");
 
 var _destroy = require("./functions/destroy");
 
-var _readyToPay = require("./storefront/ready-to-pay");
-
-var _summary = require("./storefront/summary");
-
-var _plans = require("./storefront/plans");
-
-var _products = require("./storefront/products");
-
-var _purchase2 = require("./storefront/purchase");
-
-var _summary2 = require("./views/summary");
-
-var _methodSelector = require("./views/method-selector");
-
-var _confirmation = require("./views/confirmation");
-
-var _result = require("./views/result");
-
-var _modal = require("./views/modal");
-
 var _loader = require("./loader");
 
 var _i18n = require("./i18n");
 
-class RebillyInstrumentsInstance {
+var _show = require("./functions/show");
+
+class InstrumentsState {
   constructor() {
-    this.configs = null;
     this.options = null;
+    this.data = {};
     this.mountingPoints = null;
     this.storefront = null;
     this.form = null;
@@ -55,36 +35,67 @@ class RebillyInstrumentsInstance {
     this.translate = new _i18n.Translate();
     this.iframeComponents = [];
     this.hasMounted = false;
-    const functionsMap = {
-      // "Private" functions
-      _fetchReadyToPay: _readyToPay.FetchReadyToPay,
-      _fetchSummary: _summary.FetchSummary,
-      _fetchPlans: _plans.FetchPlans,
-      _fetchProducts: _products.FetchProducts,
-      _postPurchase: _purchase2.PostPurchase,
-      _mountSummary: _summary2.MountSummary,
-      _mountMethodSelector: _methodSelector.MountMethodSelector,
-      _mountConfirmation: _confirmation.MountConfirmation,
-      _mountResult: _result.MountResult,
-      _mountModal: _modal.MountModal,
-      _updateSummary: _summary2.UpdateSummary,
-      _updateSelector: _methodSelector.UpdateMethodSelector,
-      // Public Functions
-      initialize: _initialize.Initialize,
-      mount: _mount.Mount,
-      destroy: _destroy.Destroy,
-      update: _update.Update,
-      purchase: _purchase.Purchase,
-      show: _show.Show,
-      on: _on.On
-    }; // eslint-disable-next-line no-restricted-syntax
-
-    for (const local of Object.keys(functionsMap)) {
-      // eslint-disable-next-line func-names
-      this[local] = function (...args) {
-        return functionsMap[local].apply(this, args);
-      };
-    }
+  }
+
+}
+
+exports.InstrumentsState = InstrumentsState;
+
+class RebillyInstrumentsInstance {
+  constructor() {
+    this.state = new InstrumentsState(); // TODO: mountConfirmation, mountResult have different contract shape when they look similar
+    // TODO: review test coverage of UpdateSummary and UpdateMethodSelector as no tests were broken
+    // when commenting them
+  }
+
+  async mount(options) {
+    await (0, _mount.mount)({
+      state: this.state,
+      ...options
+    });
+  }
+
+  async destroy() {
+    await (0, _destroy.destroy)({
+      state: this.state
+    });
+  }
+
+  async update(newOptions) {
+    await (0, _update.update)({
+      state: this.state,
+      newOptions
+    });
+  }
+
+  async purchase(payload) {
+    await (0, _purchase.purchase)({
+      state: this.state,
+      payload
+    });
+  }
+
+  async setup(payload) {
+    await (0, _setup.setup)({
+      state: this.state,
+      payload
+    });
+  }
+
+  async show(componentName, payload) {
+    await (0, _show.show)({
+      state: this.state,
+      componentName,
+      payload
+    });
+  }
+
+  on(eventName, callback) {
+    (0, _on.on)({
+      state: this.state,
+      eventName,
+      callback
+    });
   }
 
 }

package/dist/index.spec.js

@@ -2,35 +2,21 @@
 
 var _index = _interopRequireWildcard(require("./index"));
 
+var _asyncUtilities = require("../tests/async-utilities");
+
 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('RebillyInstruments instance', () => {
   let rebillyInstruments;
-
-  function setupInstance(config = {
-    test: 'value'
-  }) {
-    rebillyInstruments.initialize(config);
-  }
-
   beforeEach(() => {
     rebillyInstruments = _index.default;
   });
   it('should have default export as instance of class', () => {
     expect(_index.default).toBeInstanceOf(_index.RebillyInstrumentsInstance);
   });
-  it('should be initializable', () => {
-    jest.spyOn(rebillyInstruments, 'initialize');
-    const config = {
-      test: 'value'
-    };
-    rebillyInstruments.initialize(config);
-    expect(rebillyInstruments.initialize).toHaveBeenCalledTimes(1);
-    expect(rebillyInstruments.initialize).toHaveBeenCalledWith(config);
-  });
-  it('should be mountable', () => {
+  it('should be mountable', async () => {
     jest.spyOn(rebillyInstruments, 'mount');
     document.body.innerHTML = `
       <div class="form-selector"></div>
@@ -38,18 +24,12 @@ describe('RebillyInstruments instance', () => {
     `;
     const options = {
       form: '.form-selector',
-      test: 'value'
+      summary: '.summary-selector',
+      items: []
     };
-    setupInstance();
-    rebillyInstruments.mount(options);
+    await rebillyInstruments.mount(options);
     expect(rebillyInstruments.mount).toHaveBeenCalledTimes(1);
     expect(rebillyInstruments.mount).toHaveBeenCalledWith(options);
-  });
-  it('should be able to trigger a purchase', () => {
-    jest.spyOn(rebillyInstruments, 'purchase');
-    const instrument = {};
-    setupInstance();
-    rebillyInstruments.purchase(instrument);
-    expect(rebillyInstruments.purchase).toHaveBeenCalledTimes(1);
+    await (0, _asyncUtilities.avoidUnhandledPromises)();
   });
 });

package/dist/loader/index.js

@@ -27,11 +27,8 @@ class Loader {
     section = 'form',
     el = null
   } = {}) {
-    const minHeight = '200px';
-
     if ((0, _isDomElement.default)(el)) {
       el.style.position = 'relative';
-      el.style.minHeight = minHeight;
       this.DOM[section] = el;
     }
   }
@@ -42,6 +39,7 @@ class Loader {
   } = {}) {
     var _this$DOM;
 
+    const minHeight = '200px';
     this[section].push(id);
 
     if ((_this$DOM = this.DOM) !== null && _this$DOM !== void 0 && _this$DOM[section]) {
@@ -50,6 +48,8 @@ class Loader {
       } else {
         this.DOM[section].querySelector('.rebilly-instruments-loader').classList.add('is-active');
       }
+
+      this.DOM[section].style.minHeight = minHeight;
     }
   }
 
@@ -65,6 +65,7 @@ class Loader {
 
     if (!this[section].length && this.DOM[section].querySelector('.rebilly-instruments-loader')) {
       this.DOM[section].querySelector('.rebilly-instruments-loader').classList.remove('is-active');
+      this.DOM[section].style.minHeight = '';
     }
   }
 

package/dist/storefront/index.js

@@ -3,10 +3,43 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.validateStateForStorefront = validateStateForStorefront;
+exports.Endpoint = Endpoint;
 exports.default = exports.StorefrontInstance = void 0;
 
 var _rebillyJsSdk = require("rebilly-js-sdk");
 
+function validateStateForStorefront({
+  state
+}) {
+  if (!state.storefront) {
+    throw new Error('Could not access rebilly-js-sdk instance');
+  }
+
+  if (!state.options) {
+    throw new Error('Could not use Rebilly Instruments mount options to fetch Rebilly data');
+  }
+}
+
+async function Endpoint({
+  state
+} = {}, callback) {
+  try {
+    validateStateForStorefront({
+      state
+    });
+    return await callback();
+  } catch (error) {
+    // TODO: standard error handling for all endpoints
+    // console.error(error);
+    if (error.status === 422) {
+      error.details.forEach(e => console.error(e));
+    }
+
+    throw error;
+  }
+}
+
 class StorefrontInstance {
   constructor({
     publishableKey = null,

package/dist/storefront/invoices.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchInvoice = fetchInvoice;
+
+var _invoiceModel = _interopRequireDefault(require("./models/invoice-model"));
+
+var _index = require("./index");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+async function fetchInvoice({
+  data = null,
+  state = null
+}) {
+  return (0, _index.Endpoint)({
+    state
+  }, async () => {
+    state.storefront.setSessionToken(state.options.customerJwt);
+    const {
+      fields
+    } = await state.storefront.invoices.get(data);
+    return new _invoiceModel.default(fields);
+  });
+}

package/dist/storefront/models/base-model.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+class BaseModel {
+  constructor({ ...fields
+  } = {}) {
+    Object.entries(fields).forEach(([key, value]) => {
+      this[key] = value;
+    });
+  }
+
+}
+
+exports.default = BaseModel;

package/dist/storefront/models/invoice-model.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _baseModel = _interopRequireDefault(require("./base-model"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class InvoiceModel extends _baseModel.default {}
+
+exports.default = InvoiceModel;

package/dist/storefront/models/plan-model.js

@@ -5,41 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-class PlanModel {
-  constructor({
-    id = '',
-    name = '',
-    productId = '',
-    productOptions = {},
-    currency = '',
-    currencySign = '',
-    pricing = {},
-    recurringInterval = {},
-    trial = null,
-    isTrialOnly = false,
-    setup = null,
-    customFields = {},
-    createdTime = '',
-    updatedTime = '',
-    invoiceTimeShift = {}
-  } = {}) {
-    this.id = id;
-    this.name = name;
-    this.productId = productId;
-    this.productOptions = productOptions;
-    this.currency = currency;
-    this.currencySign = currencySign;
-    this.pricing = pricing;
-    this.recurringInterval = recurringInterval;
-    this.trial = trial;
-    this.isTrialOnly = isTrialOnly;
-    this.setup = setup;
-    this.customFields = customFields;
-    this.createdTime = createdTime;
-    this.updatedTime = updatedTime;
-    this.invoiceTimeShift = invoiceTimeShift;
-  }
+var _baseModel = _interopRequireDefault(require("./base-model"));
 
-}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class PlanModel extends _baseModel.default {}
 
 exports.default = PlanModel;

package/dist/storefront/models/product-model.js

@@ -5,29 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-class ProductModel {
-  constructor({
-    id = '',
-    name = '',
-    unitLabel = '',
-    description = {},
-    requiresShipping = false,
-    options = [],
-    customFields = {},
-    createdTime = '',
-    updatedTime = ''
-  } = {}) {
-    this.id = id;
-    this.name = name;
-    this.unitLabel = unitLabel;
-    this.description = description;
-    this.requiresShipping = requiresShipping;
-    this.options = options;
-    this.customFields = customFields;
-    this.createdTime = createdTime;
-    this.updatedTime = updatedTime;
-  }
+var _baseModel = _interopRequireDefault(require("./base-model"));
 
-}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class ProductModel extends _baseModel.default {}
 
 exports.default = ProductModel;

package/dist/storefront/models/summary-model.js

@@ -5,51 +5,38 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.SummaryDiscountModel = exports.SummaryTaxModel = exports.SummaryLineItemModel = void 0;
 
-class SummaryLineItemModel {
+var _baseModel = _interopRequireDefault(require("./base-model"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class SummaryLineItemModel extends _baseModel.default {
   constructor({
-    type = '',
-    description = '',
     unitPrice = 0.0,
     quantity = 0,
     price = 0.0,
-    planId = '',
-    productId = ''
+    ...fields
   } = {}) {
-    this.type = type;
-    this.description = description;
+    super(fields);
     this.unitPrice = unitPrice;
     this.quantity = quantity;
     this.price = price;
-    this.planId = planId;
-    this.productId = productId;
   }
 
 }
 
 exports.SummaryLineItemModel = SummaryLineItemModel;
 
-class SummaryTaxModel {
-  constructor({
-    amount = '',
-    description = ''
-  } = {}) {
-    this.amount = amount;
-    this.description = description;
-  }
-
-}
+class SummaryTaxModel extends _baseModel.default {}
 
 exports.SummaryTaxModel = SummaryTaxModel;
 
-class SummaryDiscountModel {
+class SummaryDiscountModel extends _baseModel.default {
   constructor({
-    couponId = '',
     amount = 0,
-    description = ''
-  } = {}) {
-    this.couponId = couponId;
+    ...fields
+  }) {
+    super(fields);
     this.amount = amount;
-    this.description = description;
   }
 
 }

package/dist/storefront/models/transaction-model.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _baseModel = _interopRequireDefault(require("./base-model"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class TransactionModel extends _baseModel.default {
+  constructor({
+    invoiceIds = [],
+    ...fields
+  }) {
+    super(fields);
+    this.invoiceIds = invoiceIds || [];
+  }
+
+  get invoiceId() {
+    return this.invoiceIds[0] || null;
+  }
+
+  get hasInvoice() {
+    return !!this.invoiceId;
+  }
+
+}
+
+exports.default = TransactionModel;