@nuskin/ns-product-lib 1.6.0-cx24-2382.1 → 2.0.0-cx24-2382.3

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+# [2.0.0-cx24-2382.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-2382.2...v2.0.0-cx24-2382.3) (2022-09-08)
+
+
+### Update
+
+* change the parameters passed to getProductData (CX24-2382) ([38deea7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/38deea72a80b2bac07de35f5fa7e45f091f9f0c6))
+
+# [2.0.0-cx24-2382.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-2382.1...v2.0.0-cx24-2382.2) (2022-09-07)
+
+
+### Update
+
+* change the parameters passed to getProductData (CX24-2382) ([ba22522](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ba225229615599f6884a56fc4fd4c172a2e3d83e))
+
+# [2.0.0-cx24-2382.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v1.6.0-cx24-2382.1...v2.0.0-cx24-2382.1) (2022-09-06)
+
+
+### Breaking
+
+* replace runConfig and marketConfig parameters of getProductData with locale and market (CX24-2382) ([713bbb6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/713bbb6b52e20727ce846d4df5c84d837fb931d5))
+
+### New
+
+* add equinox-enabled market validation (CX24-2382) ([6633eb5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/6633eb5824ec621a7316aff401d29876761ffc38))
+
 # [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "1.6.0-cx24-2382.1",
+  "version": "2.0.0-cx24-2382.3",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {

package/src/contentstack/contentstack.js

@@ -0,0 +1,121 @@
+// This module can be bundled into a package for better reusability.
+const axios = require('axios');
+const { getEnvironmentFromUrl } = require('@nuskin/ns-common-lib');
+
+/**
+ * getAEMConfig fetches the market config from contentstack.
+ *
+ * @typedef MarketConfig
+ * @property {string} aws_url
+ * @property {string} checkout_client_id
+ * @property {string} checkout_client_secret
+ *
+ * @export
+ * @return {Promise<null|MarketConfig>} 
+ */
+async function getAEMConfig() {
+  try {
+    const env = getEnvironmentFromUrl('test.nuskin.com');
+    const marketConfig = `market_config_${env}`;
+    const variables = { uid: 'blt52b0b83a89763791' };
+    const query = `query EquinoxMarketsByUid($uid: String!) {
+      aem_config(uid: $uid) {
+        title
+        ${marketConfig} {
+          checkout_client_secret
+          checkout_client_id
+          aws_url
+        }
+      }
+    }`;
+
+    const { data } = await contentstackService({
+      method: 'post',
+      data: { variables, query }
+    });
+
+    return data.aem_config[marketConfig];
+  } catch (error) {
+    console.error(error);
+    return null;
+  }
+}
+
+/**
+ * getEquinoxMarkets will get the list of Equinox-enabled markets from contentstack
+ *
+ * @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]
+ *
+ * @export
+ * @return {Promise<EquinoxEnabledMarkets>} 
+ */
+async function getEquinoxMarkets() {
+  try {
+    const env = getEnvironmentFromUrl('test.nuskin.com');
+    const marketConfig = `${env}_markets`;
+    const variables = { uid: 'blt5633ff9e560f14ef' };
+    const query = `query EquinoxMarketsByUid($uid: String!) {
+      equinox_markets(uid: $uid) {
+          ${marketConfig} {
+            market_name
+            country_code
+            store_id
+        }
+      }
+    }`;
+
+    const { data } = await contentstackService({
+      method: 'post',
+      data: { variables, query }
+    });
+
+    return data.equinox_markets[marketConfig];
+  } catch (error) {
+    console.error(error);
+    return [];
+  }
+}
+
+
+
+/**
+ * Contentstack HTTP - axios wrapper for contentstack request
+ *
+ * @param {Object} config  - required param
+ * @return {Promise<import('axios').AxiosResponse>}  Promise that resolves to market_list_eq object
+ */
+async function contentstackService(config) {
+  const baseURL = 'https://graphql.contentstack.com';
+  const deliveryToken = 'cs74599c107573ea7f6c7a1413';
+  const apiKey = 'blt7d4c4f4a1bf5a819';
+  const env = 'public-dev';
+  const defaultUrl = `${baseURL}/stacks/${apiKey}?environment=${env}`;
+
+  config.method = config.method || 'get'
+  config.url = config.url || defaultUrl
+  config.headers = {
+    'access_token': `${deliveryToken}`,
+    'Content-Type': 'application/json'
+  }
+
+  try {
+    const response = await axios(config);
+    return response.data
+  } catch (error) {
+    console.error(error.response.data.errors);
+  }
+}
+
+module.exports = {
+  getAEMConfig,
+  getEquinoxMarkets
+}

package/src/productData.js

@@ -1,13 +1,8 @@
 "use strict";
-const { getEnvironmentFromUrl } = require('@nuskin/ns-common-lib');
 const axios = require("axios");
+const contentstack = require('./contentstack/contentstack');
 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';
-
 /** @type {*} */
 const ProductData = {
   /**
@@ -16,63 +11,91 @@ const ProductData = {
    * @param {*} marketConfig 
    * @param {boolean} isEquinoxEnabled 
    */
-  getProductData: async function (skus, runConfig, marketConfig, isEquinoxEnabled = false) {
-    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);
+  getProductData: async function (skus, locale, market, isEquinoxEnabled = false) {
+    const localeMarket = `${locale}_${market}`;
+    const enabledMarkets = await contentstack.getEquinoxMarkets();
+    const isMarketEnabled = enabledMarkets
+      .map(m => m.country_code.toLowerCase())
+      .includes(market.toLowerCase());
+
+    if (isEquinoxEnabled && isMarketEnabled) {
+      return await this.getProductFromEquinox(skus, localeMarket, 406);
     }
 
-    return await this.getProductFromLegacy(skus, locale, marketConfig);
+    return await this.getProductFromLegacy(skus, localeMarket);
   },
 
-  getProductFromEquinox: async function (skus, locale, marketConfig, storeID) {
-    const filter = `{
-      "filters": [{
-        "field": "index_key_skuId",
-        "operation": "IN",
-        "value": "${skus.toString()}"
-      }]
-    }`;
+  getProductFromEquinox: async function (skus, locale, storeID) {
+    const filter = '{"filters":[{"field":"index_key_skuId","operation":"IN","value":"' + skus.toString() + '"}]}';
     axios.defaults.withCredentials = true;
-    const productDataResponse = await axios.request({
+    const url = `https://storefront.api.wde.nuskin.io/orchestrationservices/storefront/catalogs/search/`;
+    const href = `${url}?filter=${encodeURI(filter)}`;
+    const response = await axios.request({
       method: 'get',
-      url: `https://storefront.api.wts.nuskin.io/orchestrationservices/storefront/catalogs/search/`,
+      url: href,
       params: {
         locale,
-        storeId: storeID,
-        filter
+        storeId: storeID
       },
-      headers: this.getProductDataRequestHeaders(marketConfig),
-      responseType: "json"
+      headers: this.getEquinoxRequestHeaders(),
+      responseType: 'json'
     });
 
-    return this.eqProductMapper(productDataResponse.data.product);
+    if (response.data.product) {
+      return this.eqProductMapper(response.data.product);
+    }
+
+    return {
+      status: 400,
+      messages: [response.data.message],
+      data: { count: 0, products: [] }
+    }
+  },
+
+  getEquinoxRequestHeaders() {
+    return {
+      // authorization: `Bearer ${localStorage.getItem('equinox-okta-token')}`,
+      'Content-Type': 'application/json'
+      // 'x-sk-session-id': localStorage.getItem('x-sk-session-id')
+    };
   },
 
-  getProductFromLegacy: async function (skus, locale, marketConfig) {
-    const lambdaUrl = `${marketConfig.awsUrl}/productData/v1`;
+  getProductFromLegacy: async function (skus, locale) {
+    const marketConfig = await contentstack.getAEMConfig();
+
+    if (marketConfig === null) {
+      return null;
+    }
+
+    const lambdaUrl = `${marketConfig.aws_url}/productData/v1`;
     const payload = { locale, skus };
 
     return await axios.request({
-      method: "post",
+      method: 'post',
       url: lambdaUrl,
       data: payload,
-      headers: this.getProductDataRequestHeaders(marketConfig),
-      responseType: "json"
+      headers: this.getLegacyRequestHeaders(marketConfig),
+      responseType: 'json'
     });
   },
-
-  /* eqProductMapper: function(productDataResponse) {
-    return productDataResponse;
-  }, */
+  
+  /**
+   * @param {contentstack.MarketConfig} marketConfig
+   */
+  getLegacyRequestHeaders: function(marketConfig) {
+    return {
+      'Content-Type': 'application/json',
+      client_id: marketConfig.checkout_client_id,
+      client_secret: marketConfig.checkout_client_secret
+    };
+  },
 
   eqProductMapper: function (productDataResponse) {
     let prodArr = [];
     let prod = [];
     let count = 0;
+
+    // we can use Array.map for this one
     productDataResponse.forEach((data, index) => {
       count++
 
@@ -198,87 +221,7 @@ const ProductData = {
         "messages": [],
         "data": data
       }
-    }
-
-  },
-
-  getProductDataRequestHeaders: function (marketConfig) {
-    return {
-      "Content-Type": "application/json",
-      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);
   }
 }