@nuskin/ns-shop 5.17.0 → 5.18.1

package/package.json

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

package/src/cart/cartService.js

@@ -102,6 +102,7 @@ function _getCart() {
             user = UserService.getUser(),
             userId = user ? user.id : null,
             cartJson = storage.getItem({...CART_STORAGE_KEY, key: _getCartStorageName(runConfig.country)}),
+            anonymousCartId = storage.getItem('anonymousCartId'),
             isPitchApp = PersonalOfferStorageService.isPersonalOffer();
 
         // If the cartJson userId is empty OR null, then we are going from nothing to something, and we want to keep our items
@@ -111,10 +112,12 @@ function _getCart() {
             (!(isPitchApp ^ cartJson.isPitchCart))) {
 
             if (!userId) {
-                cartJson.id = '';
-                cartJson.version = -1;
-                cartJson.userId = '';
-                cartJson.products.forEach((item) => item.id = '');
+                if (!anonymousCartId || anonymousCartId != cartJson.id) {
+                    cartJson.id = '';
+                    cartJson.version = -1;
+                    cartJson.userId = '';
+                    cartJson.products.forEach((item) => item.id = '');
+                }
             }
 
             if (!cartJson.userId && userId != '') {

package/src/cart/persistentCartService.js

@@ -1,5 +1,4 @@
 import CartService from './cartService';
-import $ from "@nuskin/nuskinjquery";
 import {ConfigService, events, UrlService, RunConfigService, ShoppingContext, storage} from "@nuskin/ns-util";
 import {Agelocme} from '@nuskin/ns-product-lib';
 import {UserService} from "@nuskin/ns-account";
@@ -246,6 +245,19 @@ class PcActions {
 
 const pcActions = new PcActions();
 
+const getAuthInfo = () => {
+    const user = UserService.getUser();
+    const anonymousCartId = storage.getItem('anonymousCartId');
+
+    return {
+        user,
+        anonymousCartId,
+        hasInfo: !!user || !!anonymousCartId,
+        anonymous: !!anonymousCartId && !user,
+        mergeAnonymousCart: !!user && !!anonymousCartId
+    }
+}
+
 /**
  * Creates a headers object for the AWS service call.
  *
@@ -255,14 +267,16 @@ const pcActions = new PcActions();
  */
 const getHeaders = (jwt) => {
     const config = ConfigService.getMarketConfig();
-
-    return {
+    const headers = {
         'Accept': 'application/json',
         'Content-Type': 'application/json',
         'client_id': config.checkout.clientId,
-        'client_secret': config.checkout.clientSecret,
-        Authorization: `JWT ${jwt}`
+        'client_secret': config.checkout.clientSecret
     };
+    if (jwt) {
+        headers.Authorization = `JWT ${jwt}`;
+    }
+    return headers;
 };
 
 /**
@@ -287,10 +301,8 @@ const getUrl = (path, pathParam, queryParams = {}) => {
  * @param user
  * @return {Promise<void>}
  */
-const getPersistedCart = async (user, type) => {
+const getUserCart = async (user, type) => {
     const runConfig = RunConfigService.getRunConfig();
-    const lsCartType = CartService.getCartProperty('type');
-    const lsCartId = CartService.getCartProperty('id');
 
     const response = await axios({
         method: 'GET',
@@ -298,17 +310,69 @@ const getPersistedCart = async (user, type) => {
         url: getUrl('getCartByAccountId', user.id, {country: runConfig.country, type: type}),
         headers: getHeaders(user.eid)
     });
-    const pCart = response.data.cart;
+    return {pCart: response.data.cart, version: response.data.version};
+};
+
+/**
+ * Gets an anonymous cart
+ *
+ * @param user
+ * @return {Promise<void>}
+ */
+const getAnonymousCart = async (cartId, type) => {
+    const runConfig = RunConfigService.getRunConfig();
 
-    if ((lsCartType != type) || (pCart && lsCartId && pCart.id != lsCartId) || (!pCart && lsCartId)) {
+    const response = await axios({
+        method: 'GET',
+        type: type,
+        url: getUrl('getAnonymousCart', cartId, {country: runConfig.country, type: type}),
+        headers: getHeaders()
+    });
+    return {pCart: response.data.cart, version: response.data.version};
+};
+
+const mergeAnonymousCart = async (authInfo, type) => {
+    const runConfig = RunConfigService.getRunConfig();
+
+    const response = await axios({
+        method: 'PUT',
+        url: getUrl('mergeAnonymousCart', authInfo.anonymousCartId),
+        headers: getHeaders(authInfo.user.eid),
+        data: {
+            country: runConfig.country,
+            type,
+            accountId: authInfo.user.id
+        }
+    })
+
+    storage.removeItem('anonymousCartId');
+    return {pCart: response.data.cart, version: response.data.version};
+}
+
+const getPersistedCart = async (authInfo, type) => {
+    const lsCartType = CartService.getCartProperty('type');
+    const lsCartId = CartService.getCartProperty('id');
+    let response;
+
+    if (authInfo.mergeAnonymousCart) {
+        response = await mergeAnonymousCart(authInfo, type);
+    } else if (authInfo.anonymous) {
+        response = await getAnonymousCart(authInfo.anonymousCartId, type);
+    } else {
+        response = await getUserCart(authInfo.user, type);
+    }
+    const {pCart, version} = response;
+
+    if ((lsCartType !== type) || (pCart && lsCartId && pCart.id !== lsCartId) || (!pCart && lsCartId)) {
         CartService.clearCart();
     }
 
     if (pCart) {
-        CartService.setCartProperties({id: pCart.id, version: response.data.version, type: type});
+        CartService.setCartProperties({id: pCart.id, version, type});
     } else {
         CartService.setCartProperties({type: type});
     }
+
     return pCart;
 };
 
@@ -338,15 +402,42 @@ const updatePersistedCart = async (user, cartId, payload) => {
     return {pCart, cartOutdated: cartOutdated, version: response.data.version, type: response.data.type};
 };
 
+/**
+ * This takes an update payload to update the persisted cart with
+ *
+ * @param user
+ * @param cartId
+ * @param payload
+ * @return {Promise<void>}
+ */
+const updateAnonymousPersistedCart = async (cartId, payload) => {
+    const response = await axios({
+        method: 'PUT',
+        url: getUrl('updateAnonymousCart', cartId),
+        headers: getHeaders(),
+        data: payload
+    });
+
+    const pCart = response.data.cart || null;
+    let cartOutdated = response.data.cartOutdated;
+    if (cartId && pCart.id !== cartId) {
+        CartService.clearCart();
+        cartOutdated = pCart.lineItems.length > 0;
+    }
+    CartService.setCartProperties({id: pCart.id, version: pCart ? response.data.version : -1});
+    return {pCart, cartOutdated: cartOutdated, version: response.data.version, type: response.data.type};
+};
+
 /**
  * Removes a persisted cart
  *
  * @param {object} user
  * @param {string} cartId
  */
-const removePersistedCart = async (user, cartId) => {
+const removePersistedCart = async (cartId) => {
+    const user = UserService.getUser();
     try {
-        if (cartId) {
+        if (user && cartId) {
             await axios({
                 method: 'DELETE',
                 url: getUrl('deleteCart', cartId,  {accountId: user.id}),
@@ -595,19 +686,20 @@ const getAction = (action, data) => {
 };
 
 /**
- * This takes the items passed in and pesists them to the commerce tools cart.
+ * This takes the items passed in and pesists them.
  *
  * @param cartItems
- * @param user
+ * @param authInfo
  * @return {Promise<void>}
  */
-const persistLocalItems = async (cartItems, user) => {
+const persistLocalItems = async (cartItems, authInfo) => {
+    let pCart = null;
     try {
         if (cartItems && cartItems.length > 0) {
             const cartInfo = CartService.getCartInfo();
             const runConfig = RunConfigService.getRunConfig();
             const payload = {
-                accountId: user.id,
+                accountId: authInfo.anonymous ? authInfo.anonymousCartId : authInfo.user.id,
                 country: runConfig.country,
                 type: cartInfo.type,
                 version: cartInfo.version,
@@ -616,12 +708,20 @@ const persistLocalItems = async (cartItems, user) => {
             cartItems.forEach((localItem) => {
                 payload.actions.push(getAction(ADD, localItem));
             });
-            const {pCart} = await updatePersistedCart(user, cartInfo.id, payload);
+            let promise;
+            if (authInfo.anonymous) {
+                promise = updateAnonymousPersistedCart(cartInfo.id, payload);
+            } else {
+                promise = updatePersistedCart(authInfo.user, cartInfo.id, payload);
+            }
+            const response = await promise;
+            pCart = response.pCart;
             syncCartItems(pCart);
         }
     } catch (error) {
         console.error('There was an error persisting local items to cart!', error);
     }
+    return pCart;
 };
 
 /**
@@ -631,17 +731,22 @@ const persistLocalItems = async (cartItems, user) => {
  * @return {Promise<void>}
  */
 const syncCart = async (type) => {
-    let user = UserService.getUser();
+    let authInfo = getAuthInfo();
     let pCart = null;
 
-    if (user && type) {
+    if (authInfo.hasInfo && type) {
         try {
-            pCart = await getPersistedCart(user, type);
+            const unPersistedItems = CartService.getItemData().filter(i => !i.id && !i.isBusinessPortfolio);
+            if (unPersistedItems.length > 0) {
+                pCart = await persistLocalItems(unPersistedItems, authInfo);
+            } else {
+                pCart = await getPersistedCart(authInfo, type);
+            }
 
             // there is a chance the user got logged out
-            user = UserService.getUser();
-            if (user) {
-                await mergeIntoLocalCart(user.id, pCart);
+            authInfo = getAuthInfo();
+            if (authInfo.hasInfo) {
+                await mergeIntoLocalCart(authInfo.user && authInfo.user.id, pCart);
                 if (!timerId) {
                     timerId = setTimeout(timerCallback, 200);
                 }
@@ -649,10 +754,7 @@ const syncCart = async (type) => {
         } catch (err) {
             console.error('Failed to load the persisted cart!', err && err.response && err.response.data ? err.response.data : err);
         }
-        if (user) {
-            const unPersistedItems = CartService.getItemData().filter(i => !i.id && !i.isBusinessPortfolio);
-            await persistLocalItems(unPersistedItems, user);
-        } else {
+        if (!authInfo.hasInfo) {
             CartService.clearCart();
         }
     }
@@ -687,19 +789,25 @@ const syncCartItems = (pCart) => {
 
 const doPersistentUpdates = async (actions, pcId, pcVersion, pcType) => {
     try {
-        const user = UserService.getUser();
+        const authInfo = getAuthInfo();
         const payload = {
-            accountId: user.id,
+            accountId: authInfo.anonymous ? authInfo.anonymousCartId : authInfo.user.id,
             country: RunConfigService.getRunConfig().country,
             type: pcType,
             actions: actions,
             version: pcVersion
         };
 
-        const {pCart, cartOutdated, version, type} = await updatePersistedCart(user, pcId, payload);
+        let promise;
+        if (authInfo.anonymous) {
+            promise = updateAnonymousPersistedCart(pcId, payload);
+        } else {
+            promise = updatePersistedCart(authInfo.user, pcId, payload);
+        }
+        const {pCart, cartOutdated, version, type} = await promise;
         pcActions.setPcInfo(pCart.id, version, type);
         if (cartOutdated) {
-            await mergeIntoLocalCart(user.id, pCart);
+            await mergeIntoLocalCart(authInfo.user && authInfo.user.id, pCart);
         }
         syncCartItems(pCart);
     } catch (err) {
@@ -787,7 +895,7 @@ const persistCartUpdates = async () => {
     }
 
     if (removeCart) {
-        await removePersistedCart(UserService.getUser(), pcId);
+        await removePersistedCart(pcId);
     }
     if (loadCartType) {
         await syncCart(loadCartType);
@@ -818,7 +926,10 @@ const getCartType = () => {
         const context = ShoppingContext.getShoppingContext();
 
         if (context) {
-            cartType = nsConfig.cartType; // set from shoppingContext
+            // If cartType is set to context then it takes on the name of of the context,
+            // otherwise use what is set
+            cartType = nsConfig.cartType === 'context' ? context.context :
+                nsConfig.cartType === 'none' ? null : nsConfig.cartType;
         } else {
             cartType = CartService.getCartProperty('type') || 'market';
         }
@@ -828,11 +939,11 @@ const getCartType = () => {
 }
 
 const addAction = (info) => {
-    const user = UserService.getUser();
+    const authInfo = getAuthInfo();
 
     if (!getCartType()) {
         pcActions.clear();
-    } else if (user && (info.loadCart || !mergingIntoLocalCart)) {
+    } else if (authInfo.hasInfo && (info.loadCart || !mergingIntoLocalCart)) {
         // If the code is currently merging the persistent cart into the local cart, cart update
         // actions are being generated and those need to be ignored.  A loadCart action is not
         // generated elsewhere and should be let through.
@@ -933,14 +1044,21 @@ let documentReady = false;
 if (window.nsPersistentCartInitialized !== true) {
     window.nsPersistentCartInitialized = true;
     // Wait for page to load and them initialize the service
-    $(document).ready(async function() {
-        documentReady = true;
-        await initPersistentCartService();
-    });
+    // $(document).ready(async function() {
+    documentReady = true;
+    if (!window.ReactNativeWebView) {
+        initPersistentCartService().then(() => console.log('persisted cart loaded'));
+    } else {
+        events.getValue(events.mobile.NATIVE_INITIALIZING, (value) => {
+            if (value === false) {
+                initPersistentCartService().then(() => console.log('persisted cart loaded'));
+            }
+        }, true);
+    }
+    // });
 }
 storage.removeItem('pcActivity');
 
-
 export default {
     loadPersistedCart
 }

package/src/payment/paymentType.js

@@ -59,7 +59,8 @@ let PaymentType = {
     BCAI: 123, // BCA installments
     CENC: 125,
     IDMIR: 128, // MIR card for Russia
-    AMIN: 129
+    AMIN: 129,
+    CBLU: 132  // Carte Bleu
 };
 
 PaymentType.credit = [
@@ -80,7 +81,8 @@ PaymentType.credit = [
     PaymentType.DINE,
     PaymentType.VISD,
     PaymentType.MCD,
-    PaymentType.IDMIR
+    PaymentType.IDMIR,
+    PaymentType.CBLU
 ];
 
 

package/src/receiver.js

@@ -295,78 +295,47 @@ const addItemsToCart = async () => {
 };
 
 const eventListener = async (message) => {
-    const promises = [];
-    const runConfig = RunConfigService.getRunConfig();
-    const user = UserService.getUser();
     let data = JSON.parse(message.data);
 
-    if (data.eid && data.products) {
+    if (data.cartMessage) {
+        if (data.shoppingContext && ShoppingContext[data.shoppingContext]) {
+            ShoppingContext.setShoppingContext(ShoppingContext[data.shoppingContext]);
+            ConfigService.getMarketConfig(true); // force reload of config to get context values.
+        }
+
+        if (data.anonymousCartId) {
+            storage.setItem('anonymousCartId', data.anonymousCartId);
+        } else {
+            storage.removeItem('anonymousCartId');
+        }
+
         if (data.eid) {
+            const user = UserService.getUser();
             if (user && Base64.decode(data.eid).indexOf(user.id) >= 0) {
                 user.eid = data.eid;
                 UserService.setUser(user);
             } else {
                 try {
                     CartService.clearCart();
-                    promises.push(AuthenticationService.authenticateWithEid(data.eid, true));
+                    await AuthenticationService.authenticateWithEid(data.eid, true);
                 } catch (err) {
                     console.error('Unable to log in mobile user!');
                 }
             }
+        } else {
+            if (AuthenticationService.isLoggedIn()) {
+                AuthenticationService.logout();
+            }
         }
 
-        if (data.shoppingContext && ShoppingContext[data.shoppingContext]) {
-            ShoppingContext.setShoppingContext(ShoppingContext[data.shoppingContext]);
-        }
-
-        if (Array.isArray(data.products)) {
-            data.products.forEach(product => {
-                promises.push(CartService.addSkuToCart({
-                    sku: product.sku,
-                    cntryCd: runConfig.country,
-                    language: runConfig.language,
-                    qty: product.qty,
-                    isAdr: product.oneTime === false
-                }));
-            })
-        }
-        await Promise.allSettled(promises);
-        // the user is being authenticated synchronously so let's make sure
-        // the products reflect the correct price.
-        CartService.updateItemPrices();
         events.setValue(events.mobile.NATIVE_INITIALIZING, [false]);
     }
 }
 
 const initalizeForMobile = async () => {
-    paramMap = $.getQueryParameters(window.location.search);
-    const user = UserService.getUser();
-    const cartType = paramMap.cartType || 'market';
-
-    if (paramMap.shoppingContext && ShoppingContext[paramMap.shoppingContext]) {
-        ShoppingContext.setShoppingContext(ShoppingContext[paramMap.shoppingContext], {cartType: cartType});
-    }
-
-    // authToken in paramMap will be the new way of initializing the cart/checkout app.
-    if (paramMap.authToken) {
-        if (user && Base64.decode(paramMap.authToken).indexOf(user.id) >= 0) {
-            user.eid = paramMap.authToken;
-            UserService.setUser(user);
-        } else {
-            try {
-                CartService.clearCart();
-                await AuthenticationService.authenticateWithEid(paramMap.authToken, true);
-            } catch (err) {
-                console.error('Unable to log in mobile user!');
-            }
-        }
-        events.setValue(events.mobile.NATIVE_INITIALIZING, [false]);
-    } else {
-        // TODO: remove the old way
-        window.addEventListener("message", eventListener)
-        document.addEventListener("message", eventListener);
-        window.ReactNativeWebView.postMessage(JSON.stringify({name: 'ready_to_receive', payload: {}}));
-    }
+    window.addEventListener("message", eventListener)
+    document.addEventListener("message", eventListener);
+    window.ReactNativeWebView.postMessage(JSON.stringify({name: 'ready_to_receive', payload: {}}));
 };
 
 const receiveUrlParams = () => {
@@ -432,6 +401,7 @@ const receive = async () => {
         events.setValue(events.mobile.NATIVE_INITIALIZING, [true]);
         await initalizeForMobile();
     } else {
+        events.setValue(events.mobile.NATIVE_INITIALIZING, [false]);
         receiveUrlParams();
     }
 };