Merge pull request #371 from CodeNow/fixing-some-login-stuff

Fixing some stuff with login

Author: SomeKittens

client/config/routes.js

@@ -16,7 +16,6 @@ module.exports = [
     state: 'base',
     abstract: true,
     url: '^/:userName',
-    templateUrl: 'viewInstanceLayout',
     controller: 'ControllerApp'
   },
   {

client/controllers/controllerApp.js

@@ -39,20 +39,22 @@ function ControllerApp(
     actions: {}
   };
   function setActiveAccount(accountName) {
-    $scope.$watch('dataApp.data.orgs', function(n) {
-      if (n) {
-        dataApp.data.instances = null;
-        var accounts = [thisUser].concat(n.models);
-        dataApp.data.activeAccount = accounts.find(function (org) {
-          return (keypather.get(org, 'oauthName().toLowerCase()') === accountName.toLowerCase());
-        });
-        if (!dataApp.data.activeAccount) {
-          dataApp.data.activeAccount = thisUser;
+    if (accountName) {
+      $scope.$watch('dataApp.data.orgs', function(n) {
+        if (n) {
+          dataApp.data.instances = null;
+          var accounts = [thisUser].concat(n.models);
+          dataApp.data.activeAccount = accounts.find(function (org) {
+            return (keypather.get(org, 'oauthName().toLowerCase()') === accountName.toLowerCase());
+          });
+          if (!dataApp.data.activeAccount) {
+            dataApp.data.activeAccount = thisUser;
+          }
+          $rootScope.$broadcast('INSTANCE_LIST_FETCH', dataApp.data.activeAccount.oauthName());
+          $rootScope.safeApply();
         }
-        $rootScope.$broadcast('INSTANCE_LIST_FETCH', dataApp.data.activeAccount.oauthName());
-        $rootScope.safeApply();
-      }
-    });
+      });
+    }
   }
   // shows spinner overlay
   dataApp.data.loading = false;
@@ -66,7 +68,6 @@ function ControllerApp(
 
   var thisUser;
 
-
   $scope.$watch(function () {
     return errs.errors.length;
   }, function(n) {
@@ -85,37 +86,40 @@ function ControllerApp(
     $scope.$broadcast('app-document-click');
   };
 
-
   fetchUser(function(err, results) {
-    thisUser = results;
-    dataApp.data.user = results;
-  });
-  fetchOrgs(function(err, results) {
-    dataApp.data.orgs = results;
-    $rootScope.safeApply();
-    if (err) {
-      return errs.handler(err);
-    }
-    if ($window.heap) {
-      $window.heap.identify({
-        name:  thisUser.oauthName(),
-        email: thisUser.attrs.email,
-        orgs:  $window.JSON.stringify(results)
+    if (!err) {
+      thisUser = results;
+      dataApp.data.user = results;
+      fetchOrgs(function (err, results) {
+        if (err) {
+          return errs.handler(err);
+        }
+        dataApp.data.orgs = results;
+        if ($window.heap) {
+          $window.heap.identify({
+            name:  thisUser.oauthName(),
+            email: thisUser.attrs.email,
+            orgs:  $window.JSON.stringify(results)
+          });
+        }
+        if ($window.initIntercom) {
+          $window.initIntercom({
+            name: thisUser.oauthName(),
+            email: thisUser.attrs.email,
+            // Convert ISO8601 to Unix timestamp
+            created_at: +(new Date(thisUser.attrs.created)),
+            app_id: 'wqzm3rju'
+          });
+        }
+        if ($window.olark) {
+          $window.olark('api.visitor.updateEmailAddress', { emailAddress: thisUser.attrs.email });
+          $window.olark('api.visitor.updateFullName', { fullName: thisUser.oauthName() });
+          $window.olark('api.box.show');
+        }
+        $rootScope.safeApply();
       });
-    }
-    if ($window.initIntercom) {
-      $window.initIntercom({
-        name: thisUser.oauthName(),
-        email: thisUser.attrs.email,
-        // Convert ISO8601 to Unix timestamp
-        created_at: +(new Date(thisUser.attrs.created)),
-        app_id: 'wqzm3rju'
-     });
-    }
-    if ($window.olark) {
-      $window.olark('api.visitor.updateEmailAddress', { emailAddress: thisUser.attrs.email });
-      $window.olark('api.visitor.updateFullName', { fullName: thisUser.oauthName() });
-      $window.olark('api.box.show');
+    } else {
+      return errs.handler(err);
     }
   });
 }