@rebilly/instruments 3.20.0-beta.0 → 3.21.1-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebilly/instruments",
-  "version": "3.20.0-beta.0",
+  "version": "3.21.1-beta.0",
   "author": "Rebilly",
   "license": "MIT",
   "main": "dist/index.js",
@@ -23,7 +23,7 @@
     "lodash.kebabcase": "^4.1.1",
     "lodash.merge": "^4.6.2",
     "popostmate": "^1.6.4",
-    "rebilly-js-sdk": "^47.13.2",
+    "rebilly-js-sdk": "^47.14.2",
     "values.js": "^2.0.0"
   },
   "devDependencies": {

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

@@ -5,7 +5,7 @@ import { fetchReadyToPay } from '../../storefront/ready-to-pay';
 import { fetchSummary } from '../../storefront/summary';
 import { fetchInvoiceAndProducts as FetchInvoiceAndProducts } from '../../storefront/invoices';
 import { fetchTransaction as FetchTransaction } from '../../storefront/transactions';
-import { fetchAccount as FetchAccount } from '../../storefront/account';
+import { fetchAccountAndWebsite as FetchAccountAndWebsite } from '../../storefront/account-and-website';
 import { fetchPaymentInstrument as FetchInstruments } from '../../storefront/payment-instruments';
 
 export class DataInstance {
@@ -124,7 +124,7 @@ export async function fetchData({
   // Dependency injectable functions
   fetchInvoiceAndProducts = FetchInvoiceAndProducts,
   fetchTransaction = FetchTransaction,
-  fetchAccount = FetchAccount,
+  fetchAccountAndWebsite = FetchAccountAndWebsite,
   fetchInstruments = FetchInstruments
 }) {
   try {
@@ -135,8 +135,9 @@ export async function fetchData({
     let accountPromise = Promise.resolve(null);
     let availableInstrumentsPromise = null;
     if (state.options?.jwt) {
-      accountPromise = fetchAccount({state}).then(account => {
+      accountPromise = fetchAccountAndWebsite({state}).then(({account, website}) => {
         state.data.account = account;
+        state.data.website = website;
       });
       availableInstrumentsPromise = fetchInstruments({state});
     }

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

@@ -75,7 +75,7 @@ describe('fetchData function', () => {
   });
 
   it('Should fetch account when JWT is supplied', async () => {
-    const mockFetchAccount = jest.fn();
+    const mockFetchAccountAndWebsite = jest.fn();
     const accountState = {
       options: {
         jwt: 'TEST_JWT'
@@ -84,23 +84,23 @@ describe('fetchData function', () => {
 
     await fetchData({
       state: accountState,
-      fetchAccount: mockFetchAccount,
+      fetchAccountAndWebsite: mockFetchAccountAndWebsite,
     });
 
-    expect(mockFetchAccount).toBeCalledTimes(1);
+    expect(mockFetchAccountAndWebsite).toBeCalledTimes(1);
   });
 
   it('Should not fetch account when there JWT is not supplied', async () => {
-    const mockFetchAccount = jest.fn();
+    const mockFetchAccountAndWebsite = jest.fn();
 
     await fetchData({
       state: {
         options: {}
       },
-      fetchAccount: mockFetchAccount,
+      fetchAccountAndWebsite: mockFetchAccountAndWebsite,
     });
 
-    expect(mockFetchAccount).toBeCalledTimes(0);
+    expect(mockFetchAccountAndWebsite).toBeCalledTimes(0);
   });
 });
 

package/src/storefront/account-and-website.js

@@ -0,0 +1,15 @@
+import AccountModel from './models/account-model';
+import WebsiteModel from './models/website-model';
+import { Endpoint } from './index';
+
+export async function fetchAccountAndWebsite({ state = null }) {
+  return Endpoint({state}, async () => {
+    state.storefront.setSessionToken(state.options.jwt);
+    const {fields} = await state.storefront.account.get({expand: 'website'});
+
+    return {
+      website: new WebsiteModel(fields._embedded?.website),
+      account: new AccountModel(fields),
+    }
+  });
+}

package/src/storefront/account-and-website.spec.js

@@ -0,0 +1,73 @@
+import { StorefontTestingInstance } from 'tests/mocks/storefront-mock';
+import { ok, get } from 'msw-when-then';
+import { when } from 'tests/msw/server';
+import { storefrontURL } from 'tests/mocks/storefront-api-mock';
+import { fetchAccountAndWebsite } from './account-and-website';
+import AccountModel, { AddressModel } from './models/account-model';
+import WebsiteModel from './models/website-model';
+
+describe('Storefront API Account', () => {
+  it('should handle fetch a customer with a null primary address', async () => {
+    const options = {
+      jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzYjBkNTRkOS0xNmM4LTRlZDAtYjljMy01ODAyZmQ4YzE2ZTIiLCJleHAiOjE2ODY2OTc0MTQuODQxMjUsImlhdCI6MTY1NTE2MTQxNC44Nzk4OTEsImFjbCI6W3sic2NvcGUiOnsib3JnYW5pemF0aW9uSWQiOlsiMzY0NEFGTEFKMUciXSwicGF5bWVudE1ldGhvZHMiOlsicGF5bWVudC1jYXJkIl19LCJwZXJtaXNzaW9ucyI6WzI4NCwyODYsNDE0LDQxNSw0MzQsNDExLDQxMiw0MTMsNDI0LDQyNSw0MjYsNDI3LDQyOCw0MjksNDA5LDQxMCw0MDEsNDAyLDQzMyw0ODgsNDg3XX1dLCJjbGFpbXMiOnsid2Vic2l0ZUlkIjoiZGVtby13ZWJzaXRlIiwidHJhbnNhY3Rpb25JZCI6IjRiZDE3N2NmLTFlY2EtNDA2Yy04OWI0LTEzYzMzODk5NzlmMCIsInBheW1lbnRNZXRob2RzIjpbInBheW1lbnQtY2FyZCJdfSwibWVyY2hhbnQiOiIzNjQ0QUZMQUoxRyIsImN1c3RvbWVyIjp7ImlkIjoidGVzdC1jdXN0b21lci1pZCIsIm5hbWUiOiJUZXN0IEN1c3RvbWVyIE5hbWUiLCJjcmVhdGVkVGltZSI6IjIwMjItMDctMTRUMDA6MDA6MDArMDA6MDAifX0.VPue9QBhRGe3vvncaD47w84N8Bv2hEeShUl6SlNqoOQ',
+      items: [
+        {
+          planId: 'test-plan-id',
+          quantity: 1
+        }
+      ]
+    };
+
+    when(get(`${storefrontURL}/acount`)).thenReturn(
+      ok({
+        defaultPaymentInstrument: null,
+        id: "test-customer-id",
+        primaryAddress: null,
+        websiteId: "test-website-id",
+      })
+    );
+
+    const instance = StorefontTestingInstance({
+      options
+    });
+
+    jest.spyOn(instance.storefront.account, 'get');
+
+    const response = await fetchAccountAndWebsite({ state: instance });
+    expect(response.account.address).toEqual(new AddressModel({}));
+  })
+
+  it('should return an object with account and website', async () => {
+    const options = {
+      jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzYjBkNTRkOS0xNmM4LTRlZDAtYjljMy01ODAyZmQ4YzE2ZTIiLCJleHAiOjE2ODY2OTc0MTQuODQxMjUsImlhdCI6MTY1NTE2MTQxNC44Nzk4OTEsImFjbCI6W3sic2NvcGUiOnsib3JnYW5pemF0aW9uSWQiOlsiMzY0NEFGTEFKMUciXSwicGF5bWVudE1ldGhvZHMiOlsicGF5bWVudC1jYXJkIl19LCJwZXJtaXNzaW9ucyI6WzI4NCwyODYsNDE0LDQxNSw0MzQsNDExLDQxMiw0MTMsNDI0LDQyNSw0MjYsNDI3LDQyOCw0MjksNDA5LDQxMCw0MDEsNDAyLDQzMyw0ODgsNDg3XX1dLCJjbGFpbXMiOnsid2Vic2l0ZUlkIjoiZGVtby13ZWJzaXRlIiwidHJhbnNhY3Rpb25JZCI6IjRiZDE3N2NmLTFlY2EtNDA2Yy04OWI0LTEzYzMzODk5NzlmMCIsInBheW1lbnRNZXRob2RzIjpbInBheW1lbnQtY2FyZCJdfSwibWVyY2hhbnQiOiIzNjQ0QUZMQUoxRyIsImN1c3RvbWVyIjp7ImlkIjoidGVzdC1jdXN0b21lci1pZCIsIm5hbWUiOiJUZXN0IEN1c3RvbWVyIE5hbWUiLCJjcmVhdGVkVGltZSI6IjIwMjItMDctMTRUMDA6MDA6MDArMDA6MDAifX0.VPue9QBhRGe3vvncaD47w84N8Bv2hEeShUl6SlNqoOQ',
+      items: [
+        {
+          planId: 'test-plan-id',
+          quantity: 1
+        }
+      ]
+    };
+
+    when(get(`${storefrontURL}/acount`)).thenReturn(
+      ok({
+        defaultPaymentInstrument: null,
+        id: "test-customer-id",
+        primaryAddress: null,
+        websiteId: "test-website-id",
+        _embedded: {
+          website: {},
+        }
+      })
+    );
+
+    const instance = StorefontTestingInstance({
+      options
+    });
+
+    jest.spyOn(instance.storefront.account, 'get');
+
+    const response = await fetchAccountAndWebsite({ state: instance });
+    expect(response.account instanceof(AccountModel)).toBe(true);
+    expect(response.website instanceof(WebsiteModel)).toBe(true);
+  })
+});

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

@@ -0,0 +1,3 @@
+import BaseModel from './base-model';
+
+export default class WebsiteModel extends BaseModel {}

package/src/storefront/account.js

@@ -1,11 +0,0 @@
-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/account.spec.js

@@ -1,39 +0,0 @@
-import { StorefontTestingInstance } from 'tests/mocks/storefront-mock';
-import { ok, get } from 'msw-when-then';
-import { when } from 'tests/msw/server';
-import { storefrontURL } from 'tests/mocks/storefront-api-mock';
-import { fetchAccount } from './account';
-import { AddressModel } from './models/account-model';
-
-describe('Storefront API Account', () => {
-  it('should handle fetch a customer with a null primary address', async () => {
-    const options = {
-      jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzYjBkNTRkOS0xNmM4LTRlZDAtYjljMy01ODAyZmQ4YzE2ZTIiLCJleHAiOjE2ODY2OTc0MTQuODQxMjUsImlhdCI6MTY1NTE2MTQxNC44Nzk4OTEsImFjbCI6W3sic2NvcGUiOnsib3JnYW5pemF0aW9uSWQiOlsiMzY0NEFGTEFKMUciXSwicGF5bWVudE1ldGhvZHMiOlsicGF5bWVudC1jYXJkIl19LCJwZXJtaXNzaW9ucyI6WzI4NCwyODYsNDE0LDQxNSw0MzQsNDExLDQxMiw0MTMsNDI0LDQyNSw0MjYsNDI3LDQyOCw0MjksNDA5LDQxMCw0MDEsNDAyLDQzMyw0ODgsNDg3XX1dLCJjbGFpbXMiOnsid2Vic2l0ZUlkIjoiZGVtby13ZWJzaXRlIiwidHJhbnNhY3Rpb25JZCI6IjRiZDE3N2NmLTFlY2EtNDA2Yy04OWI0LTEzYzMzODk5NzlmMCIsInBheW1lbnRNZXRob2RzIjpbInBheW1lbnQtY2FyZCJdfSwibWVyY2hhbnQiOiIzNjQ0QUZMQUoxRyIsImN1c3RvbWVyIjp7ImlkIjoidGVzdC1jdXN0b21lci1pZCIsIm5hbWUiOiJUZXN0IEN1c3RvbWVyIE5hbWUiLCJjcmVhdGVkVGltZSI6IjIwMjItMDctMTRUMDA6MDA6MDArMDA6MDAifX0.VPue9QBhRGe3vvncaD47w84N8Bv2hEeShUl6SlNqoOQ',
-      websiteId: 'test-website-id',
-      items: [
-        {
-          planId: 'test-plan-id',
-          quantity: 1
-        }
-      ]
-    };
-
-    when(get(`${storefrontURL}/acount`)).thenReturn(
-      ok({
-        defaultPaymentInstrument: null,
-        id: "test-customer-id",
-        primaryAddress: null,
-        websiteId: "test-website-id",
-      })
-    );
-
-    const instance = StorefontTestingInstance({
-      options
-    });
-
-    jest.spyOn(instance.storefront.account, 'get');
-
-    const response = await fetchAccount({ state: instance });
-    expect(response.address).toEqual(new AddressModel({}));
-  })
-});