account-lookup-service 17.13.0-snapshot.5 → 17.13.0-snapshot.7

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.5",
+  "version": "17.13.0-snapshot.7",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [

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

@@ -26,12 +26,10 @@
  ******/
 
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
-const { Enum } = require('@mojaloop/central-services-shared')
-const { decodePayload } = require('@mojaloop/central-services-shared').Util.StreamingProtocol
+const { Enum, Util } = require('@mojaloop/central-services-shared')
 const { initStepState } = require('../../../lib/util')
 const { createCallbackHeaders } = require('../../../lib/headers')
 const { ERROR_MESSAGES } = require('../../../constants')
-const { makeAcceptContentTypeHeader } = require('@mojaloop/central-services-shared').Util.Headers
 
 const { FspEndpointTypes, FspEndpointTemplates } = Enum.EndPoints
 const { Headers, RestMethods, HeaderResources } = Enum.Http
@@ -204,6 +202,22 @@ class BasePartiesService {
     return isRemoved
   }
 
+  async sendPartyResolutionErrorCallback () {
+    this.stepInProgress('sendPartyResolutionErrorCallback')
+    const { headers, params } = this.inputs
+    const error = this.createFspiopPartyResolutionError(ERROR_MESSAGES.externalPartyError)
+    const callbackHeaders = BasePartiesService.createErrorCallbackHeaders(headers, params)
+    const errorInfo = await this.deps.partiesUtils.makePutPartiesErrorPayload(this.deps.config, error, callbackHeaders, params)
+
+    await this.identifyDestinationForCallback()
+    await this.sendErrorCallback({
+      errorInfo,
+      headers: callbackHeaders,
+      params
+    })
+    this.log.verbose('sendPartyResolutionErrorCallback is done', { callbackHeaders, errorInfo })
+  }
+
   createFspiopIdNotFoundError (errMessage, log = this.log) {
     log.warn(errMessage)
     return ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
@@ -242,7 +256,7 @@ class BasePartiesService {
   }
 
   static decodeDataUriPayload (dataUri) {
-    const decoded = decodePayload(dataUri, { asParsed: false })
+    const decoded = Util.StreamingProtocol.decodePayload(dataUri, { asParsed: false })
     return decoded.body.toString()
   }
 
@@ -277,7 +291,7 @@ class BasePartiesService {
     return {
       [Headers.FSPIOP.SOURCE]: hubName,
       [Headers.FSPIOP.DESTINATION]: destination,
-      [Headers.GENERAL.CONTENT_TYPE.value]: makeAcceptContentTypeHeader(
+      [Headers.GENERAL.CONTENT_TYPE.value]: Util.Headers.makeAcceptContentTypeHeader(
         HeaderResources.PARTIES,
         config.PROTOCOL_VERSIONS.CONTENT.DEFAULT.toString(),
         config.API_TYPE

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

@@ -108,7 +108,7 @@ class GetPartiesService extends BasePartiesService {
       const isValid = await this.#validateLocalDestinationForExternalSource()
       if (!isValid) {
         log.warn('incorrect destination from external source', { destination })
-        await this.#sendPartyNotFoundErrorCallback(headers)
+        await this.sendPartyResolutionErrorCallback()
         return
       }
     }

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

@@ -26,7 +26,6 @@
  ******/
 
 const BasePartiesService = require('./BasePartiesService')
-const { ERROR_MESSAGES } = require('../../../constants')
 
 class PutPartiesErrorService extends BasePartiesService {
   async handleRequest () {
@@ -46,7 +45,7 @@ class PutPartiesErrorService extends BasePartiesService {
           this.log.info('Need to cleanup oracle and forward PARTY_RESOLUTION_FAILURE error')
           await this.cleanupOracle()
           await this.removeProxyGetPartiesTimeoutCache(alsReq)
-          await this.#sendPartyResolutionErrorCallback()
+          await this.sendPartyResolutionErrorCallback() // todo: think, if we need this?
           return
         }
       }
@@ -92,22 +91,6 @@ class PutPartiesErrorService extends BasePartiesService {
 
     return isExternal
   }
-
-  async #sendPartyResolutionErrorCallback () {
-    this.stepInProgress('#sendPartyResolutionErrorCallback')
-    const { headers, params } = this.inputs
-    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)
-
-    await this.identifyDestinationForCallback()
-    await super.sendErrorCallback({
-      errorInfo,
-      headers: callbackHeaders,
-      params
-    })
-    this.log.verbose('#sendPartyResolutionErrorCallback is done', { callbackHeaders, errorInfo })
-  }
 }
 
 module.exports = PutPartiesErrorService

package/src/lib/headers.js

@@ -41,6 +41,7 @@ const Config = require('../lib/config')
  */
 exports.createCallbackHeaders = (params) => {
   const callbackHeaders = { ...params.requestHeaders }
+  delete callbackHeaders[Enums.Http.Headers.FSPIOP.PROXY]
 
   callbackHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
   callbackHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = params.requestHeaders[Enums.Http.Headers.FSPIOP.SOURCE]

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

@@ -947,9 +947,10 @@ describe('Parties Tests', () => {
       Config.PROXY_CACHE_CONFIG.enabled = true
       const errorCode = MojaloopApiErrorCodes.PAYEE_IDENTIFIER_NOT_VALID.code
       const payload = fixtures.errorCallbackResponseDto({ errorCode })
+      const source = 'payerFsp'
       const destination = `dest-${Date.now()}`
       const proxy = `proxy-${Date.now()}`
-      const headers = fixtures.partiesCallHeadersDto({ destination, proxy })
+      const headers = fixtures.partiesCallHeadersDto({ source, destination, proxy })
       const { params } = Helper.putByTypeIdRequest
       participant.validateParticipant = sandbox.stub().resolves(null) // external participant
       participant.sendRequest = sandbox.stub().resolves()
@@ -971,7 +972,8 @@ describe('Parties Tests', () => {
       // eslint-disable-next-line no-unused-vars
       const [sentTo, _, data, cbHeaders] = participant.sendErrorToParticipant.lastCall.args
       expect(sentTo).toBe(proxy)
-      expect(cbHeaders[Headers.FSPIOP.DESTINATION]).toBe(destination)
+      expect(cbHeaders[Headers.FSPIOP.DESTINATION]).toBe(source)
+      expect(cbHeaders[Headers.FSPIOP.PROXY]).toBeUndefined()
       expect(data.errorInformation.errorCode).toBe('2006')
     })
   })

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

@@ -422,6 +422,7 @@ describe('GetPartiesService Tests -->', () => {
           partyList: [{ fspId: ORACLE_DFSP_DIFFERENT }]
         })
       )
+      proxyCache.lookupProxyByDfspId = jest.fn().mockResolvedValueOnce(PROXY_ID)
 
       const service = new GetPartiesService(deps, { headers, params })
       await service.handleRequest()

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

@@ -46,12 +46,13 @@ describe('PutPartiesErrorService Tests -->', () => {
     oracle.oracleRequest = jest.fn().mockResolvedValue({
       data: { partyList: [{ fspId: 'fspId' }] }
     })
-    const destination = 'externalDfsp'
+    const source = 'externalSource'
+    const destination = 'externalDestination'
     const proxyDest = 'proxyDest'
     const deps = createMockDeps({ oracle, participant })
     deps.proxyCache.lookupProxyByDfspId = jest.fn().mockResolvedValue(proxyDest)
 
-    const headers = fixtures.partiesCallHeadersDto({ destination, proxy: 'proxyA' })
+    const headers = fixtures.partiesCallHeadersDto({ source, destination, proxy: 'proxyA' })
     const params = fixtures.partiesParamsDto()
     const dataUri = fixtures.dataUriDto()
 
@@ -64,7 +65,7 @@ describe('PutPartiesErrorService Tests -->', () => {
 
     const [sentTo, , payload, cbHeaders] = participant.sendErrorToParticipant.mock.lastCall
     expect(sentTo).toBe(proxyDest)
-    expect(cbHeaders[Headers.FSPIOP.DESTINATION]).toBe(destination)
+    expect(cbHeaders[Headers.FSPIOP.DESTINATION]).toBe(source)
     expect(payload.errorInformation.errorCode).toBe('2006')
   })