@nuskin/ns-product-lib 1.6.0-cx24-2382.1 → 1.6.0-cx24-2245.2

package/CHANGELOG.md

@@ -1,9 +1,16 @@
-# [1.6.0-cx24-2382.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v1.5.0...v1.6.0-cx24-2382.1) (2022-09-01)
+# [1.6.0-cx24-2245.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v1.6.0-cx24-2245.1...v1.6.0-cx24-2245.2) (2022-09-19)
+
+
+### Update
+
+* Version Bump for ns-util to use non CX24 branch ([b24424c](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b24424c842dd53b250e5fdf499e186e0fe519fd3))
+
+# [1.6.0-cx24-2245.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v1.5.0...v1.6.0-cx24-2245.1) (2022-09-12)
 
 
 ### New
 
-* query equinox-enabled markets (CX24-2382) ([1fcd191](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/1fcd191d654b5ad39603140e80dddd06ab7d0056))
+* Consume MySite Kong URL ([e8f18dc](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/e8f18dc4e42f316f1c452949ba9fc8167c4ab1f4))
 
 # [1.5.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v1.4.5...v1.5.0) (2022-08-25)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "1.6.0-cx24-2382.1",
+  "version": "1.6.0-cx24-2245.2",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@nuskin/ns-common-lib": "1.3.0",
-    "@nuskin/ns-util": "3.104.0",
+    "@nuskin/ns-util": "3.105.0",
     "axios": "0.27.2",
     "qs": "6.11.0"
   },

package/src/productData.js

@@ -1,34 +1,25 @@
 "use strict";
-const { getEnvironmentFromUrl } = require('@nuskin/ns-common-lib');
-const axios = require("axios");
-const product = require("./product");
-
-const CS_BASE_URL  = 'https://graphql.contentstack.com';
-const CS_DELIVERY_TOKEN = 'cs74599c107573ea7f6c7a1413';
-const CS_API_KEY = 'blt7d4c4f4a1bf5a819';
-const CS_DEFAULT_ENV = 'public-dev';
-
+const  axios = require("axios");
+const product = require("./product")
 /** @type {*} */
 const ProductData = {
   /**
    * @param {*} skus 
    * @param {*} runConfig 
    * @param {*} marketConfig 
-   * @param {boolean} isEquinoxEnabled 
+   * @param {{ isEnabled: boolean, storeID: string }} equinoxOptions 
    */
-  getProductData: async function (skus, runConfig, marketConfig, isEquinoxEnabled = false) {
+  getProductData: async function (skus, runConfig, marketConfig, equinoxOptions) {
     const locale = `${runConfig.language}_${runConfig.country}`;
-    const enabledMarkets = await this.getEquinoxEnabledMarkets();
-    console.log(enabledMarkets);
 
-    if (isEquinoxEnabled === true) {
-      return await this.getProductFromEquinox(skus, locale, marketConfig, 406);
+    if (equinoxOptions !== undefined && equinoxOptions.isEnabled === true) {
+      return await this.getProductFromEquinox(skus, locale, marketConfig, equinoxOptions.storeID);
     }
 
     return await this.getProductFromLegacy(skus, locale, marketConfig);
   },
 
-  getProductFromEquinox: async function (skus, locale, marketConfig, storeID) {
+  getProductFromEquinox: async function(skus, locale, marketConfig, storeID) {
     const filter = `{
       "filters": [{
         "field": "index_key_skuId",
@@ -39,7 +30,7 @@ const ProductData = {
     axios.defaults.withCredentials = true;
     const productDataResponse = await axios.request({
       method: 'get',
-      url: `https://storefront.api.wts.nuskin.io/orchestrationservices/storefront/catalogs/search/`,
+      url: `https://${marketConfig.mySiteKongURL}/orchestrationservices/storefront/catalogs/search/`,
       params: {
         locale,
         storeId: storeID,
@@ -52,7 +43,7 @@ const ProductData = {
     return this.eqProductMapper(productDataResponse.data.product);
   },
 
-  getProductFromLegacy: async function (skus, locale, marketConfig) {
+  getProductFromLegacy: async function(skus, locale, marketConfig) {
     const lambdaUrl = `${marketConfig.awsUrl}/productData/v1`;
     const payload = { locale, skus };
 
@@ -75,7 +66,7 @@ const ProductData = {
     let count = 0;
     productDataResponse.forEach((data, index) => {
       count++
-
+      
       prod = {
         "sku": data.sku[0].identifier,
         "globalProductID": data.identifier,
@@ -208,77 +199,6 @@ const ProductData = {
       client_id: marketConfig.checkout.clientId,
       client_secret: marketConfig.checkout.clientSecret
     };
-  },
-
-  /**
- * Get equinox enabled market list from contentstack
- *
- * @return {Promise<null|import('@nuskin/ns-util/src/local-storage/equinox').MarketList>}
- * @public
- */
-  getEquinoxEnabledMarkets: async function () {
-    try {
-      const env = getEnvironmentFromUrl(window.location.origin);
-      const variables = { uid: 'blt5633ff9e560f14ef' }
-      const query = `query EquinoxMarketsByUid($uid: String!) {
-          equinox_markets(uid: $uid) {
-              ${env}_markets {
-                  market_name
-                  country_code
-                  store_id
-              }
-          }
-      }`;
-
-      const { data } = await contentStackHttp({
-        method: 'post',
-        data: { variables, query }
-      });
-
-      return data.equinox_markets[`${env}_markets`];
-    } catch (error) {
-      console.error(error);
-    }
-  }
-}
-
-/**
- * Contentstack HTTP - axios wrapper for contentstack request
- * 
- * @typedef EquinoxEnabledMarket
- * @property {string} market_name
- * @property {string} country_code
- * @property {string} store_id
- *
- * @typedef EquinoxEnabledMarkets
- * @property {EquinoxEnabledMarket[]} [dev_markets]
- * @property {EquinoxEnabledMarket[]} [test_markets]
- * @property {EquinoxEnabledMarket[]} [staging_markets]
- * @property {EquinoxEnabledMarket[]} [prod_markets]
- *
- * @typedef EquinoxEnvironmentEnabledMarkets
- * @property {EquinoxEnabledMarkets} equinox_markets
- *
- * @typedef EquinoxEnabledMarketsResponse
- * @property {EquinoxEnvironmentEnabledMarkets} data
- *
- * @param {Object} config  - required param
- * @return {Promise<EquinoxEnabledMarketsResponse>}  Promise that resolves to market_list_eq object
- */
-async function contentStackHttp(config) {
-  const defaultUrl = `${CS_BASE_URL}/stacks/${CS_API_KEY}?environment=${CS_DEFAULT_ENV}`;
-
-  config.method = config.method || 'get'
-  config.url = config.url || defaultUrl
-  config.headers = {
-    'access_token': `${CS_DELIVERY_TOKEN}`,
-    'Content-Type': 'application/json'
-  }
-  try {
-    const response = await axios(config);
-    return response.data
-  } catch (error) {
-    console.error(error.response.data.errors);
   }
 }