Prevent samesite cookie warning from triggering (close #886)

snowplow · Feb 3, 2021 · a5630d1 · a5630d1
1 parent 45b934b
commit a5630d1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
diff --git a/src/js/lib/detectors.js b/src/js/lib/detectors.js
@@ -34,7 +34,7 @@
 
 import isUndefined from 'lodash/isUndefined';
 import { jstz } from 'jstimezonedetect';
-import { isFunction, cookie } from '../lib/helpers'
+import { isFunction } from '../lib/helpers'
 
 var windowAlias = window,
   navigatorAlias = navigator,
@@ -89,14 +89,7 @@ export function localStorageAccessible() {
 /*
  * Does browser have cookies enabled (for this site)?
  */
-export function hasCookies(testCookieName) {
-  var cookieName = testCookieName || 'testcookie';
-
-  if (isUndefined(navigatorAlias.cookieEnabled)) {
-    cookie(cookieName, '1');
-    return cookie(cookieName) === '1' ? '1' : '0';
-  }
-
+export function hasCookies() {
   return navigatorAlias.cookieEnabled ? '1' : '0';
 }
 
@@ -154,7 +147,7 @@ export function detectDocumentSize() {
  * @param string testCookieName Name to use for the test cookie
  * @return Object containing browser features
  */
-export function detectBrowserFeatures(useCookies, testCookieName) {
+export function detectBrowserFeatures() {
   var i,
     mimeType,
     pluginMap = {
@@ -206,9 +199,7 @@ export function detectBrowserFeatures(useCookies, testCookieName) {
   // Other browser features
   features.res = screenAlias.width + 'x' + screenAlias.height;
   features.cd = screenAlias.colorDepth;
-  if (useCookies) {
-    features.cookie = hasCookies(testCookieName);
-  }
+  features.cookie = hasCookies();
 
   return features;
 }
diff --git a/src/js/lib/helpers.js b/src/js/lib/helpers.js
@@ -401,7 +401,7 @@ export function attemptWriteSessionStorage(key, value) {
 /**
  * Finds the root domain
  */
-export function findRootDomain() {
+export function findRootDomain(sameSite, secure) {
   var cookiePrefix = '_sp_root_domain_test_';
   var cookieName = cookiePrefix + new Date().getTime();
   var cookieValue = '_test_value_' + new Date().getTime();
@@ -410,13 +410,13 @@ export function findRootDomain() {
   var position = split.length - 1;
   while (position >= 0) {
     var currentDomain = split.slice(position, split.length).join('.');
-    cookie(cookieName, cookieValue, 0, '/', currentDomain);
+    cookie(cookieName, cookieValue, 0, '/', currentDomain, sameSite, secure);
     if (cookie(cookieName) === cookieValue) {
       // Clean up created cookie(s)
-      deleteCookie(cookieName, currentDomain);
+      deleteCookie(cookieName, currentDomain, sameSite, secure);
       var cookieNames = getCookiesWithPrefix(cookiePrefix);
       for (var i = 0; i < cookieNames.length; i++) {
-        deleteCookie(cookieNames[i], currentDomain);
+        deleteCookie(cookieNames[i], currentDomain, sameSite, secure);
       }
 
       return currentDomain;
@@ -450,8 +450,8 @@ export function isValueInArray(val, array) {
  * @param cookieName The name of the cookie to delete
  * @param domainName The domain the cookie is in
  */
-export function deleteCookie(cookieName, domainName) {
-  cookie(cookieName, '', -1, '/', domainName);
+export function deleteCookie(cookieName, domainName, sameSite, secure) {
+  cookie(cookieName, '', -1, '/', domainName, sameSite, secure);
 }
 
 /**

diff --git a/src/js/tracker.js b/src/js/tracker.js
@@ -256,10 +256,7 @@ export function Tracker(functionName, namespace, version, mutSnowplowState, argm
     // Browser language (or Windows language for IE). Imperfect but CloudFront doesn't log the Accept-Language header
     browserLanguage = navigatorAlias.userLanguage || navigatorAlias.language,
     // Browser features via client-side data collection
-    browserFeatures = detectBrowserFeatures(
-      configStateStorageStrategy == 'cookie' || configStateStorageStrategy == 'cookieAndLocalStorage',
-      getSnowplowCookieName('testcookie')
-    ),
+    browserFeatures = detectBrowserFeatures(),
     // Unique ID for the tracker instance used to mark links which are being tracked
     trackerId = functionName + '_' + namespace,
     // Last activity timestamp
@@ -353,7 +350,7 @@ export function Tracker(functionName, namespace, version, mutSnowplowState, argm
   let gdprBasisData = {};
 
   if (argmap.hasOwnProperty('discoverRootDomain') && argmap.discoverRootDomain) {
-    configCookieDomain = findRootDomain();
+    configCookieDomain = findRootDomain(configCookieSameSite, configCookieSecure);
   }
 
   if (autoContexts.gaCookies) {
@@ -691,8 +688,8 @@ export function Tracker(functionName, namespace, version, mutSnowplowState, argm
     const sesname = getSnowplowCookieName('ses');
     attemptDeleteLocalStorage(idname);
     attemptDeleteLocalStorage(sesname);
-    deleteCookie(idname);
-    deleteCookie(sesname);
+    deleteCookie(idname, configCookieDomain, configCookieSameSite, configCookieSecure);
+    deleteCookie(sesname, configCookieDomain, configCookieSameSite, configCookieSecure);
   }
 
   /*