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

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

package/src/metrics/plugin.js

@@ -1,52 +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>
-
- * Lazola Lucas <lazola.lucas@modusbox.com>
- * Rajiv Mothilal <rajiv.mothilal@modusbox.com>
- * Miguel de Barros <miguel.debarros@modusbox.com>
- * Shashikant Hirugade <shashikant.hirugade@modusbox.com>
-
- --------------
-
- ******/
-'use strict'
-
-/**
- * @module src/metrics/plugin
- */
-
-/**
- * @function Register Handler Routes HAPI
- *
- * @async
- * @description Registers registers plugins on HAPI server. This retrieves all routes to be exposed from the routes.js file
- * @returns {Promise} - Returns a promise: resolve if successful, or rejection if failed
- */
-
-exports.plugin = {
-  name: 'handler metrics routes',
-  register: function (server) {
-    server.route(require('./routes'))
-  }
-}

package/src/metrics/routes.js

@@ -1,43 +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 Handler = require('./handler')
-const tags = ['api', 'metrics']
-
-module.exports = [
-  {
-    method: 'GET',
-    path: '/metrics',
-    handler: Handler.metrics,
-    config: {
-      tags,
-      description: 'Prometheus metrics endpoint',
-      id: 'metrics'
-    }
-  }
-]

package/test/unit/lib/requestLogger.test.js

@@ -1,115 +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>
-
- * Crosslake
- - Lewis Daly <lewisd@crosslaketech.com>
-
- --------------
- ******/
-
-'use strict'
-
-const Sinon = require('sinon')
-const ErrorHandler = require('@mojaloop/central-services-error-handling')
-
-const requestLogger = require('../../../src/lib/requestLogger')
-const { logger } = require('../../../src/lib')
-const fixtures = require('../../fixtures')
-
-let sandbox
-
-describe('requestLogger', () => {
-  beforeEach(() => {
-    sandbox = Sinon.createSandbox()
-  })
-
-  afterEach(() => {
-    sandbox.restore()
-  })
-
-  describe('logRequest', () => {
-    it('prints the request.payload if it exists', async () => {
-      // Arrange
-      const infoSpy = sandbox.spy(logger.mlLogger, 'info')
-      const req = {
-        ...fixtures.mockHapiRequestDto(),
-        url: {
-          path: '/123/456'
-        },
-        query: {},
-        payload: {
-          itemA: 123,
-          itemB: 456
-        }
-      }
-
-      // Act
-      requestLogger.logRequest(req)
-
-      // Assert
-      expect(infoSpy.calledOnce).toBe(true)
-      const logLine = infoSpy.firstCall.args[0]
-      expect(logLine).toContain(JSON.stringify(req.headers))
-      expect(logLine).toContain(JSON.stringify(req.query))
-      expect(logLine).toContain(JSON.stringify(req.payload))
-    })
-  })
-
-  describe('logResponse', () => {
-    it('should log response statusCode', async () => {
-      // Arrange
-      const infoSpy = sandbox.spy(logger.mlLogger, 'info')
-      const req = {
-        ...fixtures.mockHapiRequestDto(),
-        response: {
-          statusCode: 500
-        }
-      }
-
-      // Act
-      requestLogger.logResponse(req)
-
-      // Assert
-      const logLine = infoSpy.firstCall.args[0]
-      expect(logLine).toContain(JSON.stringify(req.response.statusCode))
-    })
-
-    it('handles valid json error response', async () => {
-      // Arrange
-      const infoSpy = sandbox.spy(logger.mlLogger, 'info')
-      const response = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, 'Invalid currency code')
-      const statusCode = 123
-      response.output = {
-        statusCode
-      }
-      const req = {
-        ...fixtures.mockHapiRequestDto(),
-        response
-      }
-
-      // Act
-      requestLogger.logResponse(req)
-
-      // Assert
-      const logLine = infoSpy.firstCall.args[0]
-      expect(logLine).toContain(JSON.stringify(statusCode))
-    })
-  })
-})