Improved authorization.

Author: smartapant

src/app/modules/common/common.js

@@ -29,7 +29,20 @@
     };
   }
 
-  function session() {
+
+  session.$inject = ['$http'];
+  function session($http) {
+    var session = this;
+
+    this.fetchCurrentUser = function(url) {
+      session.pending = true;
+      return $http.get(url)
+        .success(function(user) {
+          session.setCurrentUser(user);
+          session.pending = false;
+        });
+    };
+
     this.getCurrentUser = function() {
       return this.user;
     };
@@ -39,20 +52,26 @@
     };
   }
 
-  auth.$inject = ['session', '$state'];
-  function auth(session, $state) {
+  auth.$inject = ['session', '$state', '$urlRouter'];
+  function auth(session, $state, $urlRouter) {
     this.stateName = 'login';
 
     this.init = function(stateName) {
       this.stateName = stateName;
     };
 
     this.checkAccess = function(event, toState) {
+      session.pending && _onSessionPending(event);
       if (!session.getCurrentUser() && !(toState.data && toState.data.noAuth)) {
         event.preventDefault();
         $state.go(this.stateName);
       }
     };
+
+    function _onSessionPending(event) {
+      event.preventDefault();
+      setTimeout($urlRouter.sync, 0);
+    }
   }
 
 })();

src/app/modules/core/core.js

@@ -3,7 +3,8 @@
 
   angular
     .module('app.core')
-    .controller('App', AppController);
+    .controller('App', AppController)
+    .run(activate);
 
   AppController.$inject = ['config', '$scope', '$http', 'shortHistory', 'session', 'auth'];
   function AppController(config, $scope, $http, shortHistory, session, auth) {
@@ -23,16 +24,13 @@
       $(document).trigger('sn:loaded', [event, toState, toParams, fromState, fromParams]);
     });
 
-    activate();
+    shortHistory.init($scope);
+  }
 
-    function activate() {
-      shortHistory.init($scope);
-      auth.init('login');
-      $http.get('/api/profile')
-        .success(function(user) {
-          session.setCurrentUser(user);
-        });
-    }
+  activate.$inject = ['auth', 'session'];
+  function activate(auth, session) {
+    auth.init('login');
+    session.fetchCurrentUser('/api/profile');
   }
 
 })();