@mparticle/web-google-tag-manager-kit 2.1.1 → 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 = {};
 
@@ -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);
+            
     },
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mparticle/web-google-tag-manager-kit",
-  "version": "2.1.1",
+  "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",