Skip to content
Snippets Groups Projects
Commit b84b2f56 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

force our homepage controller to resolve our app init process before executing...

force our homepage controller to resolve our app init process before executing to avoid issues with redirect logic not working because we don't have appropriate state information yet.
parent 95167bfb
Branches
Tags
No related merge requests found
......@@ -43,7 +43,12 @@ Corvus.config(['$routeProvider', '$locationProvider', function($routeProvider, $
$routeProvider.when('/', {
template: '',
controller: 'Homepage'
controller: 'Homepage',
resolve: {
appState: function(AppState) {
return AppState.init();
}
}
});
$routeProvider.when('/unauthorized/', {
......
......@@ -12,6 +12,8 @@ CorvusServices.factory('AppState', ['$rootScope', '$routeParams', '$q', '$locati
// 1. appstate:user
// 2. appstate:organization
var initPromise;
var service = {
model: {
......@@ -24,8 +26,21 @@ CorvusServices.factory('AppState', ['$rootScope', '$routeParams', '$q', '$locati
},
init: function() {
// just make sure we grab the current user
service.model.currentUserPromise = service.refreshCurrentUser();
if (!initPromise) {
var deferred = $q.defer();
initPromise = deferred.promise;
// just make sure we grab the current user
service.model.currentUserPromise = service.refreshCurrentUser();
service.model.currentUserPromise.then(function (user) {
deferred.resolve();
}, function (error) {
deferred.resolve();
});
}
return initPromise;
},
clearState: function() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment