@times-components/ssr 2.59.38-b75a9effaef61c0e6e158c7da67c7b2543d193b4.3 → 2.59.38-c3f77517b357963002e883f8cb03f662f312dfb1.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@times-components/ssr",
   "main": "src",
-  "version": "2.59.38-b75a9effaef61c0e6e158c7da67c7b2543d193b4.3+b75a9effae",
+  "version": "2.59.38-c3f77517b357963002e883f8cb03f662f312dfb1.4+c3f77517b3",
   "scripts": {
     "bundle:dev": "yarn cleanup-dist && webpack --config=webpack.config.js",
     "bundle:prod": "yarn cleanup-dist && NODE_ENV=production webpack --config=webpack.config.js -p",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b75a9effaef61c0e6e158c7da67c7b2543d193b4"
+  "gitHead": "c3f77517b357963002e883f8cb03f662f312dfb1"
 }

package/src/lib/affiliate-links-validation.js

@@ -3,11 +3,15 @@ const {
   travelSiteCode,
   trackonomicsRegex
 } = require("../constants/affiliate-links-validation");
-const { wrapSkimlinks } = require("./skimlinks-wrapping");
+const {
+  wrapSkimlinks,
+  fetchSkimlinksDomains,
+  filterDomains
+} = require("./skimlinks-wrapping");
 
 const isAffiliateLink = url => trackonomicsRegex.test(url);
 
-const wrapAffiliateLink = (affiliateLink, contentPageUrl) => {
+const wrapAffiliateLink = (affiliateLink, contentPageUrl, filteredDomains) => {
   const wrapTrackonomics = trackonomicsUrl => {
     if (!isAffiliateLink(trackonomicsUrl)) {
       return trackonomicsUrl;
@@ -25,14 +29,20 @@ const wrapAffiliateLink = (affiliateLink, contentPageUrl) => {
     return affiliateWrapper;
   };
 
-  const skimlinksUrl = wrapSkimlinks(affiliateLink, contentPageUrl);
+  const skimlinksUrl = wrapSkimlinks(
+    affiliateLink,
+    contentPageUrl,
+    filteredDomains
+  );
   return wrapTrackonomics(skimlinksUrl);
 };
 
-module.exports.affiliateLinksValidation = (children, articleDataFromRender) => {
+const affiliateLinksValidation = async (children, articleDataFromRender) => {
   const clonedChildren = [...children];
   const { canonicalUrl, hostName } = articleDataFromRender;
   const contentPageUrl = `${hostName}${canonicalUrl}`;
+  const skimlinksDomains = await fetchSkimlinksDomains();
+  const filteredDomains = filterDomains(skimlinksDomains);
 
   const checkAndSetLinkTarget = elements =>
     elements.map(el => {
@@ -66,7 +76,7 @@ module.exports.affiliateLinksValidation = (children, articleDataFromRender) => {
               attributes: {
                 ...attributes,
                 target: "_blank",
-                url: wrapAffiliateLink(href, contentPageUrl)
+                url: wrapAffiliateLink(href, contentPageUrl, filteredDomains)
               }
             };
           } else {
@@ -75,7 +85,7 @@ module.exports.affiliateLinksValidation = (children, articleDataFromRender) => {
               attributes: {
                 ...attributes,
                 target: "_blank",
-                href: wrapAffiliateLink(href, contentPageUrl)
+                href: wrapAffiliateLink(href, contentPageUrl, filteredDomains)
               }
             };
           }
@@ -91,3 +101,5 @@ module.exports.affiliateLinksValidation = (children, articleDataFromRender) => {
 
   return checkAndSetLinkTarget(clonedChildren);
 };
+
+module.exports = { affiliateLinksValidation };

package/src/lib/skimlinks-wrapping.js

@@ -1,26 +1,25 @@
-// eslint-disable-next-line no-unused-vars
 const { flowRight } = require("lodash");
-/* const { publisherId } = require("../constants/affiliate-links-validation"); */
+const { publisherId } = require("../constants/affiliate-links-validation");
 
-/* const getSecondLevelDomain = str => str.replace(/^(https?:\/\/)?www\./, "");
+const getSecondLevelDomain = str => str.replace(/^(https?:\/\/)?www\./, "");
 
 const trim = str => str.trim();
 
 const removeTrailingSlash = str => str.replace(/\/$/, "");
 
-const stringifyArg = str => (typeof str === "string" ? str : ""); */
+const stringifyArg = str => (typeof str === "string" ? str : "");
 
 /**
  * Removes http scheme, `www.`, and trailing slash from the string
  * @param str
  * @returns Domain name without www
  */
-/* const sanitizeDomainName = flowRight(
+const sanitizeDomainName = flowRight(
   removeTrailingSlash,
   getSecondLevelDomain,
   trim,
   stringifyArg
-); */
+);
 
 const fetchSkimlinksDomains = async () => {
   const response = await fetch(
@@ -41,17 +40,17 @@ const fetchSkimlinksDomains = async () => {
  * @param domains List of domains
  * @returns Array of just retailer domains
  */
-/* const filterDomains = domains =>
+const filterDomains = domains =>
   Array.isArray(domains)
     ? domains.map(retailer => retailer.domain).map(sanitizeDomainName)
-    : []; */
+    : [];
 
-/* const createDomainRegex = domains => {
+const createDomainRegex = domains => {
   const domainRegexString = domains.join("|");
   const skimlinksRegex = new RegExp(domainRegexString);
 
   return skimlinksRegex;
-}; */
+};
 
 /**
  *
@@ -59,29 +58,26 @@ const fetchSkimlinksDomains = async () => {
  * @param contentPageUrl The referring page
  * @returns Skimlinks url
  */
-/* const constructSkimlinksUrl = (merchantUrl, contentPageUrl) => {
+const constructSkimlinksUrl = (merchantUrl, contentPageUrl) => {
   const skimlinksWrapper = `https://go.skimresources.com/?id=${publisherId}&url=${encodeURIComponent(
     merchantUrl
   )}&sref=${encodeURIComponent(contentPageUrl)}`;
 
   return skimlinksWrapper;
-}; */
-
-const wrapSkimlinks = async url => {
-  const data = await fetchSkimlinksDomains();
+};
 
-  // eslint-disable-next-line no-console
-  console.log("data: ", data);
-  /* const filteredDomains = filterDomains(data);
+const wrapSkimlinks = (url, contentPageUrl, filteredDomains) => {
   const skimlinksRegex = createDomainRegex(filteredDomains);
 
   if (skimlinksRegex.test(url)) {
     return constructSkimlinksUrl(url, contentPageUrl);
-  } */
+  }
 
   return url;
 };
 
 module.exports = {
-  wrapSkimlinks
+  wrapSkimlinks,
+  fetchSkimlinksDomains,
+  filterDomains
 };