From 3d15da61ecd28bc6f31926a0de026a846739937c Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Tue, 30 Jun 2015 16:52:18 -0500
Subject: [PATCH] fix(analytics): Correct user ID handling

---
 website/public/js/controllers/authCtrl.js       | 14 +++-----------
 website/public/js/services/analyticsServices.js |  4 ++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/website/public/js/controllers/authCtrl.js b/website/public/js/controllers/authCtrl.js
index e7a4439cc0..89be71c6af 100644
--- a/website/public/js/controllers/authCtrl.js
+++ b/website/public/js/controllers/authCtrl.js
@@ -18,6 +18,9 @@ angular.module('habitrpg')
         User.authenticate(id, token, function(err) {
           if(!err) $scope.registrationInProgress = false;
           $window.location.href = ('/' + window.location.hash);
+          Analytics.login();
+          Analytics.updateUser();
+          Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'login'});
         });
       };
 
@@ -48,7 +51,6 @@ angular.module('habitrpg')
         $http.post(url, scope.registerVals).success(function(data, status, headers, config) {
           runAuth(data.id, data.apiToken);
           if (status == 200) {
-            Analytics.register();
             if (data.auth.facebook) {
               Analytics.updateUser({'email':data.auth.facebook._json.email,'language':data.preferences.language});
               Analytics.track({'hitType':'event','eventCategory':'acquisition','eventAction':'register','authType':'facebook'});
@@ -68,11 +70,6 @@ angular.module('habitrpg')
         $http.post(ApiUrl.get() + "/api/v2/user/auth/local", data)
           .success(function(data, status, headers, config) {
             runAuth(data.id, data.token);
-            if (status == 200) {
-              Analytics.login();
-              Analytics.updateUser();
-              Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'login'});
-            }
           }).error(errorAlert);
       };
 
@@ -112,11 +109,6 @@ angular.module('habitrpg')
         hello(network).login({scope:'email'}).then(function(auth){
           $http.post(ApiUrl.get() + "/api/v2/user/auth/social", auth)
             .success(function(data, status, headers, config) {
-              if (status == 200) {
-                Analytics.login();
-                Analytics.updateUser();
-                Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'login'});
-              }
               runAuth(data.id, data.token);
             }).error(errorAlert);
         }, function( e ){
diff --git a/website/public/js/services/analyticsServices.js b/website/public/js/services/analyticsServices.js
index 53f7c42186..44aeb6b839 100644
--- a/website/public/js/services/analyticsServices.js
+++ b/website/public/js/services/analyticsServices.js
@@ -23,14 +23,14 @@
     var i = ["init", "logEvent", "logRevenue", "setUserId", "setUserProperties", "setOptOut", "setVersionName", "setDomain", "setDeviceId", "setGlobalUserProperties"];
     for (var o = 0; o < i.length; o++) {a(i[o])}
     window.amplitude = r;
-    amplitude.init(window.env.AMPLITUDE_KEY);
+    amplitude.init(window.env.AMPLITUDE_KEY, user._id);
 
     // Google Analytics (aka Universal Analytics)
     window['GoogleAnalyticsObject'] = 'ga';
     window['ga'] = window['ga'] || function() {
         (window['ga'].q = window['ga'].q || []).push(arguments)
       }, window['ga'].l = 1 * new Date();
-    ga('create', window.env.GA_ID, 'auto');
+    ga('create', window.env.GA_ID, {'userId':user._id});
 
     function loadScripts() {
       setTimeout(function() {