@rebilly/instruments 3.8.2-beta.0 → 3.9.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebilly/instruments",
-  "version": "3.8.2-beta.0",
+  "version": "3.9.0-beta.0",
   "author": "Rebilly",
   "main": "dist/index.js",
   "unpkg": "dist/index.min.js",

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,
+      customerAddress: account?.address || null,
     });
 
     const [readyToPay, previewPurchase] = await Promise.all([

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

@@ -72,6 +72,33 @@ 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: {},
+      fetchAccount: mockFetchAccount,
+    });
+
+    expect(mockFetchAccount).toBeCalledTimes(0);
+  });
 });
 
 describe('DataInstance', () => {

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/storefront/payment-instruments.js

@@ -24,7 +24,7 @@ export async function setupPaymentInstrument({ data, state }) {
     }
 
     if (state.data?.transaction?.redirectUrl) {
-      setupPayload.data.redirectUrl = `${setupPayload.data.redirectUrl}&orginalRedirectUrl=${state.data.transaction.redirectUrl}`
+      setupPayload.data.redirectUrl = `${setupPayload.data.redirectUrl}&originalRedirectUrl=${state.data.transaction.redirectUrl}`
     }
 
     const { fields: transaction } = await state.storefront.paymentInstruments.setup(setupPayload);

package/src/views/common/iframe/modal-iframe.js

@@ -30,7 +30,7 @@ export class ModalIframe extends BaseIframe {
     window.addEventListener('message', async (event) => {
       if(event.data === 'rebilly-instruments-approval-url-close') {
         if (this.state.options.transactionType === 'purchase') {
-          this.state.storefront.setSessionToken(this.state.data.token);
+          this.state.storefront.setSessionToken(this.state.data.token || this.state.options.jwt);
 
           const [
             {fields: transaction},
@@ -52,7 +52,7 @@ export class ModalIframe extends BaseIframe {
           }
           close(updatedPurchase);
         } else if (this.state.options.transactionType === 'setup') {
-          this.state.storefront.setSessionToken(this.state.data.instrument.token);
+          this.state.storefront.setSessionToken(this.state.data.instrument.token || this.state.options.jwt);
           const {
             fields: transaction
           } = await this.state.storefront.transactions.get({id: this.state.data.transaction.id});

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 = {
+      customerAddress: state.data.customerAddress,
       options: state.options,
       mainStyle: state.mainStyle,
       plans: state.data.plans,