feat(auth): improve auth service and route protection

42Zavattas · May 1, 2015 · 8dfb37c · 8dfb37c
1 parent bc6b532
commit 8dfb37c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/app/templates/client/app.js b/app/templates/client/app.js
@@ -45,8 +45,16 @@ angular.module('<%= appname %>', [
     };
   })
 
-  .run(function ($rootScope, Auth) {
+  .run(function ($rootScope, $location, Auth) {
 
     $rootScope.Auth = Auth;
 
+    $rootScope.$on('$routeChangeStart', function (event, next) {
+      Auth.isReadyLogged().catch(function () {
+        if (next.authenticate) {
+          $location.path('/');
+        }
+      });
+    });
+
   })<% } %>;
diff --git a/app/templates/client/services/auth(auth)/auth.js b/app/templates/client/services/auth(auth)/auth.js
@@ -4,15 +4,18 @@ angular.module('<%= appname %>')
   .service('Auth', function ($rootScope, $cookieStore, $q, $http) {
 
     var _user = {};
+    var _ready = $q.defer();
 
     if ($cookieStore.get('token')) {
       $http.get('/api/users/me')
         .then(function (res) {
           _user = res.data;
         })
-        .catch(function (err) {
-          console.log(err);
+        .finally(function (err) {
+          _ready.resolve();
         });
+    } else {
+      _ready.resolve();
     }
 
     /**
@@ -64,12 +67,29 @@ angular.module('<%= appname %>')
     };
 
     /**
-     * Check if user is logged
+     * Check if the user is logged
      *
      * @returns {boolean}
      */
     this.isLogged = function () {
-      return _user.hasOwnProperty('email');
+      return _user.hasOwnProperty('_id');
+    };
+
+    /**
+     * Check if the user is logged after the ready state
+     *
+     * @returns {Promise}
+     */
+    this.isReadyLogged = function () {
+      var def = $q.defer();
+      _ready.promise.then(function () {
+        if (_user.hasOwnProperty('_id')) {
+          def.resolve();
+        } else {
+          def.reject();
+        }
+      });
+      return def.promise;
     };
 
     /**