Authorization rewritten.

Author: smartapant

src/app/modules/common/common.js

@@ -29,17 +29,20 @@
     };
   }
 
-  session.$inject = ['$http'];
-  function session($http) {
+  session.$inject = ['$http', '$q'];
+  function session($http, $q) {
     var session = this;
 
     this.fetchCurrentUser = function(url) {
-      session.pending = true;
-      return $http.get(url)
-        .success(function(user) {
-          session.setCurrentUser(user);
-          session.pending = false;
+      var userFetch;
+      if (session.getCurrentUser()) {
+        userFetch = $q(function(resolve) {
+          resolve(session.getCurrentUser());
         });
+      } else {
+        userFetch = $http.get(url);
+      }
+      return userFetch;
     };
 
     this.getCurrentUser = function() {
@@ -51,19 +54,27 @@
     };
   }
 
-  auth.$inject = ['session', '$state', '$urlRouter'];
-  function auth(session, $state, $urlRouter) {
-    this.stateName = 'login';
+  auth.$inject = ['session', '$state', '$urlRouter', '$rootScope'];
+  function auth(session, $state, $rootScope) {
+    var auth = this;
 
-    this.init = function(stateName) {
-      this.stateName = stateName;
+    this.init = function(stateName, profileApi) {
+      this.stateName = stateName || 'login';
+      this.profileApi = profileApi || '/api/profile';
     };
 
-    this.checkAccess = function(event, toState) {
+    this.checkAccess = function(event, toState, toParams) {
       if (!session.getCurrentUser() && !(toState.data && toState.data.noAuth)) {
         event.preventDefault();
-        $state.go(this.stateName);
-      }
+        session.fetchCurrentUser(auth.profileApi)
+          .success(function(user) {
+            session.setCurrentUser(user);
+            $state.go(toState.name, toParams);
+          })
+          .error(function() {
+            $state.go(auth.stateName);
+          });
+        }
     };
   }
 

src/app/modules/core/core.js

@@ -6,17 +6,17 @@
     .controller('App', AppController)
     .run(activate);
 
-  AppController.$inject = ['config', '$scope', '$http', 'shortHistory', 'session', 'auth'];
-  function AppController(config, $scope, $http, shortHistory, session, auth) {
+  AppController.$inject = ['config', '$scope', '$rootScope', 'shortHistory', 'session', 'auth'];
+  function AppController(config, $scope, $rootScope, shortHistory, session, auth) {
     /*jshint validthis: true */
     var vm = this;
 
     vm.title = config.appTitle;
 
     $scope.app = config;
 
-    $scope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) {
-      auth.checkAccess(event, toState);
+    $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) {
+      auth.checkAccess(event, toState, toParams);
     });
 
     $scope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams){
@@ -29,8 +29,7 @@
 
   activate.$inject = ['auth', 'session'];
   function activate(auth, session) {
-    auth.init('login');
-    session.fetchCurrentUser('/api/profile');
+    auth.init('login', '/api/profile');
   }
 
 })();

src/app/modules/core/core.module.js

@@ -13,13 +13,18 @@
 
   core.config(appConfig);
 
-  appConfig.$inject = ['$stateProvider'];
-  function appConfig($stateProvider) {
+  appConfig.$inject = ['$stateProvider', '$urlRouterProvider'];
+  function appConfig($stateProvider, $urlRouterProvider) {
     $stateProvider
       .state('app', {
         url: '/app',
         abstract: true,
         templateUrl: 'app/modules/core/app.html'
       });
+
+    $urlRouterProvider.otherwise(function($injector) {
+      var $state = $injector.get('$state');
+      $state.go('app.dashboard');
+    });
   }
 })();

src/app/modules/profile/profile.module.js

@@ -5,9 +5,9 @@
 
   module.config(appConfig);
 
-  appConfig.$inject = ['$stateProvider', '$urlRouterProvider'];
+  appConfig.$inject = ['$stateProvider'];
 
-  function appConfig($stateProvider, $urlRouterProvider) {
+  function appConfig($stateProvider) {
     $stateProvider
       .state('login', {
         url: '/login',
@@ -36,7 +36,5 @@
         controller: 'ProfileController',
         controllerAs: 'vm'
       });
-
-    $urlRouterProvider.otherwise('');
   }
 })();