account-lookup-service 17.13.0-snapshot.6 → 17.13.0-snapshot.8

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

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

@@ -205,9 +205,11 @@ class BasePartiesService {
   async sendPartyResolutionErrorCallback () {
     this.stepInProgress('sendPartyResolutionErrorCallback')
     const { headers, params } = this.inputs
+
     const error = this.createFspiopPartyResolutionError(ERROR_MESSAGES.externalPartyError)
-    const callbackHeaders = BasePartiesService.createErrorCallbackHeaders(headers, params, this.state.destination)
+    const callbackHeaders = BasePartiesService.createErrorCallbackHeaders(headers, params)
     const errorInfo = await this.deps.partiesUtils.makePutPartiesErrorPayload(this.deps.config, error, callbackHeaders, params)
+    this.state.destination = callbackHeaders[Headers.FSPIOP.DESTINATION]
 
     await this.identifyDestinationForCallback()
     await this.sendErrorCallback({

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

@@ -45,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
         }
       }

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

@@ -104,7 +104,7 @@ class PutPartiesService extends BasePartiesService {
       fspId: source
     }
     await this.deps.oracle.oracleRequest(headers, RestMethods.POST, params, null, mappingPayload, this.deps.cache)
-    this.log.info('oracle was updated with mappingPayload', { mappingPayload })
+    this.log.info('oracle was updated with mappingPayload: ', mappingPayload)
   }
 }
 

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/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')
   })