@@ -16,25 +16,24 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
16
16
////////////
17
17
18
18
function _checkAndRefreshToken ( config , token ) {
19
- logger . debug ( '_checkAndRefreshToken: ' + config . url + ', ' + + token )
19
+ // logger.debug('_checkAndRefreshToken: ' + config.url + ', ' + + token)
20
20
if ( isTokenExpired ( token ) ) {
21
21
logger . debug ( String . supplant ( 'Token has expired, attempting to refreshToken() for "{url}"' , config ) )
22
22
23
23
return getFreshToken ( ) . then ( function ( refreshedToken ) {
24
- logger . debug ( 'Successfully refreshed V3 token.' )
24
+ // logger.debug('Successfully refreshed V3 token.')
25
25
return refreshedToken
26
26
} )
27
27
. catch ( function ( err ) {
28
28
// Server will not or cannot refresh token
29
29
logger . debug ( 'Unable to refresh V3 token, redirecting to login' )
30
- // logger.debug(resp)
31
30
var retUrl = CONSTANTS . MAIN_URL + '/?next=' + config . url
32
31
$window . location = CONSTANTS . ACCOUNTS_APP_URL + '?retUrl=' + encodeURIComponent ( retUrl )
33
32
34
33
return null
35
34
} )
36
35
} else {
37
- logger . debug ( 'returning token ' + token )
36
+ // logger.debug('returning token ' + token)
38
37
return token
39
38
}
40
39
}
@@ -56,11 +55,11 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
56
55
for ( var i = 0 ; i < haveItAddItEndpoints . length ; i ++ ) {
57
56
var obj = haveItAddItEndpoints [ i ]
58
57
var re = new RegExp ( obj . url )
59
- logger . debug ( 'haveItAddItEndpoints[' + i + ']=' + obj . url + ' ===> config.url=' + config . url )
58
+ // logger.debug('haveItAddItEndpoints[' + i + ']=' + obj.url + ' ===> config.url=' + config.url)
60
59
if ( config . method . toUpperCase ( ) === obj . method && re . test ( config . url ) ) {
61
- logger . debug ( 'checking for authentication' )
60
+ // logger.debug('checking for authentication')
62
61
if ( TcAuthService . isAuthenticated ( ) ) {
63
- logger . debug ( 'found authenticated' )
62
+ // logger.debug('found authenticated')
64
63
var token = null
65
64
if ( config . url . indexOf ( 'v2/' ) > - 1 ||
66
65
config . url . indexOf ( 'memberCert' ) > - 1 ||
@@ -69,7 +68,7 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
69
68
} else {
70
69
token = getCurrentUser ( ) !== null ? getCurrentUser ( ) . token : null
71
70
}
72
- logger . debug ( 'found token: ' + token )
71
+ // logger.debug('found token: ' + token)
73
72
return _checkAndRefreshToken ( config , token )
74
73
}
75
74
// else
@@ -81,9 +80,9 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
81
80
// for everything else assume that we need to send token
82
81
var idToken = config . url . indexOf ( 'v2/' ) > - 1 ? AuthTokenService . getV2Token ( ) : ( getCurrentUser ( ) !== null ? getCurrentUser ( ) . token : null )
83
82
84
- logger . debug ( 'idToken: ' + idToken )
83
+ // logger.debug('idToken: ' + idToken)
85
84
if ( ! TcAuthService . isAuthenticated ( ) || idToken == null ) {
86
- logger . debug ( 'redirecting to accounts app' )
85
+ // logger.debug('redirecting to accounts app')
87
86
var retUrl = CONSTANTS . MAIN_URL + '/?next=' + config . url
88
87
$window . location = CONSTANTS . ACCOUNTS_APP_URL + '?retUrl=' + encodeURIComponent ( retUrl )
89
88
return
0 commit comments