@nuskin/ns-shop 5.20.1 → 5.20.3

package/package.json

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

package/src/cart/cart.js

@@ -1085,8 +1085,8 @@ export default function Cart(cartData) {
                     retVal.orderPoints -= UserService.getUser().availablePoints <= retVal.orderPoints ? item.getProduct().points : 0;
                     if (!item.isPartialRedeem()) {
                         retVal.orderPrice -= totalPrice;
+                        retVal.orderPsv -= item.getTotalPsv();
                     }
-                    retVal.orderPsv -= item.getTotalPsv();
                 }
             }
 

package/src/cart/persistentCartService.js

@@ -13,6 +13,7 @@ const MERGE_PERSISTED_CART= 'merge persisted cart';
 let timerId = null;
 let mergingIntoLocalCart = false;
 let persistingCart = false;
+let updateMobileCnt = false;
 
 const persistedItemsMatch = (pItem1, pItem2, matchOnetime = false) => {
     let matches;
@@ -749,7 +750,7 @@ const persistLocalItems = async (cartItems, authInfo) => {
 };
 
 const updateMobile = () => {
-    if (window.ReactNativeWebView) {
+    if (window.ReactNativeWebView && updateMobileCnt) {
         window.ReactNativeWebView.postMessage(JSON.stringify({name: 'cart_quantity', payload: CartService.getItemCnt()}));
     }
 };
@@ -1051,11 +1052,13 @@ const initPersistentCartService = async () => {
     if (cartType) {
         initListeners();
         if (validPageToSync()) {
+            updateMobileCnt = false;
             // Persist changed that may not have gotten persisted before page refress
             // like ADR changes that redirect before persisted cart gets updated.
             await persistCartUpdates();
 
             // now sync persisted cart into local.
+            updateMobileCnt = true;
             await syncCart(cartType);
         }
     } else {

package/src/receiver.js

@@ -294,6 +294,29 @@ const addItemsToCart = async () => {
     }
 };
 
+/**
+ * Temporary until Authentication service exposes this.
+ */
+const clearCookies = () => {
+    try {
+        // Clear out the adr override.
+        sessionStorage.setItem('ADROverrideID', null);
+        sessionStorage.setItem('orderReason', null);
+
+        storage.removeItem(storage.metadata.NUSKIN_ACCOUNT_DATA);
+        storage.removeItem(storage.metadata.USER_COOKIE_BASE);
+        storage.removeItem(storage.metadata.LOGGEDIN_KEY,{ path: '/' });
+        storage.removeItem(storage.metadata.MEC_JWT,{ path: '/' });
+        storage.removeItem(storage.metadata.MEC_MIN,{ path: '/' });
+        storage.removeItem(storage.metadata.MEC_MASTER,{ path: '/' });
+        storage.removeItem(storage.metadata.EID, { path: '/' });
+        // clearOktaSession();
+
+    } catch (e) {
+        console.error(e);
+    }
+};
+
 let receivingMobile = false;
 const eventListener = async (message) => {
     let data = JSON.parse(message.data);
@@ -316,6 +339,7 @@ const eventListener = async (message) => {
             if (user && Base64.decode(data.eid).indexOf(user.id) >= 0) {
                 user.eid = data.eid;
                 UserService.setUser(user);
+                AuthenticationService.generateMecCookies();
             } else {
                 try {
                     CartService.clearCart();
@@ -327,7 +351,8 @@ const eventListener = async (message) => {
         } else {
             if (AuthenticationService.isLoggedIn()) {
                 CartService.clearCart();
-                AuthenticationService.logout();
+                // AuthenticationService.logout();
+                clearCookies();
             }
         }