2 files changed, 87 insertions, 70 deletions

diff --git a/web/react/stores/team_store.jsx b/web/react/stores/team_store.jsx
index e6380d19e..3f2248c44 100644
--- a/web/react/stores/team_store.jsx
+++ b/web/react/stores/team_store.jsx
@@ -13,89 +13,94 @@ var CHANGE_EVENT = 'change';
 
 var utils;
 function getWindowLocationOrigin() {
-    if (!utils) utils = require('../utils/utils.jsx');
+    if (!utils) {
+        utils = require('../utils/utils.jsx');
+    }
     return utils.getWindowLocationOrigin();
 }
 
 var TeamStore = assign({}, EventEmitter.prototype, {
-  emitChange: function() {
-    this.emit(CHANGE_EVENT);
-  },
-  addChangeListener: function(callback) {
-    this.on(CHANGE_EVENT, callback);
-  },
-  removeChangeListener: function(callback) {
-    this.removeListener(CHANGE_EVENT, callback);
-  },
-  get: function(id) {
-    var c = this._getTeams();
-    return c[id];
-  },
-  getByName: function(name) {
-    var current = null;
-    var t = this._getTeams();
+    emitChange: function() {
+        this.emit(CHANGE_EVENT);
+    },
+    addChangeListener: function(callback) {
+        this.on(CHANGE_EVENT, callback);
+    },
+    removeChangeListener: function(callback) {
+        this.removeListener(CHANGE_EVENT, callback);
+    },
+    get: function(id) {
+        var c = this.pGetTeams();
+        return c[id];
+    },
+    getByName: function(name) {
+        var t = this.pGetTeams();
 
-    for (id in t) {
-        if (t[id].name == name) {
-            return t[id];
+        for (var id in t) {
+            if (t[id].name === name) {
+                return t[id];
+            }
         }
-    }
 
-    return null;
-  },
-  getAll: function() {
-    return this._getTeams();
-  },
-  setCurrentId: function(id) {
-    if (id == null)
-      BrowserStore.removeItem("current_team_id");
-    else
-      BrowserStore.setItem("current_team_id", id);
-  },
-  getCurrentId: function() {
-    return BrowserStore.getItem("current_team_id");
-  },
-  getCurrent: function() {
-    var currentId = TeamStore.getCurrentId();
+        return null;
+    },
+    getAll: function() {
+        return this.pGetTeams();
+    },
+    setCurrentId: function(id) {
+        if (id === null) {
+            BrowserStore.removeItem('current_team_id');
+        } else {
+            BrowserStore.setItem('current_team_id', id);
+        }
+    },
+    getCurrentId: function() {
+        return BrowserStore.getItem('current_team_id');
+    },
+    getCurrent: function() {
+        var currentId = TeamStore.getCurrentId();
 
-    if (currentId != null)
-      return this.get(currentId);
-    else
-      return null;
-  },
-  getCurrentTeamUrl: function() {
-      return getWindowLocationOrigin() + "/" + this.getCurrent().name;
-  },
-  storeTeam: function(team) {
-      var teams = this._getTeams();
-      teams[team.id] = team;
-      this._storeTeams(teams);
-  },
-  _storeTeams: function(teams) {
-    BrowserStore.setItem("user_teams", teams);
-  },
-  _getTeams: function() {
-    return BrowserStore.getItem("user_teams", {});
-  }
+        if (currentId !== null) {
+            return this.get(currentId);
+        }
+        return null;
+    },
+    getCurrentTeamUrl: function() {
+        if (this.getCurrent()) {
+            return getWindowLocationOrigin() + '/' + this.getCurrent().name;
+        }
+        return null;
+    },
+    storeTeam: function(team) {
+        var teams = this.pGetTeams();
+        teams[team.id] = team;
+        this.pStoreTeams(teams);
+    },
+    pStoreTeams: function(teams) {
+        BrowserStore.setItem('user_teams', teams);
+    },
+    pGetTeams: function() {
+        return BrowserStore.getItem('user_teams', {});
+    }
 });
 
-TeamStore.dispatchToken = AppDispatcher.register(function(payload) {
-  var action = payload.action;
+TeamStore.dispatchToken = AppDispatcher.register(function registry(payload) {
+    var action = payload.action;
 
-  switch(action.type) {
+    switch (action.type) {
 
-    case ActionTypes.CLICK_TEAM:
-      TeamStore.setCurrentId(action.id);
-      TeamStore.emitChange();
-      break;
+        case ActionTypes.CLICK_TEAM:
+            TeamStore.setCurrentId(action.id);
+            TeamStore.emitChange();
+            break;
 
-    case ActionTypes.RECIEVED_TEAM:
-      TeamStore.storeTeam(action.team);
-      TeamStore.emitChange();
-      break;
+        case ActionTypes.RECIEVED_TEAM:
+            TeamStore.storeTeam(action.team);
+            TeamStore.emitChange();
+            break;
 
-    default:
-  }
+        default:
+    }
 });
 
 module.exports = TeamStore;
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx
index f8616c6ab..248495dac 100644
--- a/web/react/stores/user_store.jsx
+++ b/web/react/stores/user_store.jsx
@@ -4,6 +4,7 @@
 var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var EventEmitter = require('events').EventEmitter;
 var assign = require('object-assign');
+var client = require('../utils/client.jsx');
 
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
@@ -72,7 +73,7 @@ var UserStore = assign({}, EventEmitter.prototype, {
             BrowserStore.setGlobalItem('current_user_id', id);
         }
     },
-    getCurrentId: function() {
+    getCurrentId: function(skipFetch) {
         var currentId = this.gCurrentId;
 
         if (currentId == null) {
@@ -80,6 +81,17 @@ var UserStore = assign({}, EventEmitter.prototype, {
             this.gCurrentId = currentId;
         }
 
+        // this is a special case to force fetch the
+        // current user if it's missing
+        // it's synchronous to block rendering
+        if (currentId == null && !skipFetch) {
+            var me = client.getMeSynchronous();
+            if (me != null) {
+                this.setCurrentUser(me);
+                currentId = me.id;
+            }
+        }
+
         return currentId;
     },
     getCurrentUser: function() {