WEB-1471:FIX: Bug introduced by compiler due to renaming of opts.cust…

…omSession.uuid property name because it matched a top lvel import

lib/externs/session-id-tracker.js

@@ -4,7 +4,7 @@
  *   customDimensionIndex: (number),
  *   customSession: (Object),
  *   customSession.customDimensionIndex: (number),
- *   customSession.uuid: (string),
+ *   customSession.id: (string),
  * }}
  */
 var SessionIdTrackerOpts;

lib/plugins/session-id-tracker.js

@@ -23,7 +23,7 @@ class SessionIdTracker {
       throw new Error(`The SessionIdTracker plugin requires a
         customDimensionIndex to store the auto generated uuid value in
         or a customSession object with customDimensionIndex number and
-        uuid string. You can use both. Please provide the options when requiring
+        id string. You can use both. Please provide the options when requiring
         the plugin.`);
     }
 
@@ -37,19 +37,19 @@ class SessionIdTracker {
     if (SessionIdTracker.validateCustomSessionOpts(opts)) {
       tracker.set(
         'dimension' + opts.customSession.customDimensionIndex,
-        opts.customSession.uuid
+        opts.customSession.id
       );
     }
   }
 
   /**
-   * Validates the type of the uuid property passed in opts.
+   * Validates the type of the id property passed in opts.
    * @param  {!SessionIdTrackerOpts} opts Passed by the require command.
-   * @return {boolean} Indicates if uuid property passed in is valid.
+   * @return {boolean} Indicates if id property passed in is valid.
    */
   static validateCustomSessionOpts(opts) {
-    return typeof opts.customSession.customDimensionIndex === 'number'
-      && typeof opts.customSession.uuid === 'string';
+    return (typeof opts.customSession === 'object' && typeof opts.customSession.customDimensionIndex === 'number'
+      && typeof opts.customSession.id === 'string');
   }
 
   /**

test/e2e/fixtures/ga-autotrack-ids-sandbox.html

@@ -16,24 +16,24 @@
     ga('require', 'gaTaskManager');
 
     // Add a function to customTask
-    ga('GaTaskManager:addFunctionToTask', 'customTask', 'logShinyString', function(model){
+    ga('gaTaskManager:addFunctionToTask', 'customTask', 'logShinyString', function(model){
       console.log("Look at my shiny new random customTask");
     });
 
-    ga('require', 'ClientIdTracker', {
+    ga('require', 'clientIdTracker', {
       customDimensionIndex: 1
     });
-    ga('require', 'SessionIdTracker', {
+    ga('require', 'sessionIdTracker', {
       customDimensionIndex: 2,
       customSession: {
         customDimensionIndex: 5,
-        uuid: 'MY-UUID'
+        id: 'MY-UUID'
       }
     });
-    ga('require', 'HitIdTracker', {
+    ga('require', 'hitIdTracker', {
       customDimensionIndex: 3
     });
-    ga('require', 'HitTimestampTracker', {
+    ga('require', 'hitTimestampTracker', {
       customDimensionIndex: 4
     });