account-lookup-service 15.6.0-iso.2 → 15.6.0-iso.20

package/test/unit/domain/participants/participants.test.js

@@ -38,12 +38,13 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const participantsDomain = require('../../../../src/domain/participants/participants')
 const participant = require('../../../../src/models/participantEndpoint/facade')
 const oracle = require('../../../../src/models/oracle/facade')
-const Helper = require('../../../util/helper')
 const Config = require('../../../../src/lib/config')
+const { logger } = require('../../../../src/lib')
+const { ERROR_MESSAGES } = require('../../../../src/constants')
+const Helper = require('../../../util/helper')
+const fixtures = require('../../../fixtures')
 
-Logger.isDebugEnabled = jest.fn(() => true)
-Logger.isErrorEnabled = jest.fn(() => true)
-Logger.isInfoEnabled = jest.fn(() => true)
+const { Headers } = Enums.Http
 
 describe('participant Tests', () => {
   describe('getParticipantsByTypeAndID', () => {
@@ -185,7 +186,7 @@ describe('participant Tests', () => {
       expect.hasAssertions()
       // Arrange
       participant.validateParticipant = sandbox.stub().resolves(null)
-      const logErrorStub = sandbox.stub(Logger, 'error')
+      const logStub = sandbox.stub(logger.constructor.prototype, 'warn')
 
       participant.sendRequest = sandbox.stub()
       const args = [
@@ -199,8 +200,8 @@ describe('participant Tests', () => {
       await participantsDomain.getParticipantsByTypeAndID(...args)
 
       // Assert
-      const firstCallArgs = logErrorStub.getCall(0).args
-      expect(firstCallArgs[0]).toBe('Requester FSP not found')
+      const firstCallArgs = logStub.getCall(0).args
+      expect(firstCallArgs[0]).toBe(ERROR_MESSAGES.sourceFspNotFound)
     })
 
     it('fails when `oracleRequest` response is empty', async () => {
@@ -485,9 +486,8 @@ describe('participant Tests', () => {
     it('handles the case where `validateParticipant` returns null', async () => {
       expect.hasAssertions()
       // Arrange
+      const logStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().resolves(null)
-      sandbox.stub(Logger)
-      Logger.error = sandbox.stub()
       participant.sendErrorToParticipant = sandbox.stub()
       const headers = {
         accept: 'application/vnd.interoperability.participants+json;version=1',
@@ -510,8 +510,7 @@ describe('participant Tests', () => {
       await participantsDomain.putParticipantsByTypeAndID(headers, params, method, payload)
 
       // Assert
-      const loggerFirstCallArgs = Logger.error.getCall(0).args
-      expect(loggerFirstCallArgs[0]).toBe('Requester FSP not found')
+      expect(logStub.getCall(0).args[1].message).toBe(ERROR_MESSAGES.sourceFspNotFound)
     })
 
     it('handles case where type is not in `PartyAccountTypes`', async () => {
@@ -739,9 +738,6 @@ describe('participant Tests', () => {
     it('handles PUT /error when SubId supplied but validateParticipant throws error', async () => {
       expect.hasAssertions()
       // Arrange
-      sandbox.stub(Logger)
-      Logger.info = sandbox.stub()
-      Logger.error = sandbox.stub()
       participant.validateParticipant = sandbox.stub().throws(new Error('Validation failed'))
       oracle.oracleRequest = sandbox.stub().resolves(null)
       participant.sendErrorToParticipant = sandbox.stub()
@@ -771,15 +767,11 @@ describe('participant Tests', () => {
       expect(participant.sendErrorToParticipant.callCount).toBe(1)
       const firstCallArgs = participant.sendErrorToParticipant.getCall(0).args
       expect(firstCallArgs[1]).toBe(expectedCallbackEndpointType)
-      expect(Logger.error.callCount).toBe(1)
     })
 
     it('handles PUT /error when `sendErrorToParticipant` throws error', async () => {
       expect.hasAssertions()
       // Arrange
-      sandbox.stub(Logger)
-      Logger.info = sandbox.stub()
-      Logger.error = sandbox.stub()
       participant.validateParticipant = sandbox.stub().resolves({})
       participant.sendErrorToParticipant = sandbox.stub().throws(new Error('sendErrorToParticipant failed'))
       const expectedCallbackEndpointType = Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
@@ -809,15 +801,11 @@ describe('participant Tests', () => {
       const secondCallArgs = participant.sendErrorToParticipant.getCall(1).args
       expect(firstCallArgs[1]).toBe(expectedCallbackEndpointType)
       expect(secondCallArgs[0]).toBe(Config.HUB_NAME)
-      expect(Logger.error.callCount).toBe(2)
     })
 
     it('handles PUT /error when SubId is supplied and `sendErrorToParticipant` throws error', async () => {
       expect.hasAssertions()
       // Arrange
-      sandbox.stub(Logger)
-      Logger.info = sandbox.stub()
-      Logger.error = sandbox.stub()
       participant.validateParticipant = sandbox.stub().resolves({})
       participant.sendErrorToParticipant = sandbox.stub().throws(new Error('sendErrorToParticipant failed'))
       const expectedCallbackEndpointType = Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR
@@ -848,7 +836,6 @@ describe('participant Tests', () => {
       const secondCallArgs = participant.sendErrorToParticipant.getCall(1).args
       expect(firstCallArgs[1]).toBe(expectedCallbackEndpointType)
       expect(secondCallArgs[0]).toBe(Config.HUB_NAME)
-      expect(Logger.error.callCount).toBe(2)
     })
   })
 
@@ -1048,9 +1035,8 @@ describe('participant Tests', () => {
     it('handles the case where `validateParticipant` returns null', async () => {
       expect.hasAssertions()
       // Arrange
+      const logStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().resolves(null)
-      sandbox.stub(Logger)
-      Logger.error = sandbox.stub()
       participant.sendErrorToParticipant = sandbox.stub()
       const headers = {
         accept: 'application/vnd.interoperability.participants+json;version=1',
@@ -1072,8 +1058,7 @@ describe('participant Tests', () => {
       await participantsDomain.postParticipants(headers, 'get', params, payload)
 
       // Assert
-      const loggerFirstCallArgs = Logger.error.getCall(0).args
-      expect(loggerFirstCallArgs[0]).toBe('Requester FSP not found')
+      expect(logStub.getCall(0).args[0]).toBe(ERROR_MESSAGES.sourceFspNotFound)
     })
 
     it('handles case where type is not in `PartyAccountTypes`', async () => {
@@ -1202,7 +1187,7 @@ describe('participant Tests', () => {
 
       const headers = {
         accept: 'application/vnd.interoperability.participants+json;version=1',
-        'fspiop-destination': Config.HUB_NAME,
+        // 'fspiop-destination': Config.HUB_NAME,
         'content-type': 'application/vnd.interoperability.participants+json;version=1.1',
         date: '2019-05-24 08:52:19',
         'fspiop-source': 'fsp1'
@@ -1318,15 +1303,23 @@ describe('participant Tests', () => {
       const expected = {
         currency: 'USD',
         partyList: [
-          ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND, undefined, undefined, undefined, [{
-            key: Enums.Accounts.PartyAccountTypes.MSISDN,
-            value: undefined
-          }]).toApiErrorObject(Config.ERROR_HANDLING),
-          ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, undefined, undefined, undefined, [{
-            key: 'NOT_A_VALID_PARTY_ID',
-            value: undefined
-          }]).toApiErrorObject(Config.ERROR_HANDLING),
-          { partyId: { currency: undefined } }
+          {
+            ...ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND, undefined, undefined, undefined, [{
+              key: Enums.Accounts.PartyAccountTypes.MSISDN,
+              value: undefined
+            }]).toApiErrorObject(Config.ERROR_HANDLING),
+            partyId: payload.partyList[1]
+          },
+          {
+            ...ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, undefined, undefined, undefined, [{
+              key: 'NOT_A_VALID_PARTY_ID',
+              value: undefined
+            }]).toApiErrorObject(Config.ERROR_HANDLING),
+            partyId: payload.partyList[2]
+          },
+          {
+            partyId: { currency: undefined }
+          }
         ]
       }
 
@@ -1342,10 +1335,10 @@ describe('participant Tests', () => {
     it('handles error when `validateParticipant` fails and `sendErrorToParticipant` throws', async () => {
       expect.hasAssertions()
       // Arrange
-      sandbox.stub(Logger)
-      Logger.error = sandbox.stub()
+      const logStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().resolves(null)
-      participant.sendErrorToParticipant = sandbox.stub().throws(new Error('unknown error'))
+      const cbError = new Error('unknown error')
+      participant.sendErrorToParticipant = sandbox.stub().throws(cbError)
 
       const headers = {
         accept: 'application/vnd.interoperability.participants+json;version=1',
@@ -1368,10 +1361,8 @@ describe('participant Tests', () => {
       await participantsDomain.postParticipantsBatch(headers, 'get', payload, Helper.mockSpan())
 
       // Assert
-      const firstCallArgs = Logger.error.getCall(0).args
-      const thirdCallArgs = Logger.error.getCall(2).args
-      expect(firstCallArgs[0]).toBe('Requester FSP not found')
-      expect(thirdCallArgs[0].message).toBe('unknown error')
+      expect(logStub.getCall(0).firstArg).toBe(ERROR_MESSAGES.sourceFspNotFound)
+      expect(logStub.getCall(2).lastArg).toEqual(cbError)
     })
 
     it('handles error when `oracleBatchRequest` returns no result', async () => {
@@ -1447,6 +1438,44 @@ describe('participant Tests', () => {
       expect(firstCallArgs[4].partyList[1].errorInformation).toBeDefined()
       expect(firstCallArgs[4].partyList[2].errorInformation).toBeDefined()
     })
+
+    it('should not call oracle if source-header and fspId in payload are different, and no destination [CSI-938]', async () => {
+      const headers = fixtures.participantsCallHeadersDto({ destination: '' })
+      const payload = {
+        requestId: '0e21b07e-3117-46ca-ae22-6ee370895697',
+        currency: 'MWK',
+        partyList: [
+          {
+            fspId: 'test-mwk-dfsp',
+            partyIdType: 'MSISDN',
+            partyIdentifier: '16665551002'
+          }
+        ]
+      }
+      expect(headers.source).not.toBe(payload.partyList[0].fspId)
+      expect(headers.destination).toBeUndefined()
+
+      participant.validateParticipant = sandbox.stub().resolves({})
+      participant.sendRequest = sandbox.stub()
+      participant.sendErrorToParticipant = sandbox.stub().resolves({})
+      oracle.oracleBatchRequest = sandbox.stub().resolves({})
+
+      await participantsDomain.postParticipantsBatch(headers, 'put', payload, Helper.mockSpan())
+
+      expect(oracle.oracleBatchRequest.callCount).toBe(0)
+      expect(participant.sendErrorToParticipant.callCount).toBe(0)
+      expect(participant.sendRequest.callCount).toBe(1)
+
+      const { args } = participant.sendRequest.getCall(0)
+      expect(args[0][Headers.FSPIOP.DESTINATION]).toBe(headers[Headers.FSPIOP.SOURCE])
+      expect(args[0][Headers.FSPIOP.SOURCE]).toBe(Config.HUB_NAME)
+      expect(args[1]).toBe(headers[Headers.FSPIOP.SOURCE])
+
+      const { partyList } = args[4]
+      expect(partyList.length).toBe(1)
+      expect(partyList[0].errorInformation).toBeDefined()
+      expect(partyList[0].partyId).toBe(payload.partyList[0])
+    })
   })
 
   describe('deleteParticipants', () => {
@@ -1602,9 +1631,8 @@ describe('participant Tests', () => {
     it('handles the case where `validateParticipant` returns null', async () => {
       expect.hasAssertions()
       // Arrange
+      const logStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().resolves(null)
-      sandbox.stub(Logger)
-      Logger.error = sandbox.stub()
       participant.sendErrorToParticipant = sandbox.stub()
       const headers = {
         accept: 'application/vnd.interoperability.participants+json;version=1',
@@ -1625,8 +1653,8 @@ describe('participant Tests', () => {
       await participantsDomain.deleteParticipants(headers, params, method, query)
 
       // Assert
-      const loggerFirstCallArgs = Logger.error.getCall(0).args
-      expect(loggerFirstCallArgs[0]).toBe('Requester FSP not found')
+      expect(logStub.getCall(0).firstArg).toBe(ERROR_MESSAGES.sourceFspNotFound)
+      // expect(logStub.getCall()]).toBe(ERROR_MESSAGES.sourceFspNotFound)
     })
 
     it('handles case where type is not in `PartyAccountTypes`', async () => {

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

@@ -613,7 +613,7 @@ describe('Parties Tests', () => {
     it('handles error when `participant.validateParticipant()` returns no participant', async () => {
       expect.hasAssertions()
       // Arrange
-      const loggerStub = sandbox.stub(logger, 'error')
+      const loggerStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.sendErrorToParticipant = sandbox.stub().resolves()
 
       const payload = JSON.stringify({ testPayload: true })
@@ -874,7 +874,7 @@ describe('Parties Tests', () => {
     it('handles error when `validateParticipant()` fails', async () => {
       expect.hasAssertions()
       // Arrange)
-      const loggerStub = sandbox.stub(logger.mlLogger, 'error')
+      const loggerStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().throws(new Error('Validation fails'))
       participant.sendErrorToParticipant = sandbox.stub().resolves({})
       const payload = JSON.stringify({ errorPayload: true })
@@ -894,7 +894,7 @@ describe('Parties Tests', () => {
       expect.hasAssertions()
       // Arrange
 
-      const loggerStub = sandbox.stub(logger.mlLogger, 'error')
+      const loggerStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().throws(new Error('Validation fails'))
       participant.sendErrorToParticipant = sandbox.stub().resolves({})
       const payload = JSON.stringify({ errorPayload: true })

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

@@ -0,0 +1,60 @@
+/*****
+ License
+ --------------
+ Copyright © 2017 Bill & Melinda Gates Foundation
+ The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Gates Foundation organization for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+ * Gates Foundation
+ - Name Surname <name.surname@gatesfoundation.com>
+
+ * Eugen Klymniuk <eugen.klymniuk@infitx.com>
+ --------------
+ **********/
+
+const mockSendRequest = jest.fn()
+
+jest.mock('@mojaloop/central-services-shared', () => ({
+  ...jest.requireActual('@mojaloop/central-services-shared'),
+  Util: {
+    ...jest.requireActual('@mojaloop/central-services-shared').Util,
+    Endpoints: { getEndpoint: jest.fn() },
+    Request: { sendRequest: mockSendRequest }
+  }
+}))
+
+const { API_TYPES } = require('@mojaloop/central-services-shared').Util.Hapi
+const { logger } = require('../../../../src/lib')
+const utils = require('../../../../src/domain/parties/utils')
+const config = require('../../../../src/lib/config')
+const fixtures = require('../../../fixtures')
+
+describe('parties utils Tests -->', () => {
+  test('should send error party callback in ISO format', async () => {
+    const isoConfig = { ...config, API_TYPE: API_TYPES.iso20022 }
+    const err = new Error('test error')
+    const source = 'dfsp1'
+    const headers = fixtures.partiesCallHeadersDto({ source })
+    const params = { ID: '1234', Type: 'MSISDN' }
+
+    const handleError = utils.createErrorHandlerOnSendingCallback(isoConfig, logger)
+    await handleError(err, headers, params, source)
+
+    expect(mockSendRequest).toHaveBeenCalledTimes(1)
+    const { payload } = mockSendRequest.mock.calls[0][0]
+    expect(payload.Rpt.Rsn.Cd).toBe('2001')
+    expect(payload.Rpt.OrgnlId).toBe(`${params.Type}/${params.ID}`)
+    expect(payload.Assgnmt.Assgnr.Agt.FinInstnId.Othr.Id).toBe(source)
+  })
+})

package/test/unit/domain/timeout/dto.test.js

@@ -9,8 +9,7 @@ describe('timeoutCallbackDto Tests -->', () => {
     config.API_TYPE = realApiType
   })
 
-  // todo: unskip after fixing transformLib SubId issue for parties.putError
-  test.skip('should produce ISO payload', async () => {
+  test('should produce ISO payload', async () => {
     config.API_TYPE = API_TYPES.iso20022
     const destination = 'D1'
     const partyId = 'P1'

package/test/unit/lib/TransformFacades.test.js

@@ -5,10 +5,11 @@ describe('TransformFacades Tests -->', () => {
   test('should transform PUT /parties error callback payload to ISO format', async () => {
     const body = errorCallbackResponseDto()
     const headers = partiesCallHeadersDto()
+    TransformFacades.FSPIOP.configure({ isTestingMode: true })
     const isoPayload = await TransformFacades.FSPIOP.parties.putError({
       body,
       headers,
-      params: { IdPath: '123456789' }
+      params: { Type: 'MSISDN', ID: '123456789' }
     })
     expect(isoPayload.body).toBeTruthy()
     expect(isoPayload.body.Assgnmt).toBeTruthy()

package/test/unit/lib/config.test.js

@@ -105,4 +105,11 @@ describe('Config tests', () => {
     expect(isSuccess).toBe(false)
     expect(error.message).toBe('File doesn\'t exist')
   })
+
+  it('should have FSPIOP_SOURCE_TO_SIGN config defined', () => {
+    process.env.ALS_ENDPOINT_SECURITY__JWS__JWS_SIGN = 'false' // to avoid error in config getFileContent()
+    const config = require(configImport)
+    expect(config.FSPIOP_SOURCE_TO_SIGN).toBeDefined()
+    expect(config.FSPIOP_SOURCE_TO_SIGN).toBe(config.HUB_NAME)
+  })
 })

package/test/unit/models/participantEndpoint/facade.test.js

@@ -58,6 +58,18 @@ jest.mock('@mojaloop/central-services-shared', () => ({
 const Logger = require('@mojaloop/central-services-logger')
 const fixtures = require('../../../fixtures')
 
+const mockConfigDto = ({
+  apiType = 'fspiop', // todo: use API_TYPES
+  jwsSign = false
+} = {}) => ({
+  API_TYPE: apiType,
+  JWS_SIGN: jwsSign,
+  FSPIOP_SOURCE_TO_SIGN: mockHubName,
+  JWS_SIGNING_KEY_PATH: 'secrets/jwsSigningKey.key',
+  JWS_SIGNING_KEY: 'somekey',
+  PROTOCOL_VERSIONS: fixtures.protocolVersionsDto()
+})
+
 Logger.isDebugEnabled = jest.fn(() => true)
 Logger.isErrorEnabled = jest.fn(() => true)
 Logger.isInfoEnabled = jest.fn(() => true)
@@ -190,14 +202,6 @@ describe('participantEndpoint Facade', () => {
   })
 
   describe('sendErrorToParticipant', () => {
-    const mockConfigDto = ({ jwsSign = false } = {}) => ({
-      JWS_SIGN: jwsSign,
-      FSPIOP_SOURCE_TO_SIGN: mockHubName,
-      JWS_SIGNING_KEY_PATH: 'secrets/jwsSigningKey.key',
-      JWS_SIGNING_KEY: 'somekey',
-      PROTOCOL_VERSIONS: fixtures.protocolVersionsDto()
-    })
-
     it('throws an error when the request fails', async () => {
       // Arrange
       jest.mock('../../../../src/lib/config', () => mockConfigDto())
@@ -291,5 +295,18 @@ describe('participantEndpoint Facade', () => {
       })
       spy.mockRestore()
     })
+
+    it('should send error response with apiType from config [ISO20022]', async () => {
+      const apiType = 'iso20022'
+      jest.mock('../../../../src/lib/config', () => mockConfigDto({ apiType }))
+      mockGetEndpoint.mockImplementation(() => 'http://example.com/12345')
+
+      const { sendErrorToParticipant } = require(`${src}/models/participantEndpoint/facade`)
+      await sendErrorToParticipant('participantName', 'URL', fixtures.errorCallbackResponseDto(), {})
+
+      expect(mockSendRequest).toHaveBeenCalledTimes(1)
+      const args = mockSendRequest.mock.calls[0][0]
+      expect(args.apiType).toBe(apiType)
+    })
   })
 })

package/test/unit/plugins.test.js

@@ -50,6 +50,7 @@ describe('Plugin Tests', () => {
     // Arrange
     const server = {
       register: sandbox.spy(),
+      ext: sandbox.spy(),
       info: {
         port: '8000'
       }
@@ -63,7 +64,7 @@ describe('Plugin Tests', () => {
     await registerPlugins(server, api)
 
     // Assert
-    expect(server.register.callCount).toBe(10)
+    expect(server.register.callCount).toBe(11)
     const firstCallArgs = server.register.getCall(1).args
     expect(firstCallArgs[0].options.document.info.title.includes('Open API for FSP Interoperability (FSPIOP) (Implementation Friendly Version)')).toBe(true)
   })
@@ -72,6 +73,7 @@ describe('Plugin Tests', () => {
     // Arrange
     const server = {
       register: sandbox.spy(),
+      ext: sandbox.spy(),
       info: {
         port: '8000'
       }
@@ -84,6 +86,6 @@ describe('Plugin Tests', () => {
     await registerPlugins(server, api)
 
     // Assert
-    expect(server.register.callCount).toBe(9)
+    expect(server.register.callCount).toBe(10)
   })
 })

package/test/util/apiClients/BasicApiClient.js

@@ -1,12 +1,12 @@
 const axiosLib = require('axios')
-const { loggerFactory } = require('../../../src/lib')
+const lib = require('../../../src/lib')
 const fixtures = require('../../fixtures')
 
 class BasicApiClient {
   constructor ({
     baseURL,
     axios = axiosLib.create({ baseURL }),
-    logger = loggerFactory(this.constructor.name)
+    logger = lib.logger.child(this.constructor.name)
   } = {}) {
     this.baseURL = baseURL
     this.axios = axios

package/src/handlers/monitoring/plugins/metrics.js

@@ -1,48 +0,0 @@
-/*****
- LICENSE
-
- Copyright © 2020 Mojaloop Foundation
-
- The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0
- (the "License") and you may not use these files except in compliance with the [License](http://www.apache.org/licenses/LICENSE-2.0).
-
- You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
-
- Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- either express or implied. See the License for the specific language governing permissions and limitations under the [License](http://www.apache.org/licenses/LICENSE-2.0).
-
- * Infitx
- - Steven Oderayi <steven.oderayi@infitx.com>
---------------
-******/
-
-'use strict'
-
-const HTTPENUM = require('@mojaloop/central-services-shared').Enum.Http
-const Metrics = require('@mojaloop/central-services-metrics')
-
-const handler = {
-  get: async (_request, reply) => {
-    return reply.response(await Metrics.getMetricsForPrometheus()).code(HTTPENUM.ReturnCodes.OK.CODE)
-  }
-}
-
-const routes = [
-  {
-    method: 'GET',
-    path: '/metrics',
-    handler: handler.get
-  }
-]
-
-const plugin = {
-  name: 'Metrics',
-  register (server) {
-    server.route(routes)
-  }
-}
-
-module.exports = {
-  plugin,
-  handler
-}

package/src/lib/requestLogger.js

@@ -1,54 +0,0 @@
-/*****
- License
- --------------
- Copyright © 2017 Bill & Melinda Gates Foundation
- The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
- Contributors
- --------------
- This is the official list of the Mojaloop project contributors for this file.
- Names of the original copyright holders (individuals or organizations)
- should be listed with a '*' in the first column. People who have
- contributed from an organization can be listed under the organization
- that actually holds the copyright for their contributions (see the
- Gates Foundation organization for an example). Those individuals should have
- their names indented and be marked with a '-'. Email address can be added
- optionally within square brackets <email>.
- * Gates Foundation
-
- * Rajiv Mothilal <rajiv.mothilal@modusbox.com>
-
- --------------
- ******/
-
-'use strict'
-
-const { logger, asyncStorage } = require('./index')
-
-const logRequest = function (request) {
-  const { path, method, headers, payload, query } = request
-  const requestId = request.info.id = `${request.info.id}__${headers.traceid}`
-  asyncStorage.enterWith({ requestId })
-
-  logger.isInfoEnabled && logger.info(`[==> req] ${method.toUpperCase()} ${path}`, { headers, payload, query })
-}
-
-const logResponse = function (request) {
-  if (logger.isInfoEnabled) {
-    const { path, method, headers, payload, query, response } = request
-    const { received } = request.info
-
-    const statusCode = response instanceof Error
-      ? response.output?.statusCode
-      : response.statusCode
-    const respTimeSec = ((Date.now() - received) / 1000).toFixed(3)
-
-    logger.info(`[<== ${statusCode}][${respTimeSec} s] ${method.toUpperCase()} ${path}`, { headers, payload, query })
-  }
-}
-
-module.exports = {
-  logRequest,
-  logResponse
-}

package/src/metrics/handler.js

@@ -1,33 +0,0 @@
-/*****
- License
- --------------
- Copyright © 2017 Bill & Melinda Gates Foundation
- The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
- Contributors
- --------------
- This is the official list of the Mojaloop project contributors for this file.
- Names of the original copyright holders (individuals or organizations)
- should be listed with a '*' in the first column. People who have
- contributed from an organization can be listed under the organization
- that actually holds the copyright for their contributions (see the
- Gates Foundation organization for an example). Those individuals should have
- their names indented and be marked with a '-'. Email address can be added
- optionally within square brackets <email>.
- * Gates Foundation
- - Name Surname <name.surname@gatesfoundation.com>
-
- - Pedro Barreto <pedrob@crosslaketech.com>
- - Rajiv Mothilal <rajivmothilal@gmail.com>
- - Shashikant Hirugade <shashikant.hirugade@modusbox.com>
---------------
- ******/
-
-'use strict'
-
-const Metrics = require('@mojaloop/central-services-metrics')
-
-exports.metrics = async function (request, h) {
-  return h.response(await Metrics.getMetricsForPrometheus()).code(200)
-}