@nuskin/ns-shop 7.0.5-cx1-13272.11 → 7.0.5-cx1-13272.13

package/package.json

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

package/src/salesEventService.js

@@ -1,6 +1,7 @@
 import {RunConfigService, UrlService, events, storage} from '@nuskin/ns-util';
 import axios from 'axios';
 import { UserService } from '@nuskin/ns-account';
+import CheckoutModeService from './checkout/checkoutModeService';
 
 export default {
     init,
@@ -26,6 +27,8 @@ const ACTIVE_EVENT_TTL = ONE_MINUTE * 14;
 const INITIALIZING = 'initializing';
 const EXTERNAL_INITIALIZING = 'initializing-external';
 
+let isGuest = false;
+
 // Contains a map of all event tickets that are stored in localStorage.
 let eventTicketInfoMap;
 
@@ -528,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
             });
 
@@ -643,11 +646,14 @@ 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'})
     };
 }
 
@@ -655,7 +661,7 @@ async function _getActiveEvents() {
     let response = await axios({
         method: 'GET',
         url: `${_getAwsUrl()}?activeWithin=${ACTIVE_EVENT_WITHIN}`,
-        headers: _getHeaders()
+        headers: _getHeaders(true)
     });
     return response.data.salesEventResponse
 }
@@ -736,7 +742,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 = {};
@@ -785,7 +791,7 @@ async function _checkForMissingTicket(eventName) {
 }
 
 function myAlert(msg) {
-    if (window.ReactNativeWebView) {
+    if (isGuest) {
         alert(msg);
     }
 }
@@ -832,7 +838,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(activeEventMap)}`);
 
                 for (const eventInfo of activeEvents) {
                     await _checkForMissingTicket(eventInfo.eventName);
@@ -1038,7 +1044,6 @@ async function initActiveEvents(country = undefined) {
 
         // If there are event tickets then initialize polling
         // if (Object.keys(eventTicketInfoMap).length > 0 && !country) {
-        // Test
         await _initializePolling();
         // }
         _removeWaitCheck(INITIALIZING);
@@ -1117,6 +1122,8 @@ const isSubset = (array1, array2) => {
 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'));
     }
 }