@@ -6,9 +6,9 @@ import { getCurrentUser, loadUser } from '../../services/userv3.service.js'
6
6
7
7
angular . module ( 'tc.account' ) . controller ( 'LoginController' , LoginController )
8
8
9
- LoginController . $inject = [ 'logger' , '$state' , '$stateParams' , '$location ' , '$scope ' , 'TcAuthService' , 'UserService' , 'Helpers' , 'CONSTANTS' ]
9
+ LoginController . $inject = [ 'logger' , '$state' , '$stateParams' , '$window ' , '$rootScope ' , 'TcAuthService' , 'UserService' , 'Helpers' , 'CONSTANTS' ]
10
10
11
- function LoginController ( logger , $state , $stateParams , $location , $scope , TcAuthService , UserService , Helpers , CONSTANTS ) {
11
+ function LoginController ( logger , $state , $stateParams , $window , $rootScope , TcAuthService , UserService , Helpers , CONSTANTS ) {
12
12
var vm = this
13
13
vm . $stateParams = $stateParams
14
14
@@ -25,8 +25,8 @@ import { getCurrentUser, loadUser } from '../../services/userv3.service.js'
25
25
logger . debug ( 'State requires authentication, and user is not logged in, redirecting' )
26
26
// setup redirect for post login
27
27
event . preventDefault ( )
28
- var next = $state . href ( toState . name , toParams , { absolute : true } )
29
- var retUrl = next
28
+ var next = $stateParams . next ? $stateParams . next : 'dashboard'
29
+ var retUrl = $state . href ( next , { } , { absolute : true } )
30
30
$window . location = CONSTANTS . ACCOUNTS_APP_URL + '?retUrl=' + encodeURIComponent ( retUrl )
31
31
} )
32
32
}
0 commit comments