@mparticle/web-optimizely-kit 2.1.2 → 2.1.5

package/dist/OptimizelyKit.common.js

@@ -35,8 +35,10 @@ var helpers = {
         var userIdentities = identities['userIdentities'];
         var userId;
         switch(userIdField) {
+            // The server returns `customerId` as part of the `userIdField` setting
+            // but the API for identity requies it to be cased as `customerid`
             case 'customerId':
-                userId = userIdentities['customerId'];
+                userId = userIdentities['customerid'];
                 break;
             case 'email':
                 userId = userIdentities['email'];
@@ -338,6 +340,10 @@ IdentityHandler.prototype.onSetUserIdentity = function(
 
 var identityHandler = IdentityHandler;
 
+var optimizelyFsSdkUrl = 'https://unpkg.com/@optimizely/optimizely-sdk@3.5.0/dist/optimizely.browser.umd.min.js',
+    dataFilePrefix = 'https://cdn.optimizely.com/datafiles/',
+    dataFileURLending = '.json/tag.js';
+
 var initialization = {
     name: 'Optimizely',
     moduleId: 54,
@@ -345,7 +351,7 @@ var initialization = {
         common.useFullStack = settings.useFullStack === 'True';
 
         if (!testMode) {
-            if (!window.optimizely && !settings.useFullStack) {
+            if (!window.optimizely && !common.useFullStack) {
                 var optimizelyScript = document.createElement('script');
                 optimizelyScript.type = 'text/javascript';
                 optimizelyScript.async = true;
@@ -366,7 +372,7 @@ var initialization = {
                 loadWebXEventsAndPages();
             }
 
-            if (!window.optimizelyClientInstance && settings.useFullStack) {
+            if (!window.optimizelyClientInstance && common.useFullStack) {
                 common.userIdField = settings.userIdField;
                 common.userAttributes = userAttributes;
                 var errorHandler = function() {};
@@ -386,17 +392,27 @@ var initialization = {
                     });  
                 };
 
-                helpers_1.loadScript('https://unpkg.com/@optimizely/optimizely-sdk/dist/optimizely.browser.umd.min.js', 
-                helpers_1.loadScript('https://cdn.optimizely.com/datafiles/' + settings.projectId + '.json/tag.js', instantiateFSClient));
+                helpers_1.loadScript(optimizelyFsSdkUrl,
+                    function() {
+                        helpers_1.loadScript(
+                          dataFilePrefix +
+                            settings.projectId +
+                            dataFileURLending,
+                          instantiateFSClient
+                        );
+                    }
+                );
 
             } else {
+                common.userIdField = settings.userIdField;
+                common.userAttributes = userAttributes;
                 loadFullStackEvents();
             }            
         } else {
-            if (!settings.useFullStack) {
+            if (!common.useFullStack) {
                 loadWebXEventsAndPages();
             }
-            if (settings.useFullStack) {
+            if (common.useFullStack) {
                 common.userIdField = settings.userIdField;
                 common.userAttributes = userAttributes;
                 loadFullStackEvents();
@@ -553,7 +569,10 @@ var constructor = function() {
     ) {
         forwarderSettings = settings;
 
-        if (window.mParticle.isTestEnvironment) {
+        if (
+            typeof window !== 'undefined' &&
+            window.mParticle.isTestEnvironment
+        ) {
             reportingService = function() {};
         } else {
             reportingService = service;
@@ -969,14 +988,14 @@ function isObject(val) {
 
 function register(config) {
     if (!config) {
-        window.console.log(
+        console.log(
             'You must pass a config object to register the kit ' + name
         );
         return;
     }
 
     if (!isObject(config)) {
-        window.console.log(
+        console.log(
             "'config' must be an object. You passed in a " + typeof config
         );
         return;
@@ -992,17 +1011,19 @@ function register(config) {
             constructor: constructor,
         };
     }
-    window.console.log(
+    console.log(
         'Successfully registered ' + name + ' to your mParticle configuration'
     );
 }
 
-if (window && window.mParticle && window.mParticle.addForwarder) {
-    window.mParticle.addForwarder({
-        name: name,
-        constructor: constructor,
-        getId: getId,
-    });
+if (typeof window !== 'undefined') {
+    if (window && window.mParticle && window.mParticle.addForwarder) {
+        window.mParticle.addForwarder({
+            name: name,
+            constructor: constructor,
+            getId: getId,
+        });
+    }
 }
 
 var webKitWrapper = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mparticle/web-optimizely-kit",
-    "version": "2.1.2",
+    "version": "2.1.5",
     "author": "mParticle Developers <developers@mparticle.com> (https://www.mparticle.com)",
     "description": "mParticle integration sdk for Optimizely",
     "main": "dist/OptimizelyKit.common.js",
@@ -16,7 +16,7 @@
         "watch": "ENVIRONMENT=production rollup --config rollup.config.js -w"
     },
     "devDependencies": {
-        "@mparticle/web-kit-wrapper": "^1.0.4",
+        "@mparticle/web-kit-wrapper": "^1.0.5",
         "chai": "^4.2.0",
         "karma": "^3.1.1",
         "karma-chai": "^0.1.0",