account-lookup-service 17.13.0-snapshot.0 → 17.13.0-snapshot.3

package/.grype.yaml

@@ -3,7 +3,6 @@ disabled: false
 
 ignore:
 
-
 # Set output format defaults
 output:
   - "table"

package/audit-ci.jsonc

@@ -5,5 +5,6 @@
   "moderate": true,
   // NOTE: Please add as much information as possible to any items added to the allowList
   "allowlist": [
+    "GHSA-4hjh-wcwx-xvwj" // todo: update axios -  https://github.com/advisories/GHSA-4hjh-wcwx-xvwj
   ]
 }

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.13.0-snapshot.0",
+  "version": "17.13.0-snapshot.3",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -91,22 +91,22 @@
     "@hapi/hapi": "21.4.3",
     "@hapi/inert": "7.1.0",
     "@hapi/vision": "7.0.3",
-    "@mojaloop/central-services-error-handling": "13.1.1",
+    "@mojaloop/central-services-error-handling": "13.1.2-snapshot.0",
     "@mojaloop/central-services-health": "15.1.0",
     "@mojaloop/central-services-logger": "11.9.3",
     "@mojaloop/central-services-metrics": "12.7.1",
-    "@mojaloop/central-services-shared": "18.32.0",
+    "@mojaloop/central-services-shared": "18.32.1",
     "@mojaloop/central-services-stream": "11.8.7",
     "@mojaloop/database-lib": "^11.3.2",
     "@mojaloop/event-sdk": "14.7.0",
     "@mojaloop/inter-scheme-proxy-cache-lib": "2.6.0",
-    "@mojaloop/ml-schema-transformer-lib": "2.7.7",
-    "@mojaloop/sdk-standard-components": "19.16.7",
+    "@mojaloop/ml-schema-transformer-lib": "2.7.8",
+    "@mojaloop/sdk-standard-components": "19.16.8",
     "@now-ims/hapi-now-auth": "2.1.0",
     "ajv": "8.17.1",
     "ajv-keywords": "5.1.0",
     "blipp": "4.0.2",
-    "commander": "14.0.0",
+    "commander": "14.0.1",
     "cron": "4.3.3",
     "hapi-auth-bearer-token": "8.0.0",
     "joi": "18.0.1",
@@ -124,6 +124,7 @@
     "postcss": {
       "nanoid": "^3.3.8"
     },
+    "@mojaloop/central-services-error-handling": "13.1.2-snapshot.0",
     "@mojaloop/central-services-health": {
       "@mojaloop/central-services-logger": ">=11.4.0"
     },
@@ -165,7 +166,7 @@
   "devDependencies": {
     "@types/jest": "30.0.0",
     "audit-ci": "^7.1.0",
-    "axios": "1.11.0",
+    "axios": "1.12.2",
     "axios-retry": "^4.5.0",
     "docdash": "2.0.2",
     "dotenv": "^17.2.2",
@@ -175,7 +176,7 @@
     "jest-junit": "16.0.0",
     "jsdoc": "4.0.4",
     "nodemon": "3.1.10",
-    "npm-check-updates": "18.1.0",
+    "npm-check-updates": "18.1.1",
     "nyc": "17.1.0",
     "pre-commit": "1.2.2",
     "proxyquire": "2.1.3",

package/src/domain/parties/services/BasePartiesService.js

@@ -194,9 +194,9 @@ class BasePartiesService {
     return ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND, errMessage)
   }
 
-  createFspiopServiceUnavailableError (errMessage, log = this.log) {
+  createFspiopPartyResolutionError (errMessage, log = this.log) {
     log.warn(errMessage)
-    return ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.SERVICE_CURRENTLY_UNAVAILABLE, errMessage)
+    return ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_RESOLUTION_FAILURE, errMessage)
   }
 
   stepInProgress (stepName) {

package/src/domain/parties/services/PutPartiesErrorService.js

@@ -46,7 +46,7 @@ class PutPartiesErrorService extends BasePartiesService {
           this.log.info('Need to cleanup oracle and forward SERVICE_CURRENTLY_UNAVAILABLE error')
           await this.cleanupOracle()
           await this.removeProxyGetPartiesTimeoutCache(alsReq)
-          await this.forwardServiceUnavailableErrorCallback()
+          await this.#sendPartyResolutionErrorCallback()
           return
         }
       }
@@ -79,10 +79,10 @@ class PutPartiesErrorService extends BasePartiesService {
     return super.sendErrorCallback({ errorInfo, headers, params })
   }
 
-  async forwardServiceUnavailableErrorCallback () {
-    this.stepInProgress('forwardServiceUnavailableErrorCallback')
+  async #sendPartyResolutionErrorCallback () {
+    this.stepInProgress('#sendPartyResolutionErrorCallback')
     const { headers, params } = this.inputs
-    const error = super.createFspiopServiceUnavailableError(ERROR_MESSAGES.externalPartyError)
+    const error = super.createFspiopPartyResolutionError(ERROR_MESSAGES.externalPartyError)
     const callbackHeaders = BasePartiesService.createErrorCallbackHeaders(headers, params, this.state.destination)
     const errorInfo = await this.deps.partiesUtils.makePutPartiesErrorPayload(this.deps.config, error, callbackHeaders, params)
 
@@ -92,7 +92,7 @@ class PutPartiesErrorService extends BasePartiesService {
       headers: callbackHeaders,
       params
     })
-    this.log.verbose('#forwardServiceUnavailableErrorCallback is done', { callbackHeaders, errorInfo })
+    this.log.verbose('#sendPartyResolutionErrorCallback is done', { callbackHeaders, errorInfo })
   }
 }
 

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

@@ -970,7 +970,7 @@ describe('Parties Tests', () => {
       const [sentTo, _, data, cbHeaders] = participant.sendErrorToParticipant.lastCall.args
       expect(sentTo).toBe(proxy)
       expect(cbHeaders[Headers.FSPIOP.DESTINATION]).toBe(destination)
-      expect(data.errorInformation.errorCode).toBe('2003')
+      expect(data.errorInformation.errorCode).toBe('2006')
     })
   })
 })

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

@@ -28,12 +28,12 @@
 const { setTimeout: sleep } = require('node:timers/promises')
 const {
   createMockDeps,
-  createOracleFacadeMock, // use it instead of oracleMock
-  createParticipantFacadeMock, // use it instead of participantMock
+  createOracleFacadeMock,
+  createParticipantFacadeMock,
   createProxyCacheMock,
   createProxiesUtilMock,
-  oracleMock, // deprecated - use createOracleFacadeMock
-  participantMock// deprecated - use createParticipantFacadeMock
+  oracleMock, // deprecated!  use createOracleFacadeMock instead
+  participantMock // deprecated!  use createParticipantFacadeMock instead
 } = require('./deps')
 // ↑ should be first require to mock external deps ↑
 const { GetPartiesService } = require('#src/domain/parties/services/index')
@@ -44,15 +44,14 @@ const { RestMethods, Headers } = GetPartiesService.enums()
 
 describe('GetPartiesService Tests -->', () => {
   const { config } = createMockDeps()
-  let apiType
+  const { API_TYPE } = config
 
   beforeEach(() => {
     jest.clearAllMocks()
-    apiType = config.API_TYPE
   })
 
   afterEach(() => {
-    config.API_TYPE = apiType // to avoid side effects
+    config.API_TYPE = API_TYPE // to avoid side effects
   })
 
   describe('forwardRequestToDestination method', () => {
@@ -335,9 +334,10 @@ describe('GetPartiesService Tests -->', () => {
     }
     const headers = fixtures.partiesCallHeadersDto({ destination: '' })
     const params = fixtures.partiesParamsDto()
-    const service = new GetPartiesService(deps, { headers, params })
 
+    const service = new GetPartiesService(deps, { headers, params })
     await service.handleRequest()
+
     expect(participantMock.sendErrorToParticipant).toHaveBeenCalledTimes(1)
     const isoPayload = participantMock.sendErrorToParticipant.mock.lastCall[2]
     expect(isoPayload.Assgnmt).toBeDefined()
@@ -353,13 +353,17 @@ describe('GetPartiesService Tests -->', () => {
     let deps
     let oracle // facade
     let participant // facade
+    let proxyCache
     let headers
     let params
 
     beforeEach(() => {
       oracle = createOracleFacadeMock()
       participant = createParticipantFacadeMock()
-      deps = createMockDeps({ oracle, participant })
+      proxyCache = createProxyCacheMock({
+        addDfspIdToProxyMapping: jest.fn().mockResolvedValueOnce(true)
+      })
+      deps = createMockDeps({ oracle, participant, proxyCache })
       headers = fixtures.partiesCallHeadersDto({
         source: EXTERNAL_SOURCE_DFSP,
         destination: LOCAL_DESTINATION_DFSP,
@@ -369,17 +373,12 @@ describe('GetPartiesService Tests -->', () => {
     })
 
     test('should forward request when oracle DFSP matches destination DFSP', async () => {
-      // Setup proxy cache to NOT find proxy mapping for local destination
-      deps.proxyCache.addDfspIdToProxyMapping = jest.fn().mockResolvedValueOnce(true)
-      deps.proxyCache.lookupProxyByDfspId = jest.fn().mockResolvedValueOnce(null)
-
       participant.validateParticipant = jest.fn()
         .mockResolvedValueOnce(null) // external source (validateRequester)
         .mockResolvedValueOnce({}) // proxy exists (validateRequester)
         .mockResolvedValueOnce({}) // local destination (forwardRequestToDestination)
         .mockResolvedValueOnce(null) // external source (shouldValidateViaOracle)
         .mockResolvedValueOnce({}) // local destination (shouldValidateViaOracle)
-
       oracle.oracleRequest = jest.fn().mockResolvedValueOnce(
         fixtures.oracleRequestResponseDto({
           partyList: [{ fspId: LOCAL_DESTINATION_DFSP }]
@@ -412,17 +411,12 @@ describe('GetPartiesService Tests -->', () => {
     })
 
     test('should send error callback when oracle DFSP differs from destination DFSP', async () => {
-      // Setup proxy cache to NOT find proxy mapping for local destination
-      deps.proxyCache.addDfspIdToProxyMapping = jest.fn().mockResolvedValueOnce(true)
-      deps.proxyCache.lookupProxyByDfspId = jest.fn().mockResolvedValueOnce(null)
-
       participant.validateParticipant = jest.fn()
         .mockResolvedValueOnce(null) // external source (validateRequester)
         .mockResolvedValueOnce({}) // proxy exists (validateRequester)
         .mockResolvedValueOnce({}) // local destination (forwardRequestToDestination)
         .mockResolvedValueOnce(null) // external source (shouldValidateViaOracle)
         .mockResolvedValueOnce({})
-
       oracle.oracleRequest = jest.fn().mockResolvedValueOnce(
         fixtures.oracleRequestResponseDto({
           partyList: [{ fspId: ORACLE_DFSP_DIFFERENT }]
@@ -478,12 +472,11 @@ describe('GetPartiesService Tests -->', () => {
         destination: 'externalDestinationDfsp',
         proxy: PROXY_ID
       })
-
       participant.validateParticipant = jest.fn()
         .mockResolvedValueOnce(null) // external source
         .mockResolvedValueOnce({}) // proxy exists
         .mockResolvedValueOnce(null) // external destination
-      deps.proxyCache.lookupProxyByDfspId = jest.fn().mockResolvedValueOnce(PROXY_ID)
+      proxyCache.lookupProxyByDfspId = jest.fn().mockResolvedValueOnce(PROXY_ID)
 
       const service = new GetPartiesService(deps, { headers: externalDestHeaders, params })
       await service.handleRequest()
@@ -502,7 +495,6 @@ describe('GetPartiesService Tests -->', () => {
         .mockResolvedValueOnce(null) // external source (shouldValidateViaOracle)
         .mockResolvedValueOnce({}) // local destination (shouldValidateViaOracle)
         .mockResolvedValueOnce({}) // local destination (forwardRequestToDestination)
-
       oracle.oracleRequest = jest.fn().mockResolvedValueOnce(
         fixtures.oracleRequestResponseDto({
           partyList: [{ fspId: ORACLE_DFSP_DIFFERENT }]

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

@@ -37,7 +37,7 @@ describe('PutPartiesErrorService Tests -->', () => {
     jest.clearAllMocks()
   })
 
-  test('should cleanup oracle and forward SERVICE_CURRENTLY_UNAVAILABLE error for party from external dfsp', async () => {
+  test('should cleanup oracle and forward PARTY_RESOLUTION_FAILURE error for party from external dfsp', async () => {
     participantMock.validateParticipant = jest.fn().mockRejectedValue(new Error('No participant found')) // external participant
     const destination = 'externalDfsp'
     const proxyDest = 'proxyDest'
@@ -57,7 +57,7 @@ describe('PutPartiesErrorService Tests -->', () => {
     const [sentTo, _, payload, cbHeaders] = participantMock.sendErrorToParticipant.mock.lastCall
     expect(sentTo).toBe(proxyDest)
     expect(cbHeaders[Headers.FSPIOP.DESTINATION]).toBe(destination)
-    expect(payload.errorInformation.errorCode).toBe('2003')
+    expect(payload.errorInformation.errorCode).toBe('2006')
   })
 
   test('should NOT cleanup oracle if destination is local', async () => {