@@ -16,6 +16,7 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
1616 ////////////
1717
1818 function _checkAndRefreshToken ( config , token ) {
19+ logger . debug ( "_checkAndRefreshToken: " + config . url + ", " + + token )
1920 if ( isTokenExpired ( token ) ) {
2021 logger . debug ( String . supplant ( 'Token has expired, attempting to refreshToken() for "{url}"' , config ) )
2122
@@ -33,6 +34,7 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
3334 return null
3435 } )
3536 } else {
37+ logger . debug ( "returning token " + token )
3638 return token
3739 }
3840 }
@@ -54,8 +56,11 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
5456 for ( var i = 0 ; i < haveItAddItEndpoints . length ; i ++ ) {
5557 var obj = haveItAddItEndpoints [ i ]
5658 var re = new RegExp ( obj . url )
59+ logger . debug ( "haveItAddItEndpoints[" + i + "]=" + obj . url + " ===> config.url=" + config . url )
5760 if ( config . method . toUpperCase ( ) === obj . method && re . test ( config . url ) ) {
61+ logger . debug ( "checking for authentication" )
5862 if ( TcAuthService . isAuthenticated ( ) ) {
63+ logger . debug ( "found authenticated" )
5964 var token = null
6065 if ( config . url . indexOf ( 'v2/' ) > - 1 ||
6166 config . url . indexOf ( 'memberCert' ) > - 1 ||
@@ -64,6 +69,7 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
6469 } else {
6570 token = getCurrentUser ( ) !== null ? getCurrentUser ( ) . token : null
6671 }
72+ logger . debug ( "found token: " + token )
6773 return _checkAndRefreshToken ( config , token )
6874 }
6975 // else
@@ -75,7 +81,9 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
7581 // for everything else assume that we need to send token
7682 var idToken = config . url . indexOf ( 'v2/' ) > - 1 ? AuthTokenService . getV2Token ( ) : ( getCurrentUser ( ) !== null ? getCurrentUser ( ) . token : null )
7783
84+ logger . debug ( "idToken: " + idToken )
7885 if ( ! TcAuthService . isAuthenticated ( ) || idToken == null ) {
86+ logger . debug ( "redirecting to accounts app" )
7987 var retUrl = CONSTANTS . MAIN_URL + '/?next=' + config . url
8088 $window . location = CONSTANTS . ACCOUNTS_APP_URL + '?retUrl=' + encodeURIComponent ( retUrl )
8189 return
0 commit comments