account-lookup-service 15.6.0-snapshot.0 → 15.6.0-snapshot.1

package/.ncurc.yaml

@@ -1,6 +1,5 @@
 ## Add a TODO comment indicating the reason for each rejected dependency upgrade added to this list, and what should be done to resolve it (i.e. handle it through a story, etc).
 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/sdk-standard-components" ## version 19.1.0 caused lots of failed unit tests with the error - TypeError: Cannot read properties of undefined (reading 'createFSPIOPError')
+  "get-port"
 ]

package/audit-ci.jsonc

@@ -27,6 +27,7 @@
     "GHSA-7fh5-64p2-3v2j",
     "GHSA-rm97-x556-q36h", // https://github.com/advisories/GHSA-rm97-x556-q36h
     "GHSA-rv95-896h-c2vc", // https://github.com/advisories/GHSA-rv95-896h-c2vc
-    "GHSA-952p-6rrq-rcjv" // https://github.com/advisories/GHSA-952p-6rrq-rcjv
+    "GHSA-952p-6rrq-rcjv", // https://github.com/advisories/GHSA-952p-6rrq-rcjv
+    "GHSA-3xgq-45jj-v275" // https://github.com/advisories/GHSA-3xgq-45jj-v275
   ]
 }

package/jest.config.js

@@ -1,5 +1,7 @@
 module.exports = {
   verbose: true,
+  clearMocks: true,
+
   collectCoverageFrom: [
     '**/src/**/**/*.js'
   ],

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-snapshot.0",
+  "version": "15.6.0-snapshot.1",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -54,7 +54,7 @@
     "test:coverage-check": "npm test -- --coverage",
     "test:junit": "npm test -- --reporters=default --reporters=jest-junit",
     "test:xunit": "npm run test:junit",
-    "test:functional": "sh ./scripts/test-functional.sh",
+    "test:functional": "bash ./scripts/test-functional.sh",
     "test:int": "npm run migrate  &&  npm run onboarding  &&  jest --config=./jest-int.config.js --runInBand",
     "test:integration": "npm run dc:up && npm run wait-4-docker && npm run test:int | tee ./test/results/test-int.log",
     "test:integration-runner": "TEST_MODE=rm ./test/integration-runner.sh",
@@ -89,25 +89,24 @@
     "@hapi/good": "9.0.1",
     "@hapi/hapi": "21.3.12",
     "@hapi/inert": "7.1.0",
-    "@hapi/joi": "17.1.1",
     "@hapi/vision": "7.0.3",
     "@mojaloop/central-services-error-handling": "13.0.2",
     "@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.12.0-snapshot.0",
+    "@mojaloop/central-services-metrics": "12.1.0",
+    "@mojaloop/central-services-shared": "18.11.1",
     "@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": "2.3.4",
-    "@mojaloop/sdk-standard-components": "19.0.0",
+    "@mojaloop/ml-schema-transformer-lib": "2.4.1",
+    "@mojaloop/sdk-standard-components": "19.5.1",
     "@now-ims/hapi-now-auth": "2.1.0",
     "ajv": "8.17.1",
     "ajv-keywords": "5.1.0",
     "blipp": "4.0.2",
     "commander": "12.1.0",
-    "cron": "3.2.0",
+    "cron": "3.2.1",
     "fast-safe-stringify": "^2.1.1",
     "hapi-auth-bearer-token": "8.0.0",
     "joi": "17.13.3",
@@ -159,10 +158,9 @@
     "jest-junit": "16.0.0",
     "jsdoc": "4.0.4",
     "nodemon": "3.1.7",
-    "npm-check-updates": "17.1.10",
+    "npm-check-updates": "17.1.11",
     "nyc": "17.1.0",
     "pre-commit": "1.2.2",
-    "proxyquire": "2.1.3",
     "replace": "^1.2.2",
     "sinon": "19.0.2",
     "standard": "17.1.2",

package/src/domain/parties/getPartiesByTypeAndID.js

@@ -32,21 +32,22 @@ const oracle = require('../../models/oracle/facade')
 const participant = require('../../models/participantEndpoint/facade')
 const { createCallbackHeaders } = require('../../lib/headers')
 const { ERROR_MESSAGES } = require('../../constants')
-const { loggerFactory } = require('../../lib')
+const { logger } = require('../../lib')
 const Config = require('../../lib/config')
 const utils = require('./utils')
 
 const { FspEndpointTypes, FspEndpointTemplates } = Enum.EndPoints
 const { Headers, RestMethods } = Enum.Http
 
-const logger = loggerFactory('domain:get-parties')
+const log = logger.child('domain:get-parties')
+const handleErrorOnSendingCallback = utils.createErrorHandlerOnSendingCallback(Config, log)
 
 const proxyCacheTtlSec = 40 // todo: make configurable
 
 const validateRequester = async ({ source, proxy, proxyCache }) => {
   const sourceParticipant = await participant.validateParticipant(source)
   if (sourceParticipant) {
-    logger.debug('source is in scheme', { source })
+    log.debug('source is in scheme', { source })
     return source
   }
 
@@ -63,7 +64,7 @@ const validateRequester = async ({ source, proxy, proxyCache }) => {
 
   const isCached = await proxyCache.addDfspIdToProxyMapping(source, proxy)
   // think, what if isCached !== true?
-  logger.info('source is added to proxyMapping cache:', { source, proxy, isCached })
+  log.info('source is added to proxyMapping cache:', { source, proxy, isCached })
   return proxy
 }
 
@@ -94,7 +95,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
   const callbackEndpointType = utils.getPartyCbType(partySubId)
 
   const childSpan = span ? span.getChild('getPartiesByTypeAndID') : undefined
-  logger.info('parties::getPartiesByTypeAndID::begin', { source, proxy, params })
+  log.info('parties::getPartiesByTypeAndID::begin', { source, proxy, params })
 
   let requester
   let fspiopError
@@ -127,7 +128,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
       await participant.sendRequest(headers, destination, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
 
       histTimerEnd({ success: true })
-      logger.info('discovery getPartiesByTypeAndID request was sent to destination', { destination })
+      log.info('discovery getPartiesByTypeAndID request was sent to destination', { destination })
       return
     }
 
@@ -161,7 +162,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         const schemeParticipant = await participant.validateParticipant(fspId)
         if (schemeParticipant) {
           sentCount++
-          logger.debug('participant is in scheme', { fspId })
+          log.debug('participant is in scheme', { fspId })
           return participant.sendRequest(clonedHeaders, party.fspId, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
         }
 
@@ -170,20 +171,20 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         if (proxyEnabled) {
           const proxyName = await proxyCache.lookupProxyByDfspId(fspId)
           if (!proxyName) {
-            logger.warn('no proxyMapping for participant!  TODO: Delete reference in oracle...', { fspId })
+            log.warn('no proxyMapping for participant!  TODO: Delete reference in oracle...', { fspId })
             // todo: delete reference in oracle
           } else {
             sentCount++
-            logger.debug('participant NOT is in scheme, use proxy name', { fspId, proxyName })
+            log.debug('participant NOT is in scheme, use proxy name', { fspId, proxyName })
             return participant.sendRequest(clonedHeaders, proxyName, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
           }
         }
       })
       await Promise.all(sending)
-      logger.info('participant.sendRequests to filtered oracle partyList are done', { sentCount })
+      log.info('participant.sendRequests to filtered oracle partyList are done', { sentCount })
       // todo: think what if sentCount === 0 here
     } else {
-      logger.info('empty partyList form oracle, getting proxies list...', { proxyEnabled, params })
+      log.info('empty partyList form oracle, getting proxies list...', { proxyEnabled, params })
       let filteredProxyNames = []
 
       if (proxyEnabled) {
@@ -206,7 +207,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
           fspiopError.toApiErrorObject(config.ERROR_HANDLING), callbackHeaders, params, childSpan)
       } else {
         const alsReq = utils.alsRequestDto(source, params)
-        logger.info('starting setSendToProxiesList flow: ', { filteredProxyNames, alsReq, proxyCacheTtlSec })
+        log.info('starting setSendToProxiesList flow: ', { filteredProxyNames, alsReq, proxyCacheTtlSec })
         const isCached = await proxyCache.setSendToProxiesList(alsReq, filteredProxyNames, proxyCacheTtlSec)
         if (!isCached) {
           throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.failedToCacheSendToProxiesList)
@@ -221,7 +222,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         // If, at least, one request is sent to proxy, we treat the whole flow as successful.
         // Failed requests should be handled by TTL expired/timeout handler
         // todo: - think, if we should handle failed requests here (e.g., by calling receivedErrorResponse)
-        logger.info('setSendToProxiesList flow is done:', { isOk, results, filteredProxyNames, alsReq })
+        log.info('setSendToProxiesList flow is done:', { isOk, results, filteredProxyNames, alsReq })
         if (!isOk) {
           throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.proxyConnectionError)
         }
@@ -229,7 +230,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
     }
     histTimerEnd({ success: true })
   } catch (err) {
-    fspiopError = await utils.handleErrorOnSendingCallback(err, headers, params, requester)
+    fspiopError = await handleErrorOnSendingCallback(err, headers, params, requester)
     histTimerEnd({ success: false })
   } finally {
     await utils.finishSpanWithError(childSpan, fspiopError)

package/src/domain/parties/parties.js

@@ -44,6 +44,7 @@ const utils = require('./utils')
 const getPartiesByTypeAndID = require('./getPartiesByTypeAndID')
 
 const logger = loggerFactory('domain:put-parties')
+const handleErrorOnSendingCallback = utils.createErrorHandlerOnSendingCallback(Config, logger)
 
 /**
  * @function putPartiesByTypeAndID
@@ -124,7 +125,7 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
     logger.info('parties::putPartiesByTypeAndID::callback was sent', { sendTo, options })
     histTimerEnd({ success: true })
   } catch (err) {
-    await utils.handleErrorOnSendingCallback(err, headers, params, sendTo)
+    await handleErrorOnSendingCallback(err, headers, params, sendTo)
     histTimerEnd({ success: false })
   }
 }
@@ -197,7 +198,7 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
     logger.info('putPartiesErrorByTypeAndID callback was sent', { sendTo })
     histTimerEnd({ success: true })
   } catch (err) {
-    fspiopError = await utils.handleErrorOnSendingCallback(err, headers, params, sendTo)
+    fspiopError = await handleErrorOnSendingCallback(err, headers, params, sendTo)
     histTimerEnd({ success: false })
   } finally {
     await utils.finishSpanWithError(childSpan, fspiopError)

package/src/domain/parties/utils.js

@@ -1,10 +1,9 @@
-const { Enum } = require('@mojaloop/central-services-shared')
+const { Enum, Util: { Hapi } } = require('@mojaloop/central-services-shared')
 const EventSdk = require('@mojaloop/event-sdk')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 
 const participant = require('../../models/participantEndpoint/facade')
-const Config = require('../../lib/config')
-const { logger } = require('../../lib')
+const { TransformFacades } = require('../../lib')
 
 const { FspEndpointTypes } = Enum.EndPoints
 const { Headers } = Enum.Http
@@ -33,6 +32,13 @@ const finishSpanWithError = async (childSpan, fspiopError) => {
   }
 }
 
+const makePutPartiesErrorPayload = async (config, fspiopError, headers, params) => {
+  const body = fspiopError.toApiErrorObject(config.ERROR_HANDLING)
+  return config.API_TYPE === Hapi.API_TYPES.iso20022
+    ? (await TransformFacades.FSPIOP.parties.putError({ body, headers, params })).body
+    : body
+}
+
 const alsRequestDto = (sourceId, params) => ({
   sourceId,
   type: params.Type,
@@ -54,13 +60,13 @@ const swapSourceDestinationHeaders = (headers) => {
 }
 
 // change signature to accept object
-const handleErrorOnSendingCallback = async (err, headers, params, requester) => {
+const createErrorHandlerOnSendingCallback = (config, logger) => async (err, headers, params, requester) => {
   try {
     logger.error('error in sending parties callback', err)
     const sendTo = requester || headers[Headers.FSPIOP.SOURCE]
     const errorCallbackEndpointType = errorPartyCbType(params.SubId)
     const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
-    const errInfo = fspiopError.toApiErrorObject(Config.ERROR_HANDLING)
+    const errInfo = await makePutPartiesErrorPayload(config, fspiopError, headers, params)
 
     await participant.sendErrorToParticipant(sendTo, errorCallbackEndpointType, errInfo, headers, params)
 
@@ -77,8 +83,9 @@ module.exports = {
   getPartyCbType,
   putPartyCbType,
   errorPartyCbType,
+  makePutPartiesErrorPayload,
   finishSpanWithError,
-  handleErrorOnSendingCallback,
+  createErrorHandlerOnSendingCallback,
   alsRequestDto,
   swapSourceDestinationHeaders
 }

package/src/domain/timeout/dto.js

@@ -8,18 +8,10 @@ const {
   EndPoints: { FspEndpointTypes }
 } = require('@mojaloop/central-services-shared').Enum
 const { Tracer } = require('@mojaloop/event-sdk')
-const { API_TYPES } = require('@mojaloop/central-services-shared').Util.Hapi
 
-const { TransformFacades } = require('../../lib')
 const LibUtil = require('../../lib/util')
 const Config = require('../../lib/config')
-
-const makeErrorPayload = async (headers, params) => {
-  const body = createFSPIOPError(FSPIOPErrorCodes.EXPIRED_ERROR).toApiErrorObject(Config.ERROR_HANDLING)
-  return Config.API_TYPE === API_TYPES.iso20022
-    ? (await TransformFacades.FSPIOP.parties.putError({ body, headers, params })).body
-    : body
-}
+const partiesUtils = require('../parties/utils')
 
 const timeoutCallbackDto = async ({ destination, partyId, partyType }) => {
   const headers = {
@@ -30,8 +22,10 @@ const timeoutCallbackDto = async ({ destination, partyId, partyType }) => {
     ID: partyId,
     Type: partyType
   }
+  const error = createFSPIOPError(FSPIOPErrorCodes.EXPIRED_ERROR)
+
   const dto = {
-    errorInformation: await makeErrorPayload(headers, params),
+    errorInformation: await partiesUtils.makePutPartiesErrorPayload(Config, error, headers, params),
     headers,
     params,
     endpointType: FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTIES_PUT_ERROR

package/test/unit/domain/parties/parties.test.js

@@ -613,7 +613,7 @@ describe('Parties Tests', () => {
     it('handles error when `participant.validateParticipant()` returns no participant', async () => {
       expect.hasAssertions()
       // Arrange
-      const loggerStub = sandbox.stub(logger, 'error')
+      const loggerStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.sendErrorToParticipant = sandbox.stub().resolves()
 
       const payload = JSON.stringify({ testPayload: true })
@@ -874,7 +874,7 @@ describe('Parties Tests', () => {
     it('handles error when `validateParticipant()` fails', async () => {
       expect.hasAssertions()
       // Arrange)
-      const loggerStub = sandbox.stub(logger.mlLogger, 'error')
+      const loggerStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().throws(new Error('Validation fails'))
       participant.sendErrorToParticipant = sandbox.stub().resolves({})
       const payload = JSON.stringify({ errorPayload: true })
@@ -894,7 +894,7 @@ describe('Parties Tests', () => {
       expect.hasAssertions()
       // Arrange
 
-      const loggerStub = sandbox.stub(logger.mlLogger, 'error')
+      const loggerStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().throws(new Error('Validation fails'))
       participant.sendErrorToParticipant = sandbox.stub().resolves({})
       const payload = JSON.stringify({ errorPayload: true })

package/test/unit/domain/parties/utils.test.js

@@ -0,0 +1,60 @@
+/*****
+ License
+ --------------
+ Copyright © 2017 Bill & Melinda Gates Foundation
+ The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Gates Foundation organization for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+ * Gates Foundation
+ - Name Surname <name.surname@gatesfoundation.com>
+
+ * Eugen Klymniuk <eugen.klymniuk@infitx.com>
+ --------------
+ **********/
+
+const mockSendRequest = jest.fn()
+
+jest.mock('@mojaloop/central-services-shared', () => ({
+  ...jest.requireActual('@mojaloop/central-services-shared'),
+  Util: {
+    ...jest.requireActual('@mojaloop/central-services-shared').Util,
+    Endpoints: { getEndpoint: jest.fn() },
+    Request: { sendRequest: mockSendRequest }
+  }
+}))
+
+const { API_TYPES } = require('@mojaloop/central-services-shared').Util.Hapi
+const { logger } = require('../../../../src/lib')
+const utils = require('../../../../src/domain/parties/utils')
+const config = require('../../../../src/lib/config')
+const fixtures = require('../../../fixtures')
+
+describe('parties utils Tests -->', () => {
+  test('should send error party callback in ISO format', async () => {
+    const isoConfig = { ...config, API_TYPE: API_TYPES.iso20022 }
+    const err = new Error('test error')
+    const source = 'dfsp1'
+    const headers = fixtures.partiesCallHeadersDto({ source })
+    const params = { ID: '1234', Type: 'MSISDN' }
+
+    const handleError = utils.createErrorHandlerOnSendingCallback(isoConfig, logger)
+    await handleError(err, headers, params, source)
+
+    expect(mockSendRequest).toHaveBeenCalledTimes(1)
+    const { payload } = mockSendRequest.mock.calls[0][0]
+    expect(payload.Rpt.Rsn.Cd).toBe('2001')
+    expect(payload.Rpt.OrgnlId).toBe(`${params.Type}/${params.ID}`)
+    expect(payload.Assgnmt.Assgnr.Agt.FinInstnId.Othr.Id).toBe(source)
+  })
+})

package/test/unit/lib/TransformFacades.test.js

@@ -5,7 +5,7 @@ describe('TransformFacades Tests -->', () => {
   test('should transform PUT /parties error callback payload to ISO format', async () => {
     const body = errorCallbackResponseDto()
     const headers = partiesCallHeadersDto()
-    TransformFacades.FSPIOP.configure({ logger: console, isTestingMode: true })
+    TransformFacades.FSPIOP.configure({ isTestingMode: true })
     const isoPayload = await TransformFacades.FSPIOP.parties.putError({
       body,
       headers,

package/test/unit/models/participantEndpoint/facade.test.js

@@ -58,6 +58,18 @@ jest.mock('@mojaloop/central-services-shared', () => ({
 const Logger = require('@mojaloop/central-services-logger')
 const fixtures = require('../../../fixtures')
 
+const mockConfigDto = ({
+  apiType = 'fspiop', // todo: use API_TYPES
+  jwsSign = false
+} = {}) => ({
+  API_TYPE: apiType,
+  JWS_SIGN: jwsSign,
+  FSPIOP_SOURCE_TO_SIGN: mockHubName,
+  JWS_SIGNING_KEY_PATH: 'secrets/jwsSigningKey.key',
+  JWS_SIGNING_KEY: 'somekey',
+  PROTOCOL_VERSIONS: fixtures.protocolVersionsDto()
+})
+
 Logger.isDebugEnabled = jest.fn(() => true)
 Logger.isErrorEnabled = jest.fn(() => true)
 Logger.isInfoEnabled = jest.fn(() => true)
@@ -190,14 +202,6 @@ describe('participantEndpoint Facade', () => {
   })
 
   describe('sendErrorToParticipant', () => {
-    const mockConfigDto = ({ jwsSign = false } = {}) => ({
-      JWS_SIGN: jwsSign,
-      FSPIOP_SOURCE_TO_SIGN: mockHubName,
-      JWS_SIGNING_KEY_PATH: 'secrets/jwsSigningKey.key',
-      JWS_SIGNING_KEY: 'somekey',
-      PROTOCOL_VERSIONS: fixtures.protocolVersionsDto()
-    })
-
     it('throws an error when the request fails', async () => {
       // Arrange
       jest.mock('../../../../src/lib/config', () => mockConfigDto())
@@ -291,5 +295,18 @@ describe('participantEndpoint Facade', () => {
       })
       spy.mockRestore()
     })
+
+    it('should send error response with apiType from config [ISO20022]', async () => {
+      const apiType = 'iso20022'
+      jest.mock('../../../../src/lib/config', () => mockConfigDto({ apiType }))
+      mockGetEndpoint.mockImplementation(() => 'http://example.com/12345')
+
+      const { sendErrorToParticipant } = require(`${src}/models/participantEndpoint/facade`)
+      await sendErrorToParticipant('participantName', 'URL', fixtures.errorCallbackResponseDto(), {})
+
+      expect(mockSendRequest).toHaveBeenCalledTimes(1)
+      const args = mockSendRequest.mock.calls[0][0]
+      expect(args.apiType).toBe(apiType)
+    })
   })
 })