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

package/.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 setup: true
 orbs:
-  build: mojaloop/build@1.0.25
+  build: mojaloop/build@1.0.27
 workflows:
   setup:
     jobs:

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.2",
+  "version": "15.6.0-iso.4",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -157,7 +157,7 @@
     "ioredis-mock": "^8.9.0",
     "jest": "29.7.0",
     "jest-junit": "16.0.0",
-    "jsdoc": "4.0.3",
+    "jsdoc": "4.0.4",
     "nodemon": "3.1.7",
     "npm-check-updates": "17.1.4",
     "nyc": "17.1.0",

package/src/domain/participants/participants.js

@@ -222,7 +222,9 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
   ).startTimer()
   try {
     const partySubIdOrType = params.SubId || undefined
-    const callbackEndpointType = partySubIdOrType ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
+    const callbackEndpointType = partySubIdOrType
+      ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR
+      : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
     const destinationParticipant = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.DESTINATION])
     if (destinationParticipant) {
       const decodedPayload = decodePayload(dataUri, { asParsed: false })
@@ -231,7 +233,8 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
         callbackEndpointType,
         decodedPayload.body.toString(),
         headers,
-        params)
+        params
+      )
     } else {
       await participant.sendErrorToParticipant(
         headers[Enums.Http.Headers.FSPIOP.SOURCE],
@@ -239,15 +242,21 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
         ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR).toApiErrorObject(),
         headers,
         params,
-        payload)
+        payload
+      )
     }
     histTimerEnd({ success: true })
   } catch (err) {
     Logger.isErrorEnabled && Logger.error(err)
     try {
       const callbackEndpointType = params.SubId ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
-      await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], callbackEndpointType,
-        ErrorHandler.Factory.reformatFSPIOPError(err).toApiErrorObject(), headers, params)
+      await participant.sendErrorToParticipant(
+        headers[Enums.Http.Headers.FSPIOP.SOURCE],
+        callbackEndpointType,
+        ErrorHandler.Factory.reformatFSPIOPError(err).toApiErrorObject(),
+        headers,
+        params
+      )
     } catch (exc) {
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.

package/src/models/participantEndpoint/facade.js

@@ -102,9 +102,7 @@ exports.sendRequest = async (headers, requestedParticipant, endpointType, method
       content: Config.PROTOCOL_VERSIONS.CONTENT.DEFAULT.toString(),
       accept: Config.PROTOCOL_VERSIONS.ACCEPT.DEFAULT.toString()
     }
-    const jwsSigner = defineJwsSigner(Config, headers, requestedEndpoint)
-
-    const resp = await Util.Request.sendRequest({
+    const params = {
       url: requestedEndpoint,
       headers,
       source: headers[Enums.Http.Headers.FSPIOP.SOURCE],
@@ -113,11 +111,15 @@ exports.sendRequest = async (headers, requestedParticipant, endpointType, method
       payload,
       responseType: Enums.Http.ResponseTypes.JSON,
       span,
-      jwsSigner,
       protocolVersions,
       hubNameRegex,
       apiType: Config.API_TYPE
-    })
+    }
+    Logger.isDebugEnabled && Logger.debug(`participant - sendRequest params: ${JSON.stringify(params)}`)
+
+    params.jwsSigner = defineJwsSigner(Config, headers, requestedEndpoint)
+
+    const resp = await Util.Request.sendRequest(params)
     histTimerEndSendRequestToParticipant({ success: true, endpointType, participantName: requestedParticipant })
     return resp
   } catch (err) {
@@ -212,10 +214,7 @@ exports.sendErrorToParticipant = async (participantName, endpointType, errorInfo
       clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
     }
 
-    Logger.isDebugEnabled && Logger.debug(`participant endpoint url: ${requesterErrorEndpoint} for endpoint type ${endpointType}`)
-    const jwsSigner = defineJwsSigner(Config, clonedHeaders, requesterErrorEndpoint)
-
-    await Util.Request.sendRequest({
+    const params = {
       url: requesterErrorEndpoint,
       headers: clonedHeaders,
       source: clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE],
@@ -225,10 +224,14 @@ exports.sendErrorToParticipant = async (participantName, endpointType, errorInfo
       responseType: Enums.Http.ResponseTypes.JSON,
       hubNameRegex,
       span,
-      jwsSigner,
       protocolVersions,
       apiType: Config.API_TYPE
-    })
+    }
+    Logger.isDebugEnabled && Logger.debug(`participant - sendErrorToParticipant params: ${JSON.stringify(params)}`)
+
+    params.jwsSigner = defineJwsSigner(Config, clonedHeaders, requesterErrorEndpoint)
+
+    await Util.Request.sendRequest(params)
     histTimerEndSendRequestToParticipant({ success: true, endpointType, participantName })
   } catch (err) {
     histTimerEndSendRequestToParticipant({ success: false, endpointType, participantName })

package/src/plugins.js

@@ -24,16 +24,22 @@
  ******/
 'use strict'
 
-const Config = require('./lib/config')
+const { randomUUID } = require('node:crypto')
 const Inert = require('@hapi/inert')
 const Vision = require('@hapi/vision')
 const Blipp = require('blipp')
 const ErrorHandling = require('@mojaloop/central-services-error-handling')
-const CentralServices = require('@mojaloop/central-services-shared')
-const RawPayloadToDataUri = require('@mojaloop/central-services-shared').Util.Hapi.HapiRawPayload
-const OpenapiBackendValidator = require('@mojaloop/central-services-shared').Util.Hapi.OpenapiBackendValidator
-const APIDocumentation = require('@mojaloop/central-services-shared').Util.Hapi.APIDocumentation
+const {
+  APIDocumentation,
+  FSPIOPHeaderValidation,
+  HapiEventPlugin,
+  HapiRawPayload,
+  OpenapiBackendValidator
+} = require('@mojaloop/central-services-shared').Util.Hapi
+
+const Config = require('./lib/config')
 const MetricsPlugin = require('./metrics/plugin')
+const RequestLogger = require('./lib/requestLogger')
 
 const registerPlugins = async (server, openAPIBackend) => {
   await server.register(OpenapiBackendValidator)
@@ -121,10 +127,10 @@ const registerPlugins = async (server, openAPIBackend) => {
     Inert,
     Vision,
     ErrorHandling,
-    RawPayloadToDataUri,
-    CentralServices.Util.Hapi.HapiEventPlugin,
+    HapiRawPayload,
+    HapiEventPlugin,
     {
-      plugin: CentralServices.Util.Hapi.FSPIOPHeaderValidation.plugin,
+      plugin: FSPIOPHeaderValidation.plugin,
       options: getOptionsForFSPIOPHeaderValidation()
     }
   ])
@@ -132,6 +138,24 @@ const registerPlugins = async (server, openAPIBackend) => {
   if (Config.DISPLAY_ROUTES === true) {
     await server.register([Blipp])
   }
+
+  await server.ext([
+    {
+      type: 'onRequest',
+      method: (request, h) => {
+        request.headers.traceid = request.headers.traceid || randomUUID()
+        RequestLogger.logRequest(request)
+        return h.continue
+      }
+    },
+    {
+      type: 'onPreResponse',
+      method: (request, h) => {
+        RequestLogger.logResponse(request)
+        return h.continue
+      }
+    }
+  ])
 }
 
 module.exports = {

package/src/server.js

@@ -23,7 +23,6 @@
  ******/
 'use strict'
 
-const { randomUUID } = require('node:crypto')
 const Hapi = require('@hapi/hapi')
 const Boom = require('@hapi/boom')
 
@@ -37,7 +36,6 @@ const { name, version } = require('../package.json')
 const Db = require('./lib/db')
 const Util = require('./lib/util')
 const Plugins = require('./plugins')
-const RequestLogger = require('./lib/requestLogger')
 const Migrator = require('./lib/migrator')
 const APIHandlers = require('./api')
 const Routes = require('./api/routes')
@@ -104,23 +102,6 @@ const createServer = async (port, api, routes, isAdmin, proxyCacheConfig, proxyM
     }
   }
 
-  await server.ext([
-    {
-      type: 'onPreHandler',
-      method: (request, h) => {
-        request.headers.traceid = request.headers.traceid || randomUUID()
-        RequestLogger.logRequest(request)
-        return h.continue
-      }
-    },
-    {
-      type: 'onPreResponse',
-      method: (request, h) => {
-        RequestLogger.logResponse(request)
-        return h.continue
-      }
-    }
-  ])
   await Plugins.registerPlugins(server, api, isAdmin)
 
   server.route(routes)

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

@@ -8,7 +8,7 @@ describe('TransformFacades Tests -->', () => {
     const isoPayload = await TransformFacades.FSPIOP.parties.putError({
       body,
       headers,
-      params: { IdPath: '123456789' }
+      params: { Type: 'MSISDN', ID: '123456789' }
     })
     expect(isoPayload.body).toBeTruthy()
     expect(isoPayload.body.Assgnmt).toBeTruthy()

package/test/unit/plugins.test.js

@@ -50,6 +50,7 @@ describe('Plugin Tests', () => {
     // Arrange
     const server = {
       register: sandbox.spy(),
+      ext: sandbox.spy(),
       info: {
         port: '8000'
       }
@@ -72,6 +73,7 @@ describe('Plugin Tests', () => {
     // Arrange
     const server = {
       register: sandbox.spy(),
+      ext: sandbox.spy(),
       info: {
         port: '8000'
       }