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

package/audit-ci.jsonc

@@ -28,6 +28,7 @@
     "GHSA-rm97-x556-q36h", // https://github.com/advisories/GHSA-rm97-x556-q36h
     "GHSA-rv95-896h-c2vc", // https://github.com/advisories/GHSA-rv95-896h-c2vc
     "GHSA-952p-6rrq-rcjv", // https://github.com/advisories/GHSA-952p-6rrq-rcjv
-    "GHSA-3xgq-45jj-v275" // https://github.com/advisories/GHSA-3xgq-45jj-v275
+    "GHSA-3xgq-45jj-v275", // https://github.com/advisories/GHSA-3xgq-45jj-v275
+    "GHSA-rhx6-c78j-4q9w" // https://github.com/advisories/GHSA-rhx6-c78j-4q9w
   ]
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "account-lookup-service",
   "description": "Account Lookup Service is used to validate Party and Participant lookups.",
-  "version": "15.6.0-iso.19",
+  "version": "15.6.0-iso.20",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -93,20 +93,20 @@
     "@mojaloop/central-services-error-handling": "13.0.2",
     "@mojaloop/central-services-health": "15.0.0",
     "@mojaloop/central-services-logger": "11.5.1",
-    "@mojaloop/central-services-metrics": "12.4.0",
-    "@mojaloop/central-services-shared": "18.12.1",
+    "@mojaloop/central-services-metrics": "12.4.1",
+    "@mojaloop/central-services-shared": "18.13.0",
     "@mojaloop/central-services-stream": "11.3.1",
     "@mojaloop/database-lib": "11.0.6",
     "@mojaloop/event-sdk": "14.1.1",
     "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.0",
     "@mojaloop/ml-schema-transformer-lib": "2.4.1",
-    "@mojaloop/sdk-standard-components": "19.6.1",
+    "@mojaloop/sdk-standard-components": "19.6.2",
     "@now-ims/hapi-now-auth": "2.1.0",
     "ajv": "8.17.1",
     "ajv-keywords": "5.1.0",
     "blipp": "4.0.2",
     "commander": "12.1.0",
-    "cron": "3.2.1",
+    "cron": "3.3.0",
     "fast-safe-stringify": "^2.1.1",
     "hapi-auth-bearer-token": "8.0.0",
     "joi": "17.13.3",

package/src/lib/index.js

@@ -1,4 +1,4 @@
-const { loggerFactory, asyncStorage } = require('@mojaloop/central-services-logger/src/contextLogger')
+const { loggerFactory } = require('@mojaloop/central-services-logger/src/contextLogger')
 const { TransformFacades } = require('@mojaloop/ml-schema-transformer-lib')
 
 const logger = loggerFactory('ALS') // global logger without context
@@ -6,6 +6,5 @@ const logger = loggerFactory('ALS') // global logger without context
 module.exports = {
   logger,
   loggerFactory,
-  asyncStorage,
   TransformFacades
 }

package/src/plugins.js

@@ -24,22 +24,22 @@
  ******/
 'use strict'
 
-const { randomUUID } = require('node:crypto')
 const Inert = require('@hapi/inert')
 const Vision = require('@hapi/vision')
 const Blipp = require('blipp')
 const ErrorHandling = require('@mojaloop/central-services-error-handling')
+const MetricsPlugin = require('@mojaloop/central-services-metrics').plugin
 const {
   APIDocumentation,
   FSPIOPHeaderValidation,
   HapiEventPlugin,
   HapiRawPayload,
-  OpenapiBackendValidator
+  OpenapiBackendValidator,
+  loggingPlugin
 } = require('@mojaloop/central-services-shared').Util.Hapi
 
+const { logger } = require('./lib')
 const Config = require('./lib/config')
-const MetricsPlugin = require('@mojaloop/central-services-metrics').plugin
-const RequestLogger = require('./lib/requestLogger')
 
 const registerPlugins = async (server, openAPIBackend) => {
   await server.register(OpenapiBackendValidator)
@@ -139,23 +139,10 @@ const registerPlugins = async (server, openAPIBackend) => {
     await server.register([Blipp])
   }
 
-  await server.ext([
-    {
-      type: 'onRequest',
-      method: (request, h) => {
-        request.headers.traceid = request.headers.traceid || randomUUID()
-        RequestLogger.logRequest(request)
-        return h.continue
-      }
-    },
-    {
-      type: 'onPreResponse',
-      method: (request, h) => {
-        RequestLogger.logResponse(request)
-        return h.continue
-      }
-    }
-  ])
+  await server.register({
+    plugin: loggingPlugin,
+    options: { log: logger }
+  })
 }
 
 module.exports = {

package/test/unit/api/participants/{Type}/{ID}/{SubId}.test.js

@@ -35,7 +35,6 @@ const Db = require('../../../../../../src/lib/db')
 const oracleEndpointCached = require('../../../../../../src/models/oracle/oracleEndpointCached')
 const participant = require('../../../../../../src/models/participantEndpoint/facade')
 const participants = require('../../../../../../src/domain/participants')
-const requestLogger = require('../../../../../../src/lib/requestLogger')
 const Helper = require('../../../../../util/helper')
 const initServer = require('../../../../../../src/server').initializeApi
 const Logger = require('@mojaloop/central-services-logger')
@@ -51,8 +50,6 @@ describe('/participants/{Type}/{ID}/{SubId}', () => {
   beforeAll(async () => {
     sandbox = Sinon.createSandbox()
     sandbox.stub(Db, 'connect').returns(Promise.resolve({}))
-    sandbox.stub(requestLogger, 'logRequest').returns({})
-    sandbox.stub(requestLogger, 'logResponse').returns({})
     Config.API_PORT = await getPort()
     server = await initServer(Config)
   })

package/test/unit/api/participants/{Type}/{ID}.test.js

@@ -40,7 +40,6 @@ const Db = require('../../../../../src/lib/db')
 const oracleEndpointCached = require('../../../../../src/models/oracle/oracleEndpointCached')
 const participant = require('../../../../../src/models/participantEndpoint/facade')
 const participants = require('../../../../../src/domain/participants')
-const requestLogger = require('../../../../../src/lib/requestLogger')
 const Helper = require('../../../../util/helper')
 const initServer = require('../../../../../src/server').initializeApi
 const Config = require('../../../../../src/lib/config')
@@ -55,8 +54,6 @@ describe('/participants/{Type}/{ID}', () => {
   beforeAll(async () => {
     sandbox = Sinon.createSandbox()
     sandbox.stub(Db, 'connect').returns(Promise.resolve({}))
-    sandbox.stub(requestLogger, 'logRequest').returns({})
-    sandbox.stub(requestLogger, 'logResponse').returns({})
     Config.API_PORT = await getPort()
     server = await initServer(Config)
     sandbox.stub(Logger)

package/test/unit/plugins.test.js

@@ -64,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)
   })
@@ -86,6 +86,6 @@ describe('Plugin Tests', () => {
     await registerPlugins(server, api)
 
     // Assert
-    expect(server.register.callCount).toBe(9)
+    expect(server.register.callCount).toBe(10)
   })
 })

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