fix(app): wait for currentUser to resolve before checking if logged i…

…n on route changes fixes #306, #294
angular-fullstack · Jul 13, 2014 · 6d6090d · 6d6090d · f2net · Jul 14, 2014
1 parent 64f33f0
commit 6d6090d
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 5 deletions.
diff --git a/app/templates/client/app/app(coffee).coffee b/app/templates/client/app/app(coffee).coffee
@@ -35,5 +35,6 @@ angular.module('<%= scriptAppName %>', [<%= angularModules %>])
   .run (($rootScope, $location, Auth) ->
     # Redirect to login if route requires auth and you're not logged in
     $rootScope.$on <% if(filters.ngroute) { %>'$routeChangeStart'<% } %><% if(filters.uirouter) { %>'$stateChangeStart'<% } %>, (event, next) ->
-      $location.path '/login'  if next.authenticate and not Auth.isLoggedIn()
+      Auth.isLoggedInAsync (loggedIn) ->
+        $location.path "/login"  if next.authenticate and not loggedIn
   )<% } %>
diff --git a/app/templates/client/app/app(js).js b/app/templates/client/app/app(js).js
@@ -46,8 +46,10 @@ angular.module('<%= scriptAppName %>', [<%= angularModules %>])
   .run(function ($rootScope, $location, Auth) {
     // Redirect to login if route requires auth and you're not logged in
     $rootScope.$on(<% if(filters.ngroute) { %>'$routeChangeStart'<% } %><% if(filters.uirouter) { %>'$stateChangeStart'<% } %>, function (event, next) {
-      if (next.authenticate && !Auth.isLoggedIn()) {
-        $location.path('/login');
-      }
+      Auth.isLoggedInAsync(function(loggedIn) {
+        if (next.authenticate && !loggedIn) {
+          $location.path('/login');
+        }
+      });
     });
   })<% } %>;
diff --git a/app/templates/client/components/auth(auth)/auth.service(coffee).coffee b/app/templates/client/components/auth(auth)/auth.service(coffee).coffee
@@ -92,14 +92,31 @@ angular.module('<%= scriptAppName %>').factory 'Auth', ($location, $rootScope, $
 
 
   ###
-  Check if a user is logged in
+  Check if a user is logged in synchronously
 
   @return {Boolean}
   ###
   isLoggedIn: ->
     currentUser.hasOwnProperty 'role'
 
 
+  ###
+  Waits for currentUser to resolve before checking if user is logged in
+  ###
+  isLoggedInAsync: (cb) ->
+    if currentUser.hasOwnProperty('$promise')
+      currentUser.$promise.then(->
+        cb true
+        return
+      ).catch ->
+        cb false
+        return
+
+    else if currentUser.hasOwnProperty('role')
+      cb true
+    else
+      cb false
+
   ###
   Check if a user is an admin
 

diff --git a/app/templates/client/components/auth(auth)/auth.service(js).js b/app/templates/client/components/auth(auth)/auth.service(js).js
@@ -110,6 +110,23 @@ angular.module('<%= scriptAppName %>')
         return currentUser.hasOwnProperty('role');
       },
 
+      /**
+       * Waits for currentUser to resolve before checking if user is logged in
+       */
+      isLoggedInAsync: function(cb) {
+        if(currentUser.hasOwnProperty('$promise')) {
+          currentUser.$promise.then(function() {
+            cb(true);
+          }).catch(function() {
+            cb(false);
+          });
+        } else if(currentUser.hasOwnProperty('role')) {
+          cb(true);
+        } else {
+          cb(false);
+        }
+      },
+
       /**
        * Check if a user is an admin
        *