account-lookup-service 15.6.0-iso.3 → 15.6.0-iso.4

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.3",
+  "version": "15.6.0-iso.4",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [

package/src/plugins.js

@@ -24,16 +24,22 @@
  ******/
 'use strict'
 
-const Config = require('./lib/config')
+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 CentralServices = require('@mojaloop/central-services-shared')
-const RawPayloadToDataUri = require('@mojaloop/central-services-shared').Util.Hapi.HapiRawPayload
-const OpenapiBackendValidator = require('@mojaloop/central-services-shared').Util.Hapi.OpenapiBackendValidator
-const APIDocumentation = require('@mojaloop/central-services-shared').Util.Hapi.APIDocumentation
+const {
+  APIDocumentation,
+  FSPIOPHeaderValidation,
+  HapiEventPlugin,
+  HapiRawPayload,
+  OpenapiBackendValidator
+} = require('@mojaloop/central-services-shared').Util.Hapi
+
+const Config = require('./lib/config')
 const MetricsPlugin = require('./metrics/plugin')
+const RequestLogger = require('./lib/requestLogger')
 
 const registerPlugins = async (server, openAPIBackend) => {
   await server.register(OpenapiBackendValidator)
@@ -121,10 +127,10 @@ const registerPlugins = async (server, openAPIBackend) => {
     Inert,
     Vision,
     ErrorHandling,
-    RawPayloadToDataUri,
-    CentralServices.Util.Hapi.HapiEventPlugin,
+    HapiRawPayload,
+    HapiEventPlugin,
     {
-      plugin: CentralServices.Util.Hapi.FSPIOPHeaderValidation.plugin,
+      plugin: FSPIOPHeaderValidation.plugin,
       options: getOptionsForFSPIOPHeaderValidation()
     }
   ])
@@ -132,6 +138,24 @@ const registerPlugins = async (server, openAPIBackend) => {
   if (Config.DISPLAY_ROUTES === true) {
     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
+      }
+    }
+  ])
 }
 
 module.exports = {

package/src/server.js

@@ -23,7 +23,6 @@
  ******/
 'use strict'
 
-const { randomUUID } = require('node:crypto')
 const Hapi = require('@hapi/hapi')
 const Boom = require('@hapi/boom')
 
@@ -37,7 +36,6 @@ const { name, version } = require('../package.json')
 const Db = require('./lib/db')
 const Util = require('./lib/util')
 const Plugins = require('./plugins')
-const RequestLogger = require('./lib/requestLogger')
 const Migrator = require('./lib/migrator')
 const APIHandlers = require('./api')
 const Routes = require('./api/routes')
@@ -104,23 +102,6 @@ const createServer = async (port, api, routes, isAdmin, proxyCacheConfig, proxyM
     }
   }
 
-  await server.ext([
-    {
-      type: 'onPreHandler',
-      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 Plugins.registerPlugins(server, api, isAdmin)
 
   server.route(routes)

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'
       }
@@ -72,6 +73,7 @@ describe('Plugin Tests', () => {
     // Arrange
     const server = {
       register: sandbox.spy(),
+      ext: sandbox.spy(),
       info: {
         port: '8000'
       }