@nuskin/ns-shop 7.0.5-cx1-13272.12 → 7.0.5-cx1-13272.14

package/package.json

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

package/src/salesEventService.js

@@ -531,7 +531,7 @@ async function _getRemoteTicket(eventTicketInfo) {
             response = await axios({
                 method: method,
                 url: `${_getAwsUrl(eventName, ticketId)}${seParams}`,
-                headers: _getHeaders(),
+                headers: _getHeaders(method === 'GET' ? true : false),
                 timeout: 7000
             });
 
@@ -646,19 +646,23 @@ function _getAwsUrl(eventName, ticketId) {
  * @returns {{Accept: string, "Content-Type": string, client_id: *}}
  * @private
  */
-function _getHeaders() {
+function _getHeaders(noCache = false) {
     return {
         'Accept': 'application/json',
         'Content-Type': 'application/json',
-        'client_id': RunConfigService.getRunConfig().clientId
+        'client_id': RunConfigService.getRunConfig().clientId,
+        ...(noCache && {'Cache-Control': 'no-cache'}),
+        ...(noCache && {'Pragma': 'no-cache'}),
+        ...(noCache && {'Expires': '0'})
     };
 }
 
 async function _getActiveEvents() {
+    myAlert(`headers, ${JSON.stringify(_getHeaders(true))}`)
     let response = await axios({
         method: 'GET',
         url: `${_getAwsUrl()}?activeWithin=${ACTIVE_EVENT_WITHIN}`,
-        headers: _getHeaders()
+        headers: _getHeaders(true)
     });
     return response.data.salesEventResponse
 }
@@ -739,7 +743,7 @@ async function _loadMarketEventConfig(force, country=undefined) {
             const response = await axios({
                 method: 'GET',
                 url: `${_getAwsUrl()}`,
-                headers: _getHeaders()
+                headers: _getHeaders(true)
             });
             const salesEvents = response.data.salesEventResponse || [];
             mktEventConfigMap = {};
@@ -783,6 +787,7 @@ function getStorageItem(key) {
 
 async function _checkForMissingTicket(eventName) {
     if (mktEventConfigMap[eventName] && !eventTicketInfoMap[eventName]) {
+        myAlert(`missing ticket for ${eventName}`)
         await _initEventTicketInfo(eventName);
     }
 }
@@ -798,9 +803,7 @@ function myAlert(msg) {
  *  went to sleep.  It's intention is to update the wait timer if it has.
  */
 async function _initializePolling() {
-    myAlert('_initializePolling');
     if (!intervalId) {
-        myAlert('_initializePolling - no intervalId');
         const TIMEOUT = 10000;
         let lastTime = Date.now(),
             intervalCnt = 1;
@@ -809,8 +812,6 @@ async function _initializePolling() {
             const now = Date.now();
             const slept = now > (lastTime + TIMEOUT + 3000)
 
-            myAlert('polling triggered');
-
             // if polling market config, only reload it every 30 seconds
             if (slept || pollMarketConfig && intervalCnt % 6 === 0) {
                 await _loadMarketEventConfig(true);
@@ -835,7 +836,7 @@ async function _initializePolling() {
             if (window.location.pathname === '/static/checkout/checkout.html') {
                 // check for missing tickets. Only perform on checkout s
                 const activeEvents = await _getActiveEvents();
-                myAlert(`Active Event check, ${activeEventMap}`);
+                myAlert(`Active Event check, ${JSON.stringify(activeEvents)}`);
 
                 for (const eventInfo of activeEvents) {
                     await _checkForMissingTicket(eventInfo.eventName);
@@ -967,7 +968,7 @@ function _removeWaitCheck(value) {
  */
 async function _loadAwsActiveEvents(country) {
     let activeEventsName = `${ACTIVE_EVENTS}-${country? country: RunConfigService.getRunConfig().country}`,
-        storageObj = getStorageItem(activeEventsName),
+        storageObj = null, // getStorageItem(activeEventsName),
         ttl = storageObj ? storageObj.ttl - Date.now() : ACTIVE_EVENT_TTL,
         eventInfos = {},
         ok = true;
@@ -1120,7 +1121,6 @@ const csConfigCallback = async (configs) => {
     if (configs != null && isSubset(configs, neededConfigMaps)) {
         events.unsubscribe(events.global.CS_CONFIG_SET, csConfigCallback);
         isGuest = CheckoutModeService.isGuestCheckout();
-        if (isGuest) alert(`isGuest ${isGuest}`)
         _init(false).then(() => console.log('salesEventService initialized'));
     }
 }