feat(mojaloop/#3984): parameterize switch id

config/default.json

@@ -1,4 +1,8 @@
 {
+  "HUB_PARTICIPANT": {
+    "ID": 1,
+    "NAME": "Hub"
+  },
   "ADMIN_PORT": 4001,
   "API_PORT": 4002,
   "DATABASE": {
@@ -74,7 +78,6 @@
   "ENDPOINT_SECURITY":{
     "JWS": {
       "JWS_SIGN": false,
-      "FSPIOP_SOURCE_TO_SIGN": "switch",
       "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
     }
   },

docker/account-lookup-service/default.json

@@ -1,4 +1,8 @@
 {
+  "HUB_PARTICIPANT": {
+    "ID": 1,
+    "NAME": "Hub"
+  },
   "ADMIN_PORT": 4001,
   "API_PORT": 4002,
   "DATABASE": {
@@ -43,7 +47,6 @@
   "ENDPOINT_SECURITY":{
     "JWS": {
       "JWS_SIGN": false,
-      "FSPIOP_SOURCE_TO_SIGN": "switch",
       "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
     }
   },

package.json

@@ -78,18 +78,18 @@
   "dependencies": {
     "@hapi/basic": "7.0.2",
     "@hapi/boom": "10.0.1",
-    "@hapi/catbox-memory": "6.0.1",
+    "@hapi/catbox-memory": "6.0.2",
     "@hapi/good": "9.0.1",
-    "@hapi/hapi": "21.3.9",
+    "@hapi/hapi": "21.3.10",
     "@hapi/inert": "7.1.0",
     "@hapi/joi": "17.1.1",
     "@hapi/vision": "7.0.3",
     "@mojaloop/central-services-error-handling": "13.0.1",
     "@mojaloop/central-services-health": "15.0.0",
     "@mojaloop/central-services-logger": "11.3.1",
     "@mojaloop/central-services-metrics": "12.0.8",
-    "@mojaloop/central-services-shared": "18.3.8",
-    "@mojaloop/central-services-stream": "11.3.0",
+    "@mojaloop/central-services-shared": "18.4.0",
+    "@mojaloop/central-services-stream": "11.3.1",
     "@mojaloop/database-lib": "11.0.5",
     "@mojaloop/event-sdk": "14.1.1",
     "@mojaloop/sdk-standard-components": "18.1.0",
@@ -100,7 +100,7 @@
     "commander": "12.1.0",
     "fast-safe-stringify": "^2.1.1",
     "hapi-auth-bearer-token": "8.0.0",
-    "joi": "17.13.1",
+    "joi": "17.13.3",
     "knex": "3.1.0",
     "mustache": "4.2.0",
     "mysql": "2.18.1",
@@ -134,7 +134,7 @@
     "jest": "29.7.0",
     "jest-junit": "16.0.0",
     "jsdoc": "4.0.3",
-    "nodemon": "3.1.3",
+    "nodemon": "3.1.4",
     "npm-audit-resolver": "3.0.0-RC.0",
     "npm-check-updates": "16.14.20",
     "nyc": "17.0.0",

src/domain/participants/participants.js

@@ -78,7 +78,7 @@ const getParticipantsByTypeAndID = async (headers, params, method, query, span,
         if (!clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] || clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] === '') {
           clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE]
         }
-        clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Enums.Http.Headers.FSPIOP.SWITCH.value
+        clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
         await participant.sendRequest(clonedHeaders, requesterName, callbackEndpointType, Enums.Http.RestMethods.PUT, payload, options, childSpan)
       } else {
         await participant.sendErrorToParticipant(requesterName, errorCallbackEndpointType,
@@ -168,7 +168,7 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
           const clonedHeaders = { ...headers }
           if (!clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] || clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] === '') {
             clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = payload.fspId
-            clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Enums.Http.Headers.FSPIOP.SWITCH.value
+            clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
           }
           await participant.sendRequest(clonedHeaders, clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION], callbackEndpointType, Enums.Http.RestMethods.PUT, responsePayload, options)
         } else {
@@ -307,7 +307,7 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
           const clonedHeaders = { ...headers }
           if (!clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] || clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] === '') {
             clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = payload.fspId
-            clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Enums.Http.Headers.FSPIOP.SWITCH.value
+            clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
           }
           await participant.sendRequest(clonedHeaders, clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION], callbackEndpointType, Enums.Http.RestMethods.PUT, responsePayload, options, childSpan)
           if (childSpan && !childSpan.isFinished) {
@@ -439,7 +439,7 @@ const postParticipantsBatch = async (headers, method, requestPayload, span) => {
       const clonedHeaders = { ...headers }
       if (!clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] || clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] === '') {
         clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = payload.partyList[0].partyId.fspId
-        clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Enums.Http.Headers.FSPIOP.SWITCH.value
+        clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
       }
       await participant.sendRequest(clonedHeaders, clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION], Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_BATCH_PUT, Enums.Http.RestMethods.PUT, payload, { requestId }, childSpan)
       if (childSpan && !childSpan.isFinished) {
@@ -511,7 +511,7 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
           options = partySubIdOrType ? { ...options, partySubIdOrType } : options
           const clonedHeaders = { ...headers }
           clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = headers[Enums.Http.Headers.FSPIOP.SOURCE]
-          clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Enums.Http.Headers.FSPIOP.SWITCH.value
+          clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
           await participant.sendRequest(clonedHeaders, clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION], callbackEndpointType, Enums.Http.RestMethods.PUT, responsePayload, options)
         } else {
           await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,

src/lib/config.js

@@ -99,6 +99,8 @@ const getProtocolVersions = (defaultProtocolVersions, overrideProtocolVersions)
 }
 
 const config = {
+  HUB_ID: RC.HUB_PARTICIPANT.ID,
+  HUB_NAME: RC.HUB_PARTICIPANT.NAME,
   API_PORT: RC.API_PORT,
   DATABASE: {
     client: RC.DATABASE.DIALECT,
@@ -151,7 +153,7 @@ const config = {
   INSTRUMENTATION_METRICS_LABELS: RC.INSTRUMENTATION.METRICS.labels,
   INSTRUMENTATION_METRICS_CONFIG: RC.INSTRUMENTATION.METRICS.config,
   JWS_SIGN: RC.ENDPOINT_SECURITY.JWS.JWS_SIGN,
-  FSPIOP_SOURCE_TO_SIGN: RC.ENDPOINT_SECURITY.JWS.FSPIOP_SOURCE_TO_SIGN,
+  FSPIOP_SOURCE_TO_SIGN: RC.HUB_NAME,
   JWS_SIGNING_KEY_PATH: RC.ENDPOINT_SECURITY.JWS.JWS_SIGNING_KEY_PATH,
   API_DOC_ENDPOINTS_ENABLED: RC.API_DOC_ENDPOINTS_ENABLED || false,
   FEATURE_ENABLE_EXTENDED_PARTY_ID_TYPE: RC.FEATURE_ENABLE_EXTENDED_PARTY_ID_TYPE || false,

src/lib/headers.js

@@ -30,6 +30,7 @@
 
 const Mustache = require('mustache')
 const Enums = require('@mojaloop/central-services-shared').Enum
+const Config = require('../lib/config')
 
 /**
  * @function createErrorCallbackHeaders
@@ -41,7 +42,7 @@ const Enums = require('@mojaloop/central-services-shared').Enum
 exports.createCallbackHeaders = (params) => {
   const callbackHeaders = { ...params.requestHeaders }
 
-  callbackHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Enums.Http.Headers.FSPIOP.SWITCH.value
+  callbackHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
   callbackHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = params.requestHeaders[Enums.Http.Headers.FSPIOP.SOURCE]
   callbackHeaders[Enums.Http.Headers.FSPIOP.HTTP_METHOD] = Enums.Http.RestMethods.PUT
   callbackHeaders[Enums.Http.Headers.FSPIOP.URI] = Mustache.render(params.endpointTemplate, {

src/models/oracle/facade.js

@@ -83,7 +83,7 @@ exports.oracleRequest = async (headers, method, params = {}, query = {}, payload
             url,
             headers,
             headers[Enums.Http.Headers.FSPIOP.SOURCE],
-            headers[Enums.Http.Headers.FSPIOP.DESTINATION] || Enums.Http.Headers.FSPIOP.SWITCH.value,
+            headers[Enums.Http.Headers.FSPIOP.DESTINATION] || Config.HUB_NAME,
             method.toUpperCase(),
             payload || undefined
           )
@@ -110,7 +110,7 @@ exports.oracleRequest = async (headers, method, params = {}, query = {}, payload
         url,
         headers,
         headers[Enums.Http.Headers.FSPIOP.SOURCE],
-        headers[Enums.Http.Headers.FSPIOP.DESTINATION] || Enums.Http.Headers.FSPIOP.SWITCH.value,
+        headers[Enums.Http.Headers.FSPIOP.DESTINATION] || Config.HUB_NAME,
         method.toUpperCase(),
         payload || undefined
       )
@@ -318,7 +318,7 @@ exports.oracleBatchRequest = async (headers, method, requestPayload, type, paylo
         url = oracleEndpointModel[0].value + Enums.EndPoints.FspEndpointTemplates.ORACLE_PARTICIPANTS_BATCH
       }
       Logger.isDebugEnabled && Logger.debug(`Oracle endpoints: ${url}`)
-      return await request.sendRequest(url, headers, headers[Enums.Http.Headers.FSPIOP.SOURCE], headers[Enums.Http.Headers.FSPIOP.DESTINATION] || Enums.Http.Headers.FSPIOP.SWITCH.value, method, payload || undefined)
+      return await request.sendRequest(url, headers, headers[Enums.Http.Headers.FSPIOP.SOURCE], headers[Enums.Http.Headers.FSPIOP.DESTINATION] || Config.HUB_NAME, method, payload || undefined)
     } else {
       Logger.isErrorEnabled && Logger.error(`Oracle type:${type} not found`)
       throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, `Oracle type:${type} not found`)

src/models/participantEndpoint/facade.js

@@ -198,7 +198,7 @@ exports.sendErrorToParticipant = async (participantName, endpointType, errorInfo
 
     if (!clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] || clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] === '') {
       clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE]
-      clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Enums.Http.Headers.FSPIOP.SWITCH.value
+      clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
     }
 
     Logger.isDebugEnabled && Logger.debug(`participant endpoint url: ${requesterErrorEndpoint} for endpoint type ${endpointType}`)

test/integration-config.json

@@ -1,4 +1,8 @@
 {
+  "HUB_PARTICIPANT": {
+    "ID": 1,
+    "NAME": "Hub"
+  },
   "TEST_ALS_HOST":"account-lookup-service",
   "ADMIN_PORT": 4001,
   "API_PORT": 4002,
@@ -61,7 +65,6 @@
   "ENDPOINT_SECURITY":{
     "JWS": {
       "JWS_SIGN": false,
-      "FSPIOP_SOURCE_TO_SIGN": "switch",
       "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
     }
   },