fix(client:auth): fix auth 'decorator'

closes #1492
angular-fullstack · Dec 13, 2015 · 56d12fc · 56d12fc
1 parent ecf9014
commit 56d12fc
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/app/templates/client/components/auth(auth)/router.decorator.js b/app/templates/client/components/auth(auth)/router.decorator.js
@@ -10,17 +10,29 @@ angular.module('<%= scriptAppName %>.auth')
         return;
       }
 
-      let query = typeof next.authenticate === 'string' ? Auth.hasRole : Auth.isLoggedIn;
+      if(typeof next.authenticate === 'string') {
+        Auth.hasRole(next.authenticate, _.noop).then(has => {
+          if(has) {
+            return;
+          }
 
-      query(1,2).then(good => {
-        if(!good) {
           event.preventDefault();
-          Auth.isLoggedIn().then(is => {<% if (filters.ngroute) { %>
+          return Auth.isLoggedIn().then(is => {<% if (filters.ngroute) { %>
             $location.path(is ? '/' : '/login');<% } if (filters.uirouter) { %>
             $state.go(is ? 'main' : 'login');<% } %>
           });
-        }
-      });
+        })
+      } else {
+        Auth.isLoggedIn(_.noop).then(is => {
+          if(is) {
+            return;
+          }
+
+          event.preventDefault();<% if (filters.ngroute) { %>
+          $location.path('/');<% } if (filters.uirouter) { %>
+          $state.go('main');<% } %>
+        });
+      }
     });    
   });