@mparticle/web-google-tag-manager-kit 2.1.0 → 2.1.2

package/dist/GoogleTagManager-Kit.common.js

@@ -50,12 +50,6 @@ ConsentHandler.prototype.getUserConsentState = function () {
     return userConsentState;
 };
 
-ConsentHandler.prototype.getEventConsentState = function (eventConsentState) {
-    return eventConsentState && eventConsentState.getGDPRConsentState
-        ? eventConsentState.getGDPRConsentState()
-        : {};
-};
-
 ConsentHandler.prototype.getConsentSettings = function () {
     var consentSettings = {};
 
@@ -94,7 +88,7 @@ ConsentHandler.prototype.generateConsentStatePayloadFromMappings = function (
 
     for (var i = 0; i <= mappings.length - 1; i++) {
         var mappingEntry = mappings[i];
-        var mpMappedConsentName = mappingEntry.map;
+        var mpMappedConsentName = mappingEntry.map.toLowerCase();
         var googleMappedConsentName = mappingEntry.value;
 
         if (
@@ -251,6 +245,44 @@ Common.prototype.sendConsent = function (type, payload) {
     customDataLayer('consent', type, payload);
 };
 
+Common.prototype.getEventConsentState = function (eventConsentState) {
+    return eventConsentState && eventConsentState.getGDPRConsentState
+        ? eventConsentState.getGDPRConsentState()
+        : {};
+};
+
+Common.prototype.maybeSendConsentUpdateToGoogle = function (consentState) {
+    // If consent payload is empty,
+    // we never sent an initial default consent state
+    // so we shouldn't send an update.
+    if (
+        this.consentPayloadAsString && 
+        this.consentMappings && 
+        !this.isEmpty(consentState)
+    ) {
+        var updatedConsentPayload =
+            this.consentHandler.generateConsentStatePayloadFromMappings(
+                consentState,
+                this.consentMappings
+            );
+
+        var eventConsentAsString = JSON.stringify(updatedConsentPayload);
+
+        if (eventConsentAsString !== this.consentPayloadAsString) {
+            this.sendConsent('update', updatedConsentPayload);
+            this.consentPayloadAsString = eventConsentAsString;
+        }
+    }
+};
+
+Common.prototype.sendDefaultConsentPayloadToGoogle = function (consentPayload) {
+    this.consentPayloadAsString = JSON.stringify(
+        consentPayload
+    );
+
+    this.sendConsent('default', consentPayload);
+};
+
 Common.prototype.cloneObject = function (obj) {
     return JSON.parse(JSON.stringify(obj));
 };
@@ -576,34 +608,11 @@ function EventHandler(common) {
     this.common = common || {};
 }
 
-EventHandler.prototype.maybeSendConsentUpdateToGoogle = function (event) {
-    // If consent payload is empty,
-    // we never sent an initial default consent state
-    // so we shouldn't send an update.
-    if (this.common.consentPayloadAsString && this.common.consentMappings) {
-        var eventConsentState = this.common.consentHandler.getEventConsentState(
-            event.ConsentState
-        );
-
-        if (!this.common.isEmpty(eventConsentState)) {
-            var updatedConsentPayload =
-                this.common.consentHandler.generateConsentStatePayloadFromMappings(
-                    eventConsentState,
-                    this.common.consentMappings
-                );
-
-            var eventConsentAsString = JSON.stringify(updatedConsentPayload);
-
-            if (eventConsentAsString !== this.common.consentPayloadAsString) {
-                this.common.sendConsent('update', updatedConsentPayload);
-                this.common.consentPayloadAsString = eventConsentAsString;
-            }
-        }
-    }
-};
-
 EventHandler.prototype.logEvent = function (event) {
-    this.maybeSendConsentUpdateToGoogle(event);
+    var eventConsentState = this.common.getEventConsentState(
+        event.ConsentState
+    );
+    this.common.maybeSendConsentUpdateToGoogle(eventConsentState);
     this.common.send({
         event: event,
     });
@@ -614,7 +623,10 @@ EventHandler.prototype.logEvent = function (event) {
 EventHandler.prototype.logError = function() {};
 
 EventHandler.prototype.logPageView = function (event) {
-    this.maybeSendConsentUpdateToGoogle(event);
+    var eventConsentState = this.common.getEventConsentState(
+        event.ConsentState
+    );
+    this.common.maybeSendConsentUpdateToGoogle(eventConsentState);
     this.common.send({
         event: event,
         eventType: 'screen_view'
@@ -785,21 +797,26 @@ var initialization = {
 
         common.consentPayloadDefaults =
             common.consentHandler.getConsentSettings();
-        var initialConsentState = common.consentHandler.getUserConsentState();
 
-        var defaultConsentPayload =
+        var defaultConsentPayload = common.cloneObject(common.consentPayloadDefaults);
+        var updatedConsentState = common.consentHandler.getUserConsentState();
+        var updatedDefaultConsentPayload =
             common.consentHandler.generateConsentStatePayloadFromMappings(
-                initialConsentState,
+                updatedConsentState,
                 common.consentMappings
             );
 
+        // If a default consent payload exists (as selected in the mParticle UI), set it as the default
         if (!common.isEmpty(defaultConsentPayload)) {
-            common.consentPayloadAsString = JSON.stringify(
-                defaultConsentPayload
-            );
-
-            common.sendConsent('default', defaultConsentPayload);
+            common.sendDefaultConsentPayloadToGoogle(defaultConsentPayload);
+        // If a default consent payload does not exist, but the user currently has updated their consent,
+        // send that as the default because a default must be sent
+        } else if (!common.isEmpty(updatedDefaultConsentPayload)) {
+            common.sendDefaultConsentPayloadToGoogle(updatedDefaultConsentPayload);
         }
+
+        common.maybeSendConsentUpdateToGoogle(updatedConsentState);
+            
     },
 };
 
@@ -1093,8 +1110,7 @@ var constructor = function() {
 
     function logSessionStart(event) {
         try {
-            sessionHandler_1.onSessionStart(event);
-            return true;
+            return sessionHandler_1.onSessionStart(event);
         } catch (e) {
             return {
                 error: 'Error starting session on forwarder ' + name + '; ' + e,
@@ -1104,8 +1120,7 @@ var constructor = function() {
 
     function logSessionEnd(event) {
         try {
-            sessionHandler_1.onSessionEnd(event);
-            return true;
+            return sessionHandler_1.onSessionEnd(event);
         } catch (e) {
             return {
                 error: 'Error ending session on forwarder ' + name + '; ' + e,
@@ -1115,8 +1130,7 @@ var constructor = function() {
 
     function logError(event) {
         try {
-            self.eventHandler.logError(event);
-            return true;
+            return self.eventHandler.logError(event);
         } catch (e) {
             return {
                 error: 'Error logging error on forwarder ' + name + '; ' + e,
@@ -1126,8 +1140,7 @@ var constructor = function() {
 
     function logPageView(event) {
         try {
-            self.eventHandler.logPageView(event);
-            return true;
+            return self.eventHandler.logPageView(event);
         } catch (e) {
             return {
                 error:
@@ -1138,8 +1151,7 @@ var constructor = function() {
 
     function logEvent(event) {
         try {
-            self.eventHandler.logEvent(event);
-            return true;
+            return self.eventHandler.logEvent(event);
         } catch (e) {
             return {
                 error: 'Error logging event on forwarder ' + name + '; ' + e,
@@ -1149,8 +1161,7 @@ var constructor = function() {
 
     function logEcommerceEvent(event) {
         try {
-            self.commerceHandler.logCommerceEvent(event);
-            return true;
+            return self.commerceHandler.logCommerceEvent(event);
         } catch (e) {
             return {
                 error:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mparticle/web-google-tag-manager-kit",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "repository": "https://github.com/mparticle-integrations/mparticle-javascript-integration-google-tag-manager",
   "main": "dist/GoogleTagManager-Kit.common.js",
   "browser": "dist/GoogleTagManager-Kit.common.js",
@@ -9,8 +9,7 @@
   ],
   "scripts": {
     "test": "npm run build && npm run test:karma",
-    "test:karma": "npm run testKarma",
-    "testKarma": "node test/boilerplate/test-karma.js",
+    "test:karma": "node test/test-karma.js",
     "build": "ENVIRONMENT=production rollup --config rollup.config.js",
     "watch": "ENVIRONMENT=production rollup --config rollup.config.js -w",
     "testEndToEnd": "browserify node_modules/@mparticle/web-kit-wrapper/end-to-end-testapp/index.js -v -o test/end-to-end-testapp/build/compilation.js && open http://localhost:8082/node_modules/@mparticle/web-kit-wrapper/end-to-end-testapp/index.html && node node_modules/@mparticle/web-kit-wrapper/end-to-end-testapp/server"
@@ -20,8 +19,11 @@
   },
   "devDependencies": {
     "@mparticle/web-kit-wrapper": "^1.0.5",
+    "@semantic-release/changelog": "^5.0.1",
+    "@semantic-release/exec": "^5.0.0",
+    "@semantic-release/git": "^9.0.0",
     "chai": "^4.3.4",
-    "karma": "^3.1.1",
+    "karma": "^5.1.0",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-edge-launcher": "^0.4.2",