@nuskin/ns-shop 7.0.7 → 7.0.9-cx24-7079.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.0.7",
+  "version": "7.0.9-cx24-7079.1",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {

package/src/cart/equinoxCartService.js

@@ -20,7 +20,8 @@ const shoppingContextCartTypes = {
 
 const DEFAULT_CART_TYPE = 'USER';
 
-let cartContents = null;
+let requestStatus = 'idle';
+let promise = null;
 
 export default {
     addProductToEquinoxCart,
@@ -46,8 +47,15 @@ function _getEquinoxSession() {
         method: 'GET',
         endpoint: 'customers'
     }
+    const customerSession = sessionStorage.getItem('customerSession') ? JSON.parse(sessionStorage.getItem('customerSession')) : ''
+    if (customerSession === '') {
+        sessionStorage.setItem('customerSession', true)
+        return _equinoxRequest(equinoxRequestOptions)
+    } else {
+        return null
+    }
+    
 
-    return _equinoxRequest(equinoxRequestOptions);
 }
 
 /**
@@ -216,22 +224,25 @@ function _getCartShoppingContext() {
 async function getEquinoxCart() {
 
     const cartType = _getCartShoppingContext();
-
+    
     const equinoxRequestOptions = {
         method: 'GET',
         endpoint: `carts/${cartType}`
     }
-    if (!cartContents){
-        cartContents = _equinoxRequest(equinoxRequestOptions).then(result => {
-            cartContents = result;
-        });
+    if(requestStatus === 'pending'){
+        return resolvePromise(promise);
     }
+    if (requestStatus === 'idle'){
+        requestStatus = 'pending';
+        promise = _equinoxRequest(equinoxRequestOptions);
+        return resolvePromise(promise);
+    }
+}
 
-    await cartContents
-
-    // if this is a promise, this will resolve it
-    // otherwise, it won't do anything
-    return cartContents;
+async function resolvePromise (promise) {
+    const response = await promise;
+    requestStatus = 'idle';
+    return response;
 }
 
 /**
@@ -460,7 +471,6 @@ const runConfigCallback = async (runConfig) => {
         const publishEquinoxCartCount = (options) => {
             getEquinoxCart().then((response) => {
                 const cart = response.data;
-                cartContents = null;
                 events.publish(events.shop.CART_UPDATED, { cartInfo: { qty: cart.value.count }, ...options });
             });
         }