[WIP] Make passing user id explicit

node_modules/c9/skip-analytics.js

@@ -10,23 +10,15 @@ define(function(require, exports, module) {
     var hasInternalDomain = require("c9/has-internal-domain");
     var hasInternalTestName = require("c9/has-internal-test-name");
 
-    function skipAnalytics(user, allowUnauthorized) {
-        if (!user) return true;
-
-        if (!user.id && !user.uid) return true; // users without an id should never reach the Segment library
+    function skipAnalytics(userId, user, allowUnauthorized) {
+        if (!allowUnauthorized && userId === -1) return true;
         
-        if (!allowUnauthorized && hasUnauthorizedId(user)) return true;
+        if (!userId || !user) return true;
 
         if (hasInternalTestName(user)) return true;
         if (hasInternalDomain(user.email)) return true;
         return false;
     }
 
-    function hasUnauthorizedId(user) {
-        if (user.id === -1) return true;
-
-        if (!user.id && user.uid === -1) return true;
-    }
-
     module.exports = skipAnalytics;
 });

node_modules/c9/skip-analytics_test.js

@@ -8,10 +8,10 @@ var skipAnalytics = require("c9/skip-analytics");
 
 describe("skip-analytics", function() {
 
-    it("returns true when user undefined", function() {
+    it("returns true when user or user id undefined", function() {
         var user;
 
-        assert.equal(true, skipAnalytics(user), "skipAnalytics should return true when user undefined");
+        assert.equal(true, skipAnalytics(null, user), "skipAnalytics should return true when user undefined");
     });
 
     it("returns true when user id is -1", function() {