@rebilly/instruments 3.8.4-beta.0 → 3.9.2-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebilly/instruments",
-  "version": "3.8.4-beta.0",
+  "version": "3.9.2-beta.0",
   "author": "Rebilly",
   "main": "dist/index.js",
   "unpkg": "dist/index.min.js",
@@ -37,8 +37,8 @@
     "babel-plugin-module-resolver": "^4.1.0",
     "component-emitter": "^1.3.0",
     "jest": "^27.0.6",
-    "msw": "^0.23.0",
-    "msw-when-then": "^1.4.0",
+    "msw": "0.38.2",
+    "msw-when-then": "^1.5.1",
     "rollup": "^2.35.1",
     "rollup-plugin-ignore": "^1.0.10",
     "rollup-plugin-polyfill-node": "^0.8.0",

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

@@ -5,6 +5,7 @@ import { fetchReadyToPay } from '../../storefront/ready-to-pay';
 import { fetchSummary } from '../../storefront/summary';
 import { fetchInvoice as FetchInvoice } from '../../storefront/invoices';
 import { fetchTransaction as FetchTransaction } from '../../storefront/transactions';
+import { fetchAccount as FetchAccount } from '../../storefront/account';
 
 export class DataInstance {
   constructor({
@@ -104,12 +105,14 @@ export async function fetchData({
   riskMetadata = null,
   summaryPayload = null,
 
-  // Dependancy injectable functions
+  // Dependency injectable functions
   fetchInvoice = FetchInvoice,
-  fetchTransaction = FetchTransaction
+  fetchTransaction = FetchTransaction,
+  fetchAccount = FetchAccount
 }) {
   try {
     let transaction = null;
+    let account = null;
     if (state.options?.transactionId) {
       transaction = await fetchTransaction({data: {
         id: state.options.transactionId
@@ -130,11 +133,16 @@ export async function fetchData({
       riskMetadata = data;
     }
 
+    if (state.options?.jwt) {
+      account = await fetchAccount({state});
+    }
+
     state.data = new DataInstance({
       state,
       invoice,
       transaction,
-      riskMetadata
+      riskMetadata,
+      account,
     });
 
     const [readyToPay, previewPurchase] = await Promise.all([

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

@@ -72,6 +72,35 @@ describe('fetchData function', () => {
     expect(mockFetchInvoice).toBeCalledTimes(0);
  
   });
+
+  it('Should fetch account when JWT is supplied', async () => {
+    const mockFetchAccount = jest.fn();
+    const accountState = {
+      options: {
+        jwt: 'TEST_JWT'
+      }
+    }
+
+    await fetchData({
+      state: accountState,
+      fetchAccount: mockFetchAccount,
+    });
+
+    expect(mockFetchAccount).toBeCalledTimes(1);
+  });
+
+  it('Should not fetch account when there JWT is not supplied', async () => {
+    const mockFetchAccount = jest.fn();
+
+    await fetchData({
+      state: {
+        options: {}
+      },
+      fetchAccount: mockFetchAccount,
+    });
+
+    expect(mockFetchAccount).toBeCalledTimes(0);
+  });
 });
 
 describe('DataInstance', () => {

package/src/functions/mount/mount.spec.js

@@ -1,11 +1,4 @@
-import { RenderMockRebillyInstruments } from 'tests/mocks/rebilly-instruments-mock';
-import { RebillyInstrumentsInstance } from '@rebilly/instruments';
-import { get, ok, post } from 'msw-when-then';
-import { when } from 'tests/msw/server';
-import { storefrontURL } from 'tests/mocks/storefront-api-mock';
-import PlanModel from '@/storefront/models/plan-model';
-import ProductModel from '@/storefront/models/product-model';
-import SummaryModel from '@/storefront/models/summary-model';
+import {RenderMockRebillyInstruments} from 'tests/mocks/rebilly-instruments-mock';
 
 describe('RebillyInstruments instance', () => {
   it('should inject HTML to the merchant\'s website', async () => {

package/src/storefront/account.js

@@ -0,0 +1,11 @@
+import AccountModel from './models/account-model';
+import { Endpoint } from './index';
+
+export async function fetchAccount({ state = null }) {
+  return Endpoint({state}, async () => {
+    state.storefront.setSessionToken(state.options.jwt);
+    const {fields} = await state.storefront.account.get();
+
+    return new AccountModel(fields);
+  });
+}

package/src/storefront/models/account-model.js

@@ -0,0 +1,39 @@
+import BaseModel from './base-model';
+
+export class AddressModel {
+  constructor({
+    firstName = null,
+    lastName = null,
+    organization = null,
+    address = null,
+    address2 = null,
+    city = null,
+    region = null,
+    country = null,
+    postalCode = null,
+    emails = [],
+    phoneNumbers = [],
+  } = {}) {
+    this.firstName = firstName;
+    this.lastName = lastName;
+    this.organization = organization;
+    this.address = address;
+    this.address2 = address2;
+    this.city = city;
+    this.region = region;
+    this.country = country;
+    this.postalCode = postalCode;
+    this.email = emails.find(v => v.primary)?.value || null;
+    this.phoneNumber = phoneNumbers.find(v => v.primary)?.value || null;
+  }
+}
+
+export default class AccountModel extends BaseModel {
+  constructor({
+    primaryAddress = null,
+    ...fields
+  } = {}) {
+    super(fields);
+    this.address = new AddressModel(primaryAddress);
+  }
+}

package/src/views/method-selector/express-methods/index.js

@@ -22,4 +22,4 @@ export default async function mountExpressMethod({ state, METHOD_ID }) {
   });
 
   state.iframeComponents.push(iframe);
-}
+}

package/src/views/method-selector/mount-methods.js

@@ -65,6 +65,7 @@ export function MountMethods({
         'payment-card'
       ].includes(methodId) && state.options.paymentInstruments[methodType]?.popup;
     const model = {
+      account: state.data?.account,
       options: state.options,
       mainStyle: state.mainStyle,
       plans: state.data.plans,

package/tests/mocks/storefront-api-mock.js

@@ -1,4 +1,4 @@
-import { ok, get, post } from 'msw-when-then';
+import {ok, get, post} from 'msw-when-then';
 
 export const storefrontURL = '*/storefront';
 
@@ -8,22 +8,26 @@ export const initStoreFrontApiMocks = (when) => {
   })());
 
   when(post(`${storefrontURL}/preview-purchase`)).thenReturn((() => {
-    return ok({})
+    return ok({});
   })());
 
   when(get(`${storefrontURL}/plans`)).thenReturn((() => {
-    return ok([])
+    return ok([]);
   })());
 
   when(get(`${storefrontURL}/products`)).thenReturn((() => {
-    return ok([])
+    return ok([]);
   })());
 
   when(post(`${storefrontURL}/payment-instruments`)).thenReturn((() => {
-    return ok([])
+    return ok([]);
   })());
-  
+
   when(post(`${storefrontURL}/payment-instruments/*/setup`)).thenReturn((() => {
-    return ok([])
+    return ok([]);
+  })());
+
+  when(get(`${storefrontURL}/transactions/test-transaction-id`)).thenReturn((() => {
+    return ok({});
   })());
 };

package/tests/msw/server.js

@@ -1,11 +1,10 @@
 import {setupServer} from 'msw/node';
 import {rest} from 'msw';
 import {whenThen} from 'msw-when-then';
-import {handlers} from './handlers';
 import {initStoreFrontApiMocks} from '../mocks/storefront-api-mock';
 import {initRebillyApiMocks} from '../mocks/rebilly-api-mock';
 
-export const server = setupServer(...handlers);
+export const server = setupServer();
 
 export const {when} = whenThen(server, rest);
 

package/tests/msw/handlers.js

@@ -1,37 +0,0 @@
-const withFallback = (resolver) => {
-  return {
-      predicate () {
-      // Match all requests, regardless of URL, method, etc.
-          return true;
-      },
-      resolver
-  };
-};
-
-export const handlers = [
-  withFallback((params, params2) => {
-      // Handle any requests that didn't match the existing handlers.
-      // Throw exceptions, or return a mocked response.
-
-      // params: {
-      //     url: URL {},
-      //     method: 'GET',
-      //     body: '',
-      //     headers: Headers { map: [Object] },
-      //     cookies: {},
-      //     params: {},
-      //     redirect: 'manual',
-      //     referrer: '',
-      //     keepalive: false,
-      //     cache: 'default',
-      //     mode: 'cors',
-      //     referrerPolicy: 'no-referrer',
-      //     integrity: '',
-      //     destination: 'document',
-      //     bodyUsed: false,
-      //     credentials: 'same-origin'
-      //   }
-
-      throw Error(`UNHANDLED URL!!! Url: ${params.url} method: ${params.method}}`);
-  })
-];