@@ -6,27 +6,30 @@ 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' , '$window' , '$rootScope' , 'TcAuthService' , 'UserService' , ' Helpers', 'CONSTANTS' ]
9
+ LoginController . $inject = [ 'logger' , '$state' , '$stateParams' , '$window' , '$rootScope' , 'Helpers' , 'CONSTANTS' ]
10
10
11
- function LoginController ( logger , $state , $stateParams , $window , $rootScope , TcAuthService , UserService , Helpers , CONSTANTS ) {
11
+ function LoginController ( logger , $state , $stateParams , $window , $rootScope , Helpers , CONSTANTS ) {
12
12
var vm = this
13
13
vm . $stateParams = $stateParams
14
14
15
15
activate ( )
16
16
17
17
function activate ( ) {
18
18
var currentUser = getCurrentUser ( )
19
+ logger . debug ( 'checking for logged in user...' + currentUser )
19
20
if ( ! currentUser ) {
21
+ logger . debug ( 'loading user...' )
22
+ var next = $stateParams . next ? $stateParams . next : 'dashboard'
20
23
loadUser ( ) . then ( function ( token ) {
21
- logger . debug ( 'successful login with token ' + JSON . stringify ( token ) )
24
+ logger . debug ( 'successful login with token ' + token )
22
25
$rootScope . $broadcast ( CONSTANTS . EVENT_USER_LOGGED_IN )
23
- return Helpers . redirectPostLogin ( $stateParams . next )
26
+ logger . debug ( 'reidrecting to ' + next )
27
+ Helpers . redirectPostLogin ( next )
24
28
} , function ( ) {
25
29
logger . debug ( 'State requires authentication, and user is not logged in, redirecting' )
26
30
// setup redirect for post login
27
- event . preventDefault ( )
28
- var next = $stateParams . next ? $stateParams . next : 'dashboard'
29
31
var retUrl = $state . href ( next , { } , { absolute : true } )
32
+ logger . debug ( 'redirecting to accounts app for login...' )
30
33
$window . location = CONSTANTS . ACCOUNTS_APP_URL + '?retUrl=' + encodeURIComponent ( retUrl )
31
34
} )
32
35
}
0 commit comments