account-lookup-service 17.8.0-snapshot.18 → 17.8.0-snapshot.19

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.8.0-snapshot.18",
+  "version": "17.8.0-snapshot.19",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [

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

@@ -156,7 +156,7 @@ class BasePartiesService {
 
   async sendErrorCallback ({ errorInfo, headers, params }) {
     this.stepInProgress('sendErrorCallback')
-    const sendTo = this.state.requester || this.state.source
+    const sendTo = this.state.requester || headers[Headers.FSPIOP.DESTINATION] /* || this.state.source */
     const endpointType = this.deps.partiesUtils.errorPartyCbType(params.SubId)
 
     await this.deps.participant.sendErrorToParticipant(
@@ -171,6 +171,7 @@ class BasePartiesService {
   }
 
   async removeProxyGetPartiesTimeoutCache (alsReq) {
+    this.stepInProgress('removeProxyGetPartiesTimeoutCache')
     const isRemoved = await this.deps.proxyCache.removeProxyGetPartiesTimeout(alsReq, this.state.proxy)
     this.log.debug('removeProxyGetPartiesTimeoutCache is done', { isRemoved, alsReq })
     return isRemoved
@@ -230,8 +231,8 @@ class BasePartiesService {
     }
   }
 
-  static createErrorCallbackHeaders (headers, params) {
-    return createCallbackHeaders({
+  static createErrorCallbackHeaders (headers, params, overrideDestination = '') {
+    const cbHeaders = createCallbackHeaders({
       requestHeaders: headers,
       partyIdType: params.Type,
       partyIdentifier: params.ID,
@@ -239,6 +240,10 @@ class BasePartiesService {
         ? FspEndpointTemplates.PARTIES_SUB_ID_PUT_ERROR
         : FspEndpointTemplates.PARTIES_PUT_ERROR
     })
+    if (overrideDestination) {
+      cbHeaders[Headers.FSPIOP.DESTINATION] = overrideDestination
+    }
+    return cbHeaders
   }
 
   static createHubErrorCallbackHeaders (hubName, destination) {

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

@@ -43,16 +43,16 @@ class PutPartiesErrorService extends BasePartiesService {
       } else {
         const schemeParticipant = await this.validateParticipant(this.state.destination)
         if (schemeParticipant) {
-          const err = super.createFspiopServiceUnavailableError(ERROR_MESSAGES.externalPartyError)
-          this.log.info('Need to cleanup oracle and throw SERVICE_CURRENTLY_UNAVAILABLE error')
+          this.log.info('Need to cleanup oracle and forward SERVICE_CURRENTLY_UNAVAILABLE error')
           await this.cleanupOracle()
           await this.removeProxyGetPartiesTimeoutCache(alsReq)
-          throw err
+          await this.forwardServiceUnavailableErrorCallback()
+          return
         }
       }
     }
 
-    await this.identifyDestinationForCallback()
+    await super.identifyDestinationForCallback()
     await this.sendErrorCallbackToParticipant()
     this.log.info('handleRequest is done')
   }
@@ -78,6 +78,21 @@ class PutPartiesErrorService extends BasePartiesService {
     const errorInfo = PutPartiesErrorService.decodeDataUriPayload(dataUri)
     return super.sendErrorCallback({ errorInfo, headers, params })
   }
+
+  async forwardServiceUnavailableErrorCallback () {
+    this.stepInProgress('forwardServiceUnavailableErrorCallback')
+    const { headers, params } = this.inputs
+    const error = super.createFspiopServiceUnavailableError(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)
+
+    await super.sendErrorCallback({
+      errorInfo,
+      headers: callbackHeaders,
+      params
+    })
+    this.log.verbose('#forwardServiceUnavailableErrorCallback is done', { callbackHeaders, errorInfo })
+  }
 }
 
 module.exports = PutPartiesErrorService

package/src/handlers/index.js

@@ -38,12 +38,12 @@ const { HANDLER_TYPES } = require('../constants')
 const Config = require('../lib/config')
 const log = require('../lib').logger.child('ALS-timeout-handler')
 
-process.on('uncaughtExceptionMonitor', (err) => {
-  log.error(`uncaughtException: ${err?.message}`, err)
+process.on('uncaughtException', (err, origin) => {
+  log.error(`uncaughtException event [origin: ${origin}]: `, err)
   process.exit(2)
 })
 process.on('unhandledRejection', (err) => {
-  log.error(`unhandledRejection: ${err?.message}`, err)
+  log.error('unhandledRejection event: ', err)
   process.exit(3)
 })
 

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

@@ -931,9 +931,9 @@ describe('Parties Tests', () => {
       Config.PROXY_CACHE_CONFIG.enabled = true
       const errorCode = MojaloopApiErrorCodes.PAYEE_IDENTIFIER_NOT_VALID.code
       const payload = fixtures.errorCallbackResponseDto({ errorCode })
-      const source = `source-${Date.now()}`
+      const destination = `dest-${Date.now()}`
       const proxy = `proxy-${Date.now()}`
-      const headers = fixtures.partiesCallHeadersDto({ source, proxy })
+      const headers = fixtures.partiesCallHeadersDto({ destination, proxy })
       const { params } = Helper.putByTypeIdRequest
       participant.validateParticipant = sandbox.stub().resolves({})
       participant.sendRequest = sandbox.stub().resolves()
@@ -951,7 +951,7 @@ describe('Parties Tests', () => {
       expect(participant.sendErrorToParticipant.callCount).toBe(1)
       // eslint-disable-next-line no-unused-vars
       const [sentTo, _, data] = participant.sendErrorToParticipant.lastCall.args
-      expect(sentTo).toBe(source)
+      expect(sentTo).toBe(destination)
       expect(data.errorInformation.errorCode).toBe('2003')
     })
   })

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

@@ -29,7 +29,6 @@ const { createMockDeps, oracleMock, participantMock } = require('./deps')
 // ↑ should be first require to mock external deps ↑
 const { PutPartiesErrorService } = require('#src/domain/parties/services/index')
 const fixtures = require('#test/fixtures/index')
-const { ERROR_MESSAGES } = require('#src/constants')
 
 const { RestMethods } = PutPartiesErrorService.enums()
 
@@ -38,21 +37,22 @@ describe('PutPartiesErrorService Tests -->', () => {
     jest.clearAllMocks()
   })
 
-  test('should cleanup oracle and throw SERVICE_CURRENTLY_UNAVAILABLE error for party from external dfsp', async () => {
-    expect.hasAssertions()
+  test('should cleanup oracle and forward SERVICE_CURRENTLY_UNAVAILABLE error for party from external dfsp', async () => {
     participantMock.validateParticipant = jest.fn().mockResolvedValue({})
-    const headers = fixtures.partiesCallHeadersDto({ proxy: 'proxyA' })
+    const destination = 'destFsp'
+    const headers = fixtures.partiesCallHeadersDto({ destination, proxy: 'proxyA' })
     const params = fixtures.partiesParamsDto()
     const dataUri = fixtures.dataUriDto()
     const service = new PutPartiesErrorService(createMockDeps(), { headers, params, dataUri })
 
     await service.handleRequest()
-      .catch(err => {
-        expect(err).toEqual(service.createFspiopServiceUnavailableError(ERROR_MESSAGES.externalPartyError))
-        expect(oracleMock.oracleRequest).toHaveBeenCalledTimes(1)
-        expect(oracleMock.oracleRequest.mock.lastCall[1]).toBe(RestMethods.DELETE)
-        expect(participantMock.sendErrorToParticipant).not.toHaveBeenCalled()
-      })
+    expect(oracleMock.oracleRequest).toHaveBeenCalledTimes(1)
+    expect(oracleMock.oracleRequest.mock.lastCall[1]).toBe(RestMethods.DELETE)
+    expect(participantMock.sendErrorToParticipant).toHaveBeenCalledTimes(1)
+    // eslint-disable-next-line no-unused-vars
+    const [sentTo, _, payload] = participantMock.sendErrorToParticipant.mock.lastCall
+    expect(sentTo).toBe(destination)
+    expect(payload.errorInformation.errorCode).toBe('2003')
   })
 
   test('should NOT cleanup oracle if destination is external', async () => {