v8.4.4

GleapSDK · Dec 7, 2022 · f496f41 · f496f41
1 parent bab0d2b
commit f496f41
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/build/index.js b/build/index.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gleap",
-  "version": "8.4.3",
+  "version": "8.4.4",
   "main": "build/index.js",
   "scripts": {
     "start": "webpack serve",

diff --git a/published/8.4.4/index.js b/published/8.4.4/index.js
diff --git a/published/latest/index.js b/published/latest/index.js
diff --git a/src/GleapHelper.js b/src/GleapHelper.js
@@ -80,6 +80,20 @@ export const truncateString = (str, num) => {
   }
 }
 
+const removeSubDomain = (v) => {
+  try {
+    var parts = v.split('.');
+    var is2ndLevelDomain = false;
+    const secondLevel = parts[parts.length - 2];
+    if (secondLevel === "co" || secondLevel === "com" || secondLevel === "gv" || secondLevel === "ac" || secondLevel === "edu" || secondLevel === "gov" || secondLevel === "mil" || secondLevel === "net" || secondLevel === "org") {
+      is2ndLevelDomain = true;
+    }
+    parts = parts.slice(is2ndLevelDomain ? -3 : -2);
+    return parts.join('.');
+  } catch (exp) { }
+  return v;
+}
+
 export const loadFromGleapCache = (key) => {
   try {
     const cachedData = localStorage.getItem(`gleap-widget-${key}`);
@@ -110,7 +124,7 @@ export const setGleapCookie = (name, value, days) => {
       date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
       expires = "; expires=" + date.toUTCString();
     }
-    const host = window.location.host.split(":")[0];
+    const host = removeSubDomain(window.location.host.split(":")[0]);
     document.cookie = name + "=" + (value || "") + expires + "; path=/; domain=" + host;
   } catch (exp) { }
 }
@@ -130,7 +144,7 @@ export const getGleapCookie = (name) => {
 
 export const eraseGleapCookie = (name) => {
   try {
-    const host = window.location.host.split(":")[0];
+    const host = removeSubDomain(window.location.host.split(":")[0]);
     document.cookie = name + '=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT; Domain=' + host;
   } catch (exp) { }
 }