1.1.1 - make sure brand_uid is < 7 chars, fixed lint issues

Tout · Mar 24, 2016 · 8fa2372 · 8fa2372
1 parent e28dd13
commit 8fa2372
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -13,7 +13,7 @@
     "no-mixed-spaces-and-tabs": 2,
     "indent": [2, 2],
     "no-unused-vars": 1,
-    "no-console": 2,
+    "no-console": [2, { allow: ["warn", "error"] }],
     "no-underscore-dangle": 0,
     "no-alert": 2,
     "semi": 2,

diff --git a/dist/tout-js-sdk-embed-code.min.js b/dist/tout-js-sdk-embed-code.min.js
diff --git a/spec/embedcode_spec.js b/spec/embedcode_spec.js
@@ -161,6 +161,12 @@ describe("sdk embed code", function () {
         expect(document.getElementById("tout-js-sdk")).toBeNull();
       });
 
+      it("should bail early if brand uid is > 7 characters", function () {
+        TOUT.init('12345678');
+
+        expect(document.getElementById("tout-js-sdk")).toBeNull();
+      });
+
       it("should bail early if brand uid is the placeholder string in the documentation", function () {
         TOUT.init('PUT_YOUR_BRAND_UID_HERE');
 

diff --git a/spec/support/helper.js b/spec/support/helper.js
diff --git a/src/index.js b/src/index.js
@@ -11,11 +11,11 @@
   TOUT._sdkScriptTagParsedAt = new Date;
 
   // Set an embed code version for debugging purposes
-  TOUT.EMBED_CODE_VERSION='1.1.0';
+  TOUT.EMBED_CODE_VERSION='1.1.1';
 
   // Setup embed code constants which can be overriden for testing purposes
-  var sdkHost = TOUT.SDK_HOST || "platform.tout.com",
-    analyticsHost = TOUT.SDK_ANALYTICS_HOST || "analytics.tout.com";
+  var sdkHost = TOUT.SDK_HOST || 'platform.tout.com',
+    analyticsHost = TOUT.SDK_ANALYTICS_HOST || 'analytics.tout.com';
 
   // Setup an onReady handler which can save off any function calls until the sdk script tag has been loaded
   TOUT.onReady = function (func) {
@@ -29,7 +29,7 @@
   TOUT.init = function (brandUid, options) {
     options = options || {};
 
-    var sdkScriptId = "tout-js-sdk";
+    var sdkScriptId = 'tout-js-sdk';
 
     // Don't load the sdk script tag if it's already been loaded (and they aren't forcing us to init twice)
     if (document.getElementById(sdkScriptId) && !options.forceInit) {
@@ -41,9 +41,13 @@
     brandUid = TOUT.SDK_BRAND_UID || brandUid;
 
     // If brand uid isn't configured correctly, ping our analytics servers so Account Services can help that customer.
-    if (typeof brandUid === "undefined" || typeof brandUid !== 'string' || brandUid.length === 0 || brandUid === "PUT_YOUR_BRAND_UID_HERE") {
+    if (typeof brandUid === 'undefined' || typeof brandUid !== 'string' || brandUid.length === 0 || brandUid.length > 7) {
       var image = new Image();
-      image.src = "http://" + analyticsHost + "/events?trigger=sdk_log&log_level=error&log_message=BRAND_UID_NOT_DEFINED&content_page_url=" + encodeURIComponent(window.location.href);
+      image.src = 'http://' + analyticsHost + '/events?trigger=sdk_log&log_level=error&log_message=BRAND_UID_NOT_DEFINED&content_page_url=' + encodeURIComponent(window.location.href);
+
+      if(console && console.error) {
+        console.error('TOUT - Invalid Brand UID: ' + brandUid);
+      }
 
       // return the instance for chainability
       return TOUT;
@@ -57,7 +61,7 @@
     script.type = 'text/javascript';
     script.src = '//' + sdkHost + '/sdk/v1/' + brandUid + '.js';
     script.id = sdkScriptId;
-    script.className = "tout-sdk";
+    script.className = 'tout-sdk';
     var firstScript = document.getElementsByTagName('script')[0];
     firstScript.parentNode.insertBefore(script, firstScript);