@@ -50,7 +50,7 @@ import { getCurrentUser, loadUser } from './services/userv3.service.js'
50
50
$rootScope . $on ( '$stateChangeStart' , function ( event , toState , toParams , fromState , fromParams ) {
51
51
logger . debug ( 'checking auth for state: ' + toState . name + ' from state: ' + fromState . name )
52
52
var currentUser = getCurrentUser ( )
53
- if ( ! currentUser && toState . data && toState . data . authRequired ) {
53
+ if ( ! currentUser ) {
54
54
event . preventDefault ( )
55
55
loadUser ( ) . then ( function ( token ) {
56
56
logger . debug ( 'successful login with token ' + JSON . stringify ( token ) )
@@ -59,12 +59,14 @@ import { getCurrentUser, loadUser } from './services/userv3.service.js'
59
59
$state . go ( toState . name , toParams , { notify : false } )
60
60
$urlRouter . sync ( )
61
61
} , function ( ) {
62
- logger . debug ( 'State requires authentication, and user is not logged in, redirecting' )
63
- // setup redirect for post login
64
- event . preventDefault ( )
65
- var next = $state . href ( toState . name , toParams , { absolute : true } )
66
- var retUrl = next
67
- $window . location = CONSTANTS . ACCOUNTS_APP_URL + '?retUrl=' + encodeURIComponent ( retUrl )
62
+ if ( toState . data && toState . data . authRequired ) {
63
+ logger . debug ( 'State requires authentication, and user is not logged in, redirecting' )
64
+ // setup redirect for post login
65
+ event . preventDefault ( )
66
+ var next = $state . href ( toState . name , toParams , { absolute : true } )
67
+ var retUrl = next
68
+ $window . location = CONSTANTS . ACCOUNTS_APP_URL + '?retUrl=' + encodeURIComponent ( retUrl )
69
+ }
68
70
} )
69
71
}
70
72
} )
0 commit comments