@@ -62,9 +62,9 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
62
62
config . url . indexOf ( 'badges' ) > - 1 ) {
63
63
token = AuthTokenService . getV2Token ( )
64
64
} else {
65
- token = getCurrentUser ( ) != null ? getCurrentUser ( ) . token : null
65
+ token = getCurrentUser ( ) !== null ? getCurrentUser ( ) . token : null
66
66
}
67
- _checkAndRefreshToken ( config , token )
67
+ token = _checkAndRefreshToken ( config , token )
68
68
}
69
69
// else
70
70
logger . debug ( String . supplant ( 'Skipping authToken for "{url}, UnAuthenticated user"' , config ) )
@@ -73,7 +73,7 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
73
73
}
74
74
75
75
// for everything else assume that we need to send token
76
- var idToken = config . url . indexOf ( 'v2/' ) > - 1 ? AuthTokenService . getV2Token ( ) : ( getCurrentUser ( ) != null ? getCurrentUser ( ) . token : null )
76
+ var idToken = config . url . indexOf ( 'v2/' ) > - 1 ? AuthTokenService . getV2Token ( ) : ( getCurrentUser ( ) !== null ? getCurrentUser ( ) . token : null )
77
77
78
78
if ( ! TcAuthService . isAuthenticated ( ) || idToken == null ) {
79
79
var retUrl = CONSTANTS . MAIN_URL + '/?next=' + config . url
@@ -82,7 +82,7 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
82
82
}
83
83
84
84
// Note only v3tokens expire
85
- _checkAndRefreshToken ( config , idToken )
85
+ return _checkAndRefreshToken ( config , idToken )
86
86
}
87
87
return service
88
88
}
0 commit comments