Merge pull request #1171 from kingcody/fix/route-auth-logic

fix(app): only check loggedIn when required

Author: Awk34

Diff for: app/templates/client/app/app(coffee).coffee

@@ -33,9 +33,10 @@ angular.module '<%= scriptAppName %>', [<%= angularModules %>]
     $q.reject response
 
 .run ($rootScope<% if (filters.ngroute) { %>, $location<% } %><% if (filters.uirouter) { %>, $state<% } %>, Auth) ->
-  # Redirect to login if route requires auth and you're not logged in
+  # Redirect to login if route requires auth and the user is not logged in
   $rootScope.$on <% if (filters.ngroute) { %>'$routeChangeStart'<% } %><% if (filters.uirouter) { %>'$stateChangeStart'<% } %>, (event, next) ->
-    Auth.isLoggedIn (loggedIn) ->
-      event.preventDefault()
-      <% if (filters.ngroute) { %>$location.path '/login'<% } %><% if (filters.uirouter) { %>$state.go 'login'<% } %> if next.authenticate and not loggedIn
-<% } %>
+    if next.authenticate
+      Auth.isLoggedIn (loggedIn) ->
+        if !loggedIn
+          event.preventDefault()
+          <% if (filters.ngroute) { %>$location.path '/login'<% } %><% if (filters.uirouter) { %>$state.go 'login'<% }} %>

Diff for: app/templates/client/app/app(js).js

@@ -45,13 +45,15 @@ angular.module('<%= scriptAppName %>', [<%= angularModules %>])
   })
 
   .run(function($rootScope<% if (filters.ngroute) { %>, $location<% } if (filters.uirouter) { %>, $state<% } %>, Auth) {
-    // Redirect to login if route requires auth and you're not logged in
+    // Redirect to login if route requires auth and the user is not logged in
     $rootScope.$on(<% if (filters.ngroute) { %>'$routeChangeStart'<% } %><% if (filters.uirouter) { %>'$stateChangeStart'<% } %>, function(event, next) {
-      Auth.isLoggedIn(function(loggedIn) {
-        if (next.authenticate && !loggedIn) {
-          event.preventDefault();
-          <% if (filters.ngroute) { %>$location.path('/login');<% } if (filters.uirouter) { %>$state.go('login');<% } %>
-        }
-      });
+      if (next.authenticate) {
+        Auth.isLoggedIn(function(loggedIn) {
+          if (!loggedIn) {
+            event.preventDefault();
+            <% if (filters.ngroute) { %>$location.path('/login');<% } if (filters.uirouter) { %>$state.go('login');<% } %>
+          }
+        });
+      }
     });
   })<% } %>;