account-lookup-service 15.6.0-iso.4 → 15.6.0-iso.6

package/.ncurc.yaml

@@ -2,5 +2,5 @@
 reject: [
   # TODO: v6+ (ref: https://github.com/sindresorhus/get-port/releases/tag/v6.0.0) is an ESM library and thus not compatible with CommonJS. Future story needed to resolve.
   "get-port",
-  "@mojaloop/central-services-shared" ## need to remove before merging proxyCache functionality to main
+  "@mojaloop/sdk-standard-components" ## version 19.1.0 caused lots of failed unit tests with the error - TypeError: Cannot read properties of undefined (reading 'createFSPIOPError')
 ]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "account-lookup-service",
   "description": "Account Lookup Service is used to validate Party and Participant lookups.",
-  "version": "15.6.0-iso.4",
+  "version": "15.6.0-iso.6",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -95,12 +95,12 @@
     "@mojaloop/central-services-health": "15.0.0",
     "@mojaloop/central-services-logger": "11.5.1",
     "@mojaloop/central-services-metrics": "12.0.8",
-    "@mojaloop/central-services-shared": "18.10.0-snapshot.4",
+    "@mojaloop/central-services-shared": "18.10.1-snapshot.3",
     "@mojaloop/central-services-stream": "11.3.1",
     "@mojaloop/database-lib": "11.0.6",
     "@mojaloop/event-sdk": "14.1.1",
     "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.0",
-    "@mojaloop/ml-schema-transformer-lib": "1.1.1",
+    "@mojaloop/ml-schema-transformer-lib": "1.1.3",
     "@mojaloop/sdk-standard-components": "19.0.0",
     "@now-ims/hapi-now-auth": "2.1.0",
     "ajv": "8.17.1",

package/src/models/participantEndpoint/facade.js

@@ -33,7 +33,9 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const JwsSigner = require('@mojaloop/sdk-standard-components').Jws.signer
 const Metrics = require('@mojaloop/central-services-metrics')
 const Config = require('../../lib/config')
+const { logger } = require('../../lib')
 const { hubNameRegex } = require('../../lib/util').hubNameConfig
+
 const uriRegex = /(?:^.*)(\/(participants|parties|quotes|transfers)(\/.*)*)$/
 
 /**
@@ -47,7 +49,7 @@ const defineJwsSigner = (config, headers, requestedEndpoint) => {
     // We need below 2 headers for JWS
     headers[Enums.Http.Headers.FSPIOP.HTTP_METHOD] = headers[Enums.Http.Headers.FSPIOP.HTTP_METHOD] || Enums.Http.RestMethods.PUT
     headers[Enums.Http.Headers.FSPIOP.URI] = headers[Enums.Http.Headers.FSPIOP.URI] || uriRegex.exec(requestedEndpoint)[1]
-    Logger.isDebugEnabled && Logger.debug('JWS is enabled, getting JwsSigner')
+    logger.debug('JWS is enabled, getting JwsSigner')
     jwsSigner = new JwsSigner({
       logger: Logger,
       signingKey: config.JWS_SIGNING_KEY
@@ -83,10 +85,10 @@ exports.sendRequest = async (headers, requestedParticipant, endpointType, method
   try {
     requestedEndpoint = await Util.Endpoints.getEndpoint(Config.SWITCH_ENDPOINT, requestedParticipant, endpointType, options || undefined)
     histTimerEndGetParticipantEndpoint({ success: true, endpointType, participantName: requestedParticipant })
-    Logger.isDebugEnabled && Logger.debug(`participant endpoint url: ${requestedEndpoint} for endpoint type ${endpointType}`)
+    logger.debug('participant requestedEndpoint and endpointType: ', { requestedEndpoint, endpointType })
   } catch (err) {
     histTimerEndGetParticipantEndpoint({ success: false, endpointType, participantName: requestedParticipant })
-    Logger.isErrorEnabled && Logger.error(`error in getEndpoint: ${err?.stack}`)
+    logger.warn('error in getEndpoint: ', err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 
@@ -115,8 +117,7 @@ exports.sendRequest = async (headers, requestedParticipant, endpointType, method
       hubNameRegex,
       apiType: Config.API_TYPE
     }
-    Logger.isDebugEnabled && Logger.debug(`participant - sendRequest params: ${JSON.stringify(params)}`)
-
+    logger.debug('participant - sendRequest params:', { params })
     params.jwsSigner = defineJwsSigner(Config, headers, requestedEndpoint)
 
     const resp = await Util.Request.sendRequest(params)
@@ -124,8 +125,7 @@ exports.sendRequest = async (headers, requestedParticipant, endpointType, method
     return resp
   } catch (err) {
     histTimerEndSendRequestToParticipant({ success: false, endpointType, participantName: requestedParticipant })
-    Logger.isErrorEnabled && Logger.error(`error in sendRequest: ${err?.stack}`)
-
+    logger.warn('error in sendRequest: ', err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
@@ -150,7 +150,7 @@ exports.validateParticipant = async (fsp) => {
     return resp
   } catch (err) {
     histTimerEnd({ success: false })
-    Logger.isErrorEnabled && Logger.error(`error in validateParticipant: ${err?.stack}`)
+    logger.warn('error in validateParticipant: ', err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
@@ -190,7 +190,7 @@ exports.sendErrorToParticipant = async (participantName, endpointType, errorInfo
     histTimerEndGetParticipantEndpoint({ success: true, endpointType, participantName })
   } catch (err) {
     histTimerEndGetParticipantEndpoint({ success: false, endpointType, participantName })
-    Logger.isWarnEnabled && Logger.warn(`error in getEndpoint: ${err?.message}`)
+    logger.warn('error in getEndpoint: ', err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 
@@ -227,15 +227,14 @@ exports.sendErrorToParticipant = async (participantName, endpointType, errorInfo
       protocolVersions,
       apiType: Config.API_TYPE
     }
-    Logger.isDebugEnabled && Logger.debug(`participant - sendErrorToParticipant params: ${JSON.stringify(params)}`)
-
+    logger.debug('participant - sendErrorToParticipant params: ', { params })
     params.jwsSigner = defineJwsSigner(Config, clonedHeaders, requesterErrorEndpoint)
 
     await Util.Request.sendRequest(params)
     histTimerEndSendRequestToParticipant({ success: true, endpointType, participantName })
   } catch (err) {
     histTimerEndSendRequestToParticipant({ success: false, endpointType, participantName })
-    Logger.isWarnEnabled && Logger.warn(`error in sendErrorToParticipant: ${err?.message}`)
+    logger.warn('error in sendErrorToParticipant: ', err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }

package/test/unit/domain/timeout/dto.test.js

@@ -9,8 +9,7 @@ describe('timeoutCallbackDto Tests -->', () => {
     config.API_TYPE = realApiType
   })
 
-  // todo: unskip after fixing transformLib SubId issue for parties.putError
-  test.skip('should produce ISO payload', async () => {
+  test('should produce ISO payload', async () => {
     config.API_TYPE = API_TYPES.iso20022
     const destination = 'D1'
     const partyId = 'P1'