Skip to content

Commit 70ea82a

Browse files
committed
Removed configWriteCookies setting (closes snowplow#390)
1 parent 4b0d6d6 commit 70ea82a

3 files changed

Lines changed: 10 additions & 33 deletions

File tree

src/js/in_queue.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151

5252
// Page view ID should be shared between all tracker instances
5353
var pageViewId = uuid.v4(),
54-
trackerDictionary = {},
55-
usedCookieNames = {};
54+
trackerDictionary = {}
5655

5756
/**
5857
* Get an array of trackers to which a function should be applied.
@@ -113,11 +112,6 @@
113112
*/
114113
function createNewNamespace(namespace, endpoint, argmap) {
115114
argmap = argmap || {};
116-
if ((!argmap.writeCookies) && (argmap.cookieName in usedCookieNames)) {
117-
argmap.writeCookies = false;
118-
} else {
119-
usedCookieNames[argmap.cookieName] = true;
120-
}
121115
trackerDictionary[namespace] = new TrackerConstructor(functionName, namespace, version, pageViewId, mutSnowplowState, argmap);
122116
trackerDictionary[namespace].setCollectorUrl(endpoint);
123117
}

src/js/tracker.js

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,12 @@
7676
* 10. forceSecureTracker, false
7777
* 11. useLocalStorage, true
7878
* 12. useCookies, true
79-
* 13. writeCookies, true
79+
* 13. sessionCookieTimeout, 1800
8080
* 14. contexts, {}
8181
* 15. post, false
8282
* 16. bufferSize, 1
8383
* 17. crossDomainLinker, false
8484
* 18. maxPostBytes, 40000
85-
* 19. sessionCookieTimeout, 1800
8685
*/
8786
object.Tracker = function Tracker(functionName, namespace, version, pageViewId, mutSnowplowState, argmap) {
8887

@@ -152,8 +151,6 @@
152151
// Default is user agent defined.
153152
configCookiePath = '/',
154153

155-
configWriteCookies = argmap.hasOwnProperty('writeCookies') ? argmap.writeCookies : true,
156-
157154
// Do Not Track browser feature
158155
dnt = navigatorAlias.doNotTrack || navigatorAlias.msDoNotTrack,
159156

@@ -579,13 +576,11 @@
579576
idCookieComponents[5] = idCookieComponents[4];
580577
}
581578

582-
if (configWriteCookies) {
583-
setSessionCookie();
584-
// Update currentVisitTs
585-
idCookieComponents[4] = Math.round(new Date().getTime() / 1000);
586-
idCookieComponents.shift();
587-
setDomainUserIdCookie.apply(null, idCookieComponents);
588-
}
579+
setSessionCookie();
580+
// Update currentVisitTs
581+
idCookieComponents[4] = Math.round(new Date().getTime() / 1000);
582+
idCookieComponents.shift();
583+
setDomainUserIdCookie.apply(null, idCookieComponents);
589584
}
590585

591586
/*
@@ -648,7 +643,7 @@
648643
lastVisitTs = id[5],
649644
sessionIdFromCookie = id[6];
650645

651-
if (configDoNotTrack && configUseCookies && configWriteCookies) {
646+
if (configDoNotTrack && configUseCookies) {
652647
cookie.cookie(idname, '', -1, configCookiePath, configCookieDomain);
653648
cookie.cookie(sesname, '', -1, configCookiePath, configCookieDomain);
654649
return;
@@ -695,7 +690,7 @@
695690
sb.add('url', purify(configCustomUrl || locationHrefAlias));
696691

697692
// Update cookies
698-
if (configUseCookies && configWriteCookies) {
693+
if (configUseCookies) {
699694
setDomainUserIdCookie(_domainUserId, createTs, memorizedVisitCount, nowTs, lastVisitTs, memorizedSessionId);
700695
setSessionCookie();
701696
}

tests/nonfunctional/in_queue.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@ define([
3838
"intern/dojo/node!../../src/js/in_queue"
3939
], function(registerSuite, assert, in_queue) {
4040

41-
var output = 0,
42-
writeCookies;
41+
var output = 0;
4342

4443
function mockTrackerConstructor (functionName, namespace, version, sessionId, mutSnowplowState, argmap) {
4544
var configCollectorUrl,
46-
configWriteCookies = argmap.hasOwnProperty('writeCookies') ? argmap.writeCookies : true,
4745
attribute = 10;
4846

4947
return {
@@ -61,9 +59,6 @@ define([
6159
},
6260
addAttributeToOutput: function() {
6361
output += attribute;
64-
},
65-
logConfigWriteCookies: function() {
66-
writeCookies = configWriteCookies;
6762
}
6863
}
6964
};
@@ -100,13 +95,6 @@ define([
10095
assert.equal(output, 29, "Set the attributes of the two trackers individually, then add both to output");
10196
},
10297

103-
"writeCookies properties have been correctly assigned": function() {
104-
asyncQueue.push(["logConfigWriteCookies:firstTracker"]);
105-
assert.strictEqual(writeCookies, true, "The first tracker is configured to create cookies");
106-
asyncQueue.push(["logConfigWriteCookies:sp"]);
107-
assert.strictEqual(writeCookies, false, "The second tracker has not been assigned a unique cookie namespace, so cannot create cookies");
108-
},
109-
11098
"Execute a user-defined custom callback": function () {
11199
var callbackExecuted = false;
112100
asyncQueue.push([function () { callbackExecuted = true; }]);

0 commit comments

Comments
 (0)