Merge pull request #631 from mottykohn/dev

A hacky fix for #574
AzureAD · Nov 2, 2017 · 288b651 · 288b651
2 parents 37cf397 + b0d609e
commit 288b651
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/adal-angular.js b/lib/adal-angular.js
@@ -295,11 +295,11 @@
                 };
 
                 var stateChangeErrorHandler = function (event, toState, toParams, fromState, fromParams, error) {
-                    _adal.verbose("State change error occured. Error: " + JSON.stringify(error));
+                    _adal.verbose("State change error occured. Error: " + typeof(error) === 'string'? error: JSON.stringify(error));
 
                     // adal interceptor sets the error on config.data property. If it is set, it means state change is rejected by adal,
                     // in which case set the defaultPrevented to true to avoid url update as that sometimesleads to infinte loop.
-                    if (error && error.data) {
+                    if (error && error.data && event) {
                         _adal.info("Setting defaultPrevented to true if state change error occured because adal rejected a request. Error: " + error.data);
                         event.preventDefault();
                     }
@@ -313,6 +313,12 @@
                 $rootScope.$on('$locationChangeStart', locationChangeHandler);
 
                 $rootScope.$on('$stateChangeError', stateChangeErrorHandler);
+
+                if ($injector.has('$transitions')) {
+                    var $transitions = $injector.get('$transitions');
+                    $transitions.onStart({}, (transition) => stateChangeHandler(null, transition.to()));
+                    $transitions.onError({}, (transition) => stateChangeErrorHandler(null, null, null, null, null, transition.error()));
+                }
 
                 //Event to track hash change of 
                 $window.addEventListener('adal:popUpHashChanged', function (e) {