@@ -6,7 +6,7 @@ const AWS = require('aws-sdk')
66const config = require ( 'config' )
77const elasticsearch = require ( 'elasticsearch' )
88const _ = require ( 'lodash' )
9- const tcCoreLibAuth = require ( 'tc-core-library-js' )
9+ const tcCoreLib = require ( 'tc-core-library-js' )
1010const urlencode = require ( 'urlencode' )
1111
1212const logger = require ( './logger' )
@@ -15,18 +15,14 @@ AWS.config.region = config.get('esConfig.AWS_REGION')
1515// ES Client mapping
1616const esClients = { }
1717
18- const m2mAuth = tcCoreLibAuth . auth . m2m
19- const util = tcCoreLibAuth . util ( config )
20- let m2m = null
18+ const m2m = tcCoreLib . auth . m2m ( config )
19+ const tcCoreLibUtil = tcCoreLib . util ( config )
2120
2221/**
2322 * Get machine to machine token.
2423 * @returns {Promise } promise which resolves to the m2m token
2524 */
2625async function getM2MToken ( ) {
27- if ( _ . isNull ( m2m ) ) {
28- m2m = m2mAuth ( _ . pick ( config , [ 'AUTH0_URL' , 'AUTH0_AUDIENCE' , 'TOKEN_CACHE_TIME' , 'AUTH0_PROXY_SERVER_URL' ] ) )
29- }
3026 return m2m . getMachineToken ( config . AUTH0_CLIENT_ID , config . AUTH0_CLIENT_SECRET )
3127}
3228
@@ -153,7 +149,7 @@ async function updateMetadadaESPromise (updateDocHandler) {
153149async function getMemberDetailsByUserIds ( userIds ) {
154150 try {
155151 const token = await getM2MToken ( )
156- const httpClient = util . getHttpClient ( { id : `projectMemberService_${ userIds . join ( '_' ) } ` , log : logger } )
152+ const httpClient = tcCoreLibUtil . getHttpClient ( { id : `projectMemberService_${ userIds . join ( '_' ) } ` , log : logger } )
157153 return httpClient . get ( `${ config . MEMBER_SERVICE_ENDPOINT } /_search` , {
158154 params : {
159155 query : `${ _ . map ( userIds , id => `userId:${ id } ` ) . join ( urlencode ( ' OR ' , 'utf8' ) ) } ` ,
0 commit comments