gatsby-core-theme 32.0.0 → 32.0.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [32.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v32.0.0...v32.0.1) (2024-05-30)
+
+
+### Bug Fixes
+
+* tracker ([72f0022](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/72f0022e49a21ab9e6a7750a090257aac6058072))
+
 # [32.0.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v31.0.2...v32.0.0) (2024-05-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "32.0.0",
+  "version": "32.0.1",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/helpers/tracker.mjs

@@ -1,3 +1,4 @@
+/* eslint-disable no-nested-ternary */
 /* eslint-disable no-underscore-dangle */
 import { generateTrackerLink } from '~helpers/generators';
 
@@ -90,6 +91,7 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
     facebook_browser_id: cookie ? cookie._fbp || null : null,
     facebook_click_id: cookie ? cookie._fbc || null : null,
     split_test_name: cookie ? cookie.split_test_name || null : null,
+    google_client_id:  cookie ? cookie._ga || null : null,
     split_test_variant: cookie ? cookie.split_test_variant || null : null,
     facebook_pixel_id: process.env.PIXEL_ID || null,
     ...(isJsonString(cookie.affObject) ? JSON.parse(cookie.affObject) : {}),
@@ -102,7 +104,7 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
       : {}),
     ...(extraURLParams || {}),
   };
-
+  
   const res = await fetch(
     `${process.env.GATSBY_TRACKING_API_URL}?${new URLSearchParams(clean(urlParam)).toString()}`
   ).catch((err) => null);
@@ -115,6 +117,7 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
 
 export function getTrackingAPIParams(pageTemplate, module, tracker, clickedElement, url, referer) {
   const urlParams = {};
+  let extraData = {}
 
   if (pageTemplate) {
     urlParams.page_type = pageTemplate;
@@ -137,22 +140,20 @@ export function getTrackingAPIParams(pageTemplate, module, tracker, clickedEleme
   if (url && url.split('?').length === 2) {
     // eslint-disable-next-line prefer-destructuring
     urlParams.request_url = url.split('?')[0];
-    const extraData = deparam(url.split('?')[1]);
+    extraData = deparam(url.split('?')[1]);
     
     if (extraData.msclkid) {
-      urlParams.microsoft_click_id = extraData.msclkid;
-    }
-
-    if (extraData.brevo_customer_id) {
-      urlParams.brevo_customer_id = extraData.brevo_customer_id;
+      extraData.microsoft_click_id = extraData.msclkid;
+      delete extraData.msclkid;
     }
 
     if (extraData.gclid) {
-      urlParams.google_click_id = extraData.gclid;
+      extraData.google_click_id = extraData.gclid;
+      delete extraData.gclid;
     }
   } else if (url) {
     urlParams.request_url = url;
   }
-
-  return urlParams;
+  
+  return {...urlParams, ...extraData};
 }