@nuskin/ns-shop 5.14.4 → 5.14.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "5.14.4",
+  "version": "5.14.6",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -34,7 +34,7 @@
     "lodash": "4.17.20"
   },
   "devDependencies": {
-    "@nuskin/ns-account": "4.5.0",
+    "@nuskin/ns-account": "4.25.2",
     "@nuskin/ns-jsanalyzer": "1.0.1",
     "@nuskin/ns-product": "3.36.2",
     "@nuskin/ns-util": "3.99.2",

package/src/cart/cartService.js

@@ -172,8 +172,8 @@ function _getCartStorageName(country) {
  *
  * @return {*}
  */
-function clearCart() {
-    _getCart().removeItems({all: true});  // to trigger events
+function clearCart(removePersistedCart = true) {
+    _getCart().removeItems({all: true, removeCart: removePersistedCart});  // to trigger events
     setCart(null);
     return _cart_;
 }
@@ -1264,7 +1264,7 @@ function syncPersistedInfo(pLineInfo) {
 $(function() {
     if (nuskin && nuskin.account) {
         events.subscribe(events.authentication.LOGOUT, function () {
-            clearCart();
+            clearCart(false);
             if (typeof AdrEditService !== 'undefined') {
                 AdrEditService.clearAdrEdit();
             }

package/src/cart/persistentCartService.js

@@ -772,6 +772,23 @@ const loadPersistedCart = (type) => {
     }
 };
 
+const getCartType = () => {
+    const nsConfig = ConfigService.getMarketConfig();
+    let cartType = null;
+
+    if (nsConfig.usePersistentCart && !window.location.pathname.startsWith("/content/login/corporate")) {
+        const context = ShoppingContext.getShoppingContext();
+
+        if (context) {
+            cartType = nsConfig.cartType; // set from shoppingContext
+        } else {
+            cartType = CartService.getCartProperty('type') || 'market';
+        }
+    }
+
+    return cartType;
+}
+
 /**
  * Initializes the CART_UPDATED listener and the LOGIN listener.
  */
@@ -783,9 +800,8 @@ const initListeners = () => {
     events.subscribe(events.shop.CART_UPDATED, addAction);
 
     events.subscribe(events.authentication.LOGIN, function() {
-        syncCart();
+        syncCart(getCartType());
     });
-
     events.subscribe('get-persisted-cart-type', loadPersistedCart)
 };
 
@@ -796,8 +812,9 @@ const initListeners = () => {
  * @return {Promise<void>}
  */
 const initPersistentCartService = async () => {
-    if (ConfigService.getMarketConfig().usePersistentCart && !ShoppingContext.getShoppingContext() &&
-        !window.location.pathname.startsWith("/content/login/corporate")) {
+    const cartType = getCartType();
+
+    if (cartType) {
         initListeners();
         if (window.location.pathname != '/static/checkout/checkout.html') {
             // Persist changed that may not have gotten persisted before page refress
@@ -805,7 +822,7 @@ const initPersistentCartService = async () => {
             await persistCartUpdates();
 
             // now sync persisted cart into local.
-            await syncCart(CartService.getCartProperty('type'));
+            await syncCart(cartType);
         }
     } else {
         events.setValue(events.shop.CART_SYNCED_ON_LOAD, [true]);

package/src/receiver.js

@@ -1,5 +1,5 @@
 import $ from '@nuskin/nuskinjquery';
-import {UserService, AccountManager} from "@nuskin/ns-account";
+import {UserService, AuthenticationService} from "@nuskin/ns-account";
 import {ConfigService, RunConfigService, storage, util, ShoppingContext, Base64, events} from "@nuskin/ns-util";
 import {Agelocme} from '@nuskin/ns-product-lib';
 import CartService from './cart/cartService';
@@ -308,7 +308,7 @@ const eventListener = async (message) => {
             } else {
                 try {
                     CartService.clearCart();
-                    promises.push(AccountManager.authenticateWithEid(data.eid, true));
+                    promises.push(AuthenticationService.authenticateWithEid(data.eid, true));
                 } catch (err) {
                     console.error('Unable to log in mobile user!');
                 }
@@ -338,13 +338,35 @@ const eventListener = async (message) => {
     }
 }
 
-const initalizeForMobile = () => {
-    ShoppingContext.setShoppingContext(ShoppingContext.MOBILE_CONSUMER);
+const initalizeForMobile = async () => {
+    paramMap = $.getQueryParameters(window.location.search);
+    const user = UserService.getUser();
+    const cartType = paramMap.cartType || 'market';
 
-    window.addEventListener("message", eventListener)
-    document.addEventListener("message", eventListener);
+    if (paramMap.shoppingContext && ShoppingContext[paramMap.shoppingContext]) {
+        ShoppingContext.setShoppingContext(ShoppingContext[paramMap.shoppingContext], {cartType: cartType});
+    }
 
-    window.ReactNativeWebView.postMessage(JSON.stringify({name: 'ready_to_receive', payload: {}}));
+    // 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: {}}));
+    }
 };
 
 const receiveUrlParams = () => {
@@ -405,10 +427,10 @@ const receiveUrlParams = () => {
 /**
  * receive certain parameters from the URL.
  */
-const receive = () => {
+const receive = async () => {
     if (window.ReactNativeWebView) {
         events.setValue(events.mobile.NATIVE_INITIALIZING, [true]);
-        initalizeForMobile();
+        await initalizeForMobile();
     } else {
         receiveUrlParams();
     }