account-lookup-service 17.3.1 → 17.4.0-csi-1233.0

package/audit-ci.jsonc

@@ -4,5 +4,7 @@
   // Only use one of ["low": true, "moderate": true, "high": true, "critical": true]
   "moderate": true,
   // NOTE: Please add as much information as possible to any items added to the allowList
-  "allowlist": []
+  "allowlist": [
+    "GHSA-jr5f-v2jv-69x6" // https://github.com/advisories/GHSA-jr5f-v2jv-69x6
+  ]
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "account-lookup-service",
   "description": "Account Lookup Service is used to validate Party and Participant lookups.",
-  "version": "17.3.1",
+  "version": "17.4.0-csi-1233.0",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -93,15 +93,15 @@
     "@hapi/vision": "7.0.3",
     "@mojaloop/central-services-error-handling": "13.0.7",
     "@mojaloop/central-services-health": "15.0.4",
-    "@mojaloop/central-services-logger": "11.5.5",
+    "@mojaloop/central-services-logger": "11.6.1",
     "@mojaloop/central-services-metrics": "12.4.5",
-    "@mojaloop/central-services-shared": "18.22.1",
+    "@mojaloop/central-services-shared": "18.22.2-snapshot.2",
     "@mojaloop/central-services-stream": "11.5.1",
     "@mojaloop/database-lib": "11.1.3",
     "@mojaloop/event-sdk": "14.3.0",
     "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.7",
     "@mojaloop/ml-schema-transformer-lib": "2.5.6",
-    "@mojaloop/sdk-standard-components": "19.9.0",
+    "@mojaloop/sdk-standard-components": "19.10.0",
     "@now-ims/hapi-now-auth": "2.1.0",
     "ajv": "8.17.1",
     "ajv-keywords": "5.1.0",

package/src/domain/parties/getPartiesByTypeAndID.js

@@ -32,7 +32,7 @@ const oracle = require('../../models/oracle/facade')
 const participant = require('../../models/participantEndpoint/facade')
 const { createCallbackHeaders } = require('../../lib/headers')
 const { ERROR_MESSAGES } = require('../../constants')
-const { logger } = require('../../lib')
+const logger = require('../../lib').logger.child({ component: 'domain.getPartiesByTypeAndID' })
 const Config = require('../../lib/config')
 const utils = require('./utils')
 const util = require('../../lib/util')
@@ -40,32 +40,32 @@ const util = require('../../lib/util')
 const { FspEndpointTypes, FspEndpointTemplates } = Enum.EndPoints
 const { Headers, RestMethods } = Enum.Http
 
-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 log = logger.child({ source, method: 'validateRequester' })
   const sourceParticipant = await participant.validateParticipant(source)
   if (sourceParticipant) {
-    log.debug('source is in scheme', { source })
+    log.debug('source is in scheme')
     return source
   }
 
   if (!proxy) {
     const errMessage = ERROR_MESSAGES.sourceFspNotFound
+    log.warn(errMessage)
     throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
   }
 
   const proxyParticipant = await participant.validateParticipant(proxy)
   if (!proxyParticipant) {
     const errMessage = ERROR_MESSAGES.partyProxyNotFound
+    log.warn(errMessage, { proxy })
     throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
   }
 
   const isCached = await proxyCache.addDfspIdToProxyMapping(source, proxy)
   // think, what if isCached !== true?
-  log.info('source is added to proxyMapping cache:', { source, proxy, isCached })
+  log.info('source is added to proxyMapping cache:', { proxy, isCached })
   return proxy
 }
 
@@ -88,6 +88,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
     'Get party by Type and Id',
     ['success']
   ).startTimer()
+  const log = logger.child({ params })
   const proxyEnabled = !!(Config.PROXY_CACHE_CONFIG.enabled && proxyCache)
   const type = params.Type
   const partySubId = params.SubId
@@ -100,7 +101,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
   // without consulting any oracles.
 
   const childSpan = span ? span.getChild('getPartiesByTypeAndID') : undefined
-  log.info('parties::getPartiesByTypeAndID::begin', { source, destination, proxy, params })
+  log.info('parties::getPartiesByTypeAndID start', { source, destination, proxy })
 
   let requester
   let fspiopError
@@ -155,6 +156,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
 
       if (!Array.isArray(filteredResponsePartyList) || !filteredResponsePartyList.length) {
         const errMessage = 'Requested FSP/Party not found'
+        log.warn(errMessage)
         throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
       }
 
@@ -169,7 +171,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         const schemeParticipant = await participant.validateParticipant(fspId)
         if (schemeParticipant) {
           sentCount++
-          log.debug('participant is in scheme', { fspId })
+          log.verbose('participant is in scheme', { fspId })
           return participant.sendRequest(clonedHeaders, party.fspId, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
         }
 
@@ -183,7 +185,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
             // todo: delete reference in oracle
           } else {
             sentCount++
-            log.debug('participant NOT is in scheme, use proxy name', { fspId, proxyName })
+            log.verbose('participant is NOT in scheme, use proxy name', { fspId, proxyName })
             return participant.sendRequest(clonedHeaders, proxyName, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
           }
         }
@@ -222,6 +224,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         step = 'setSendToProxiesList-10'
         const isCached = await proxyCache.setSendToProxiesList(alsReq, filteredProxyNames, proxyCacheTtlSec)
         if (!isCached) {
+          log.warn('failed to setSendToProxiesList')
           throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.failedToCacheSendToProxiesList)
         }
 
@@ -237,13 +240,14 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         // todo: - think, if we should handle failed requests here (e.g., by calling receivedErrorResponse)
         log.info('setSendToProxiesList flow is done:', { isOk, results, filteredProxyNames, alsReq })
         if (!isOk) {
+          log.warn('no successful requests sent to proxies')
           throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.proxyConnectionError)
         }
       }
     }
     histTimerEnd({ success: true })
   } catch (err) {
-    fspiopError = await handleErrorOnSendingCallback(err, headers, params, requester)
+    fspiopError = await utils.createErrorHandlerOnSendingCallback(Config, log)(err, headers, params, requester)
     histTimerEnd({ success: false })
     if (fspiopError) {
       util.countFspiopError(fspiopError, { operation: 'getPartiesByTypeAndID', step })

package/src/domain/parties/parties.js

@@ -38,15 +38,13 @@ const Metrics = require('@mojaloop/central-services-metrics')
 const oracle = require('../../models/oracle/facade')
 const participant = require('../../models/participantEndpoint/facade')
 const { ERROR_MESSAGES } = require('../../constants')
-const { logger } = require('../../lib')
+const logger = require('../../lib').logger.child({ component: 'domain.putParties' })
+
 const Config = require('../../lib/config')
 const utils = require('./utils')
 const util = require('../../lib/util')
 const getPartiesByTypeAndID = require('./getPartiesByTypeAndID')
 
-const log = logger.child('domain:put-parties')
-const handleErrorOnSendingCallback = utils.createErrorHandlerOnSendingCallback(Config, log)
-
 /**
  * @function putPartiesByTypeAndID
  *
@@ -66,13 +64,14 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
     'Put parties by type and id',
     ['success']
   ).startTimer()
+  const log = logger.child({ params, method: 'putPartiesByTypeAndID' })
   const type = params.Type
   const partySubId = params.SubId
   const source = headers[Headers.FSPIOP.SOURCE]
   const destination = headers[Headers.FSPIOP.DESTINATION]
   const proxy = headers[Headers.FSPIOP.PROXY]
   const proxyEnabled = !!(Config.PROXY_CACHE_CONFIG.enabled && proxyCache)
-  log.info('parties::putPartiesByTypeAndID::begin', { source, destination, proxy, params })
+  log.info('parties::putPartiesByTypeAndID start', { source, destination, proxy })
 
   let sendTo
   let step
@@ -82,6 +81,7 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
     if (!requesterParticipant) {
       if (!proxyEnabled || !proxy) {
         const errMessage = ERROR_MESSAGES.sourceFspNotFound
+        log.warn(`${errMessage} and no proxy`)
         throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
       }
       step = 'addDfspIdToProxyMapping-1'
@@ -96,14 +96,14 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
       const isExists = await proxyCache.receivedSuccessResponse(alsReq)
       if (!isExists) {
         log.warn('destination is NOT in scheme, and no cached sendToProxiesList', { destination, alsReq })
-        // think, if we need to throw an error here
+        // todo: think, if we need to throw an error here
       } else {
         const mappingPayload = {
           fspId: source
         }
         step = 'oracleRequest-3'
         await oracle.oracleRequest(headers, RestMethods.POST, params, null, mappingPayload, cache)
-        log.info('oracle was updated with mappingPayload', { mappingPayload, params })
+        log.info('oracle was updated with mappingPayload', { mappingPayload })
       }
     }
     step = 'validateParticipant-4'
@@ -113,6 +113,7 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
       const proxyName = proxyEnabled && await proxyCache.lookupProxyByDfspId(destination)
       if (!proxyName) {
         const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
+        log.warn(errMessage)
         throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR, errMessage)
       }
       sendTo = proxyName
@@ -133,7 +134,7 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
     log.info('parties::putPartiesByTypeAndID::callback was sent', { sendTo, options })
     histTimerEnd({ success: true })
   } catch (err) {
-    const fspiopError = await handleErrorOnSendingCallback(err, headers, params, sendTo)
+    const fspiopError = await utils.createErrorHandlerOnSendingCallback(Config, log)(err, headers, params, sendTo)
     if (fspiopError) {
       util.countFspiopError(fspiopError, { operation: 'putPartiesByTypeAndID', step })
     }
@@ -160,6 +161,7 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
     'Put parties error by type and id',
     ['success']
   ).startTimer()
+  const log = logger.child({ params, method: 'putPartiesErrorByTypeAndID' })
   const partySubId = params.SubId
   const destination = headers[Headers.FSPIOP.DESTINATION]
   const callbackEndpointType = utils.errorPartyCbType(partySubId)
@@ -203,6 +205,7 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
       const proxyName = proxyEnabled && await proxyCache.lookupProxyByDfspId(destination)
       if (!proxyName) {
         const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
+        log.warn(errMessage)
         throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR, errMessage)
       }
       sendTo = proxyName
@@ -213,7 +216,7 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
     log.info('putPartiesErrorByTypeAndID callback was sent', { sendTo })
     histTimerEnd({ success: true })
   } catch (err) {
-    fspiopError = await handleErrorOnSendingCallback(err, headers, params, sendTo)
+    fspiopError = await utils.createErrorHandlerOnSendingCallback(Config, log)(err, headers, params, sendTo)
     if (fspiopError) {
       util.countFspiopError(fspiopError, { operation: 'putPartiesErrorByTypeAndID', step })
     }