From 906be8514f44e02ab377aa42495bedd611112f16 Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Fri, 21 Jun 2024 14:41:59 +0100 Subject: [PATCH 1/4] feat: parameterize 'switch' id --- config/default.json | 4 ++ package-lock.json | 52 +++++++++--------- package.json | 12 ++--- src/domain/participants/participants.js | 10 ++-- src/lib/config.js | 2 + src/lib/headers.js | 3 +- src/models/oracle/facade.js | 6 +-- src/models/participantEndpoint/facade.js | 2 +- .../domain/participants/participants.test.js | 54 +++++++++---------- 9 files changed, 76 insertions(+), 69 deletions(-) diff --git a/config/default.json b/config/default.json index 2ff792e6..60d1f6fa 100644 --- a/config/default.json +++ b/config/default.json @@ -1,4 +1,8 @@ { + "HUB_PARTICIPANT": { + "ID": 1, + "NAME": "switch" + }, "ADMIN_PORT": 4001, "API_PORT": 4002, "DATABASE": { diff --git a/package-lock.json b/package-lock.json index 74e67322..45fb17f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,9 +11,9 @@ "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", @@ -21,8 +21,8 @@ "@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", @@ -33,7 +33,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", @@ -51,7 +51,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", @@ -975,9 +975,9 @@ } }, "node_modules/@hapi/catbox-memory": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@hapi/catbox-memory/-/catbox-memory-6.0.1.tgz", - "integrity": "sha512-sVb+/ZxbZIvaMtJfAbdyY+QJUQg9oKTwamXpEg/5xnfG5WbJLTjvEn4kIGKz9pN3ENNbIL/bIdctmHmqi/AdGA==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@hapi/catbox-memory/-/catbox-memory-6.0.2.tgz", + "integrity": "sha512-H1l4ugoFW/ZRkqeFrIo8p1rWN0PA4MDTfu4JmcoNDvnY975o29mqoZblqFTotxNHlEkMPpIiIBJTV+Mbi+aF0g==", "dependencies": { "@hapi/boom": "^10.0.1", "@hapi/hoek": "^11.0.2" @@ -1039,9 +1039,9 @@ "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" }, "node_modules/@hapi/hapi": { - "version": "21.3.9", - "resolved": "https://registry.npmjs.org/@hapi/hapi/-/hapi-21.3.9.tgz", - "integrity": "sha512-AT5m+Rb8iSOFG3zWaiEuTJazf4HDYl5UpRpyxMJ3yR+g8tOEmqDv6FmXrLHShdvDOStAAepHGnr1G7egkFSRdw==", + "version": "21.3.10", + "resolved": "https://registry.npmjs.org/@hapi/hapi/-/hapi-21.3.10.tgz", + "integrity": "sha512-CmEcmTREW394MaGGKvWpoOK4rG8tKlpZLs30tbaBzhCrhiL2Ti/HARek9w+8Ya4nMBGcd+kDAzvU44OX8Ms0Jg==", "dependencies": { "@hapi/accept": "^6.0.1", "@hapi/ammo": "^6.0.1", @@ -1049,7 +1049,7 @@ "@hapi/bounce": "^3.0.1", "@hapi/call": "^9.0.1", "@hapi/catbox": "^12.1.1", - "@hapi/catbox-memory": "^6.0.1", + "@hapi/catbox-memory": "^6.0.2", "@hapi/heavy": "^8.0.1", "@hapi/hoek": "^11.0.2", "@hapi/mimos": "^7.0.1", @@ -1959,9 +1959,9 @@ } }, "node_modules/@mojaloop/central-services-shared": { - "version": "18.3.8", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-18.3.8.tgz", - "integrity": "sha512-Wk+uG+mnOFrFNeDq0ffE+OXvcAtfemSPocPdCRFvnF0p123tV9CiH540R29XrXlRTLt78JS4N3GBYyR7E3ZfBA==", + "version": "18.4.0", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-18.4.0.tgz", + "integrity": "sha512-BeFgKsY7fwBMLu/P5zwmxZe/BCW2n1mixEbjF7r7qrk3A8zoI9/HNaZHV/SdDt4EGViugoc1Ij/eRmVk1PEwqw==", "dependencies": { "@hapi/catbox": "12.1.1", "@hapi/catbox-memory": "5.0.1", @@ -2033,9 +2033,9 @@ "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" }, "node_modules/@mojaloop/central-services-stream": { - "version": "11.3.0", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-stream/-/central-services-stream-11.3.0.tgz", - "integrity": "sha512-Yg50/pg6Jk3h8qJHuIkOlN1ZzZkMreEP5ukl6IDNJ758bpr+0sME0JGL5DwbwHCXTD0T/vemMrxIr5igtobq1Q==", + "version": "11.3.1", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-stream/-/central-services-stream-11.3.1.tgz", + "integrity": "sha512-mSdWvEFJEjKkZdDs+e1yeZm/gFfXTqA+eVRIBmp8p67QJy36ZTaAvrvebGYKZ60MBN2syDrqL+DbQMJdoxHLEA==", "dependencies": { "async": "3.2.5", "async-exit-hook": "2.0.1", @@ -2043,7 +2043,7 @@ "node-rdkafka": "2.18.0" }, "peerDependencies": { - "@mojaloop/central-services-error-handling": ">=12.x.x", + "@mojaloop/central-services-error-handling": ">=13.x.x", "@mojaloop/central-services-logger": ">=11.x.x" }, "peerDependenciesMeta": { @@ -9808,9 +9808,9 @@ "dev": true }, "node_modules/joi": { - "version": "17.13.1", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.1.tgz", - "integrity": "sha512-vaBlIKCyo4FCUtCm7Eu4QZd/q02bWcxfUO6YSXAZOWF6gzcLBeba8kwotUdYJjDLW8Cz8RywsSOqiNJZW0mNvg==", + "version": "17.13.3", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz", + "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==", "dependencies": { "@hapi/hoek": "^9.3.0", "@hapi/topo": "^5.1.0", @@ -11625,9 +11625,9 @@ "dev": true }, "node_modules/nodemon": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.3.tgz", - "integrity": "sha512-m4Vqs+APdKzDFpuaL9F9EVOF85+h070FnkHVEoU4+rmT6Vw0bmNl7s61VEkY/cJkL7RCv1p4urnUDUMrS5rk2w==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.4.tgz", + "integrity": "sha512-wjPBbFhtpJwmIeY2yP7QF+UKzPfltVGtfce1g/bB15/8vCGZj8uxD62b/b9M9/WVgme0NZudpownKN+c0plXlQ==", "dev": true, "dependencies": { "chokidar": "^3.5.2", diff --git a/package.json b/package.json index f447779f..7d21c176 100644 --- a/package.json +++ b/package.json @@ -78,9 +78,9 @@ "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", @@ -88,8 +88,8 @@ "@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", diff --git a/src/domain/participants/participants.js b/src/domain/participants/participants.js index c924a395..72540c9b 100644 --- a/src/domain/participants/participants.js +++ b/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, diff --git a/src/lib/config.js b/src/lib/config.js index f41fcbf0..0bcc6d10 100644 --- a/src/lib/config.js +++ b/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, diff --git a/src/lib/headers.js b/src/lib/headers.js index aa000826..db6641b9 100644 --- a/src/lib/headers.js +++ b/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, { diff --git a/src/models/oracle/facade.js b/src/models/oracle/facade.js index 1aa43685..f09e49a6 100644 --- a/src/models/oracle/facade.js +++ b/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`) diff --git a/src/models/participantEndpoint/facade.js b/src/models/participantEndpoint/facade.js index 33283191..d1069d06 100644 --- a/src/models/participantEndpoint/facade.js +++ b/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}`) diff --git a/test/unit/domain/participants/participants.test.js b/test/unit/domain/participants/participants.test.js index 7982984a..033c5f62 100644 --- a/test/unit/domain/participants/participants.test.js +++ b/test/unit/domain/participants/participants.test.js @@ -312,7 +312,7 @@ describe('participant Tests', () => { participant.sendRequest = sandbox.stub() const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -351,7 +351,7 @@ describe('participant Tests', () => { const expectedCallbackEndpointType = Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -423,7 +423,7 @@ describe('participant Tests', () => { participant.sendErrorToParticipant = sandbox.stub() const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -456,7 +456,7 @@ describe('participant Tests', () => { const expectedErrorCallbackEndpointType = Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -491,7 +491,7 @@ describe('participant Tests', () => { participant.sendErrorToParticipant = sandbox.stub() const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -523,7 +523,7 @@ describe('participant Tests', () => { const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -555,7 +555,7 @@ describe('participant Tests', () => { const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -587,7 +587,7 @@ describe('participant Tests', () => { const expectedErrorCallbackEndpointType = Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -638,7 +638,7 @@ describe('participant Tests', () => { 'fspiop-destination': 'payerfsp', 'content-type': 'application/vnd.interoperability.participants+json;version=1.1', date: '2019-05-24 08:52:19', - 'fspiop-source': Enums.Http.Headers.FSPIOP.SWITCH.value + 'fspiop-source': Config.HUB_NAME } const params = { ID: '123456', @@ -675,7 +675,7 @@ describe('participant Tests', () => { 'fspiop-destination': 'payerfsp', 'content-type': 'application/vnd.interoperability.participants+json;version=1.1', date: '2019-05-24 08:52:19', - 'fspiop-source': Enums.Http.Headers.FSPIOP.SWITCH.value + 'fspiop-source': Config.HUB_NAME } const params = { ID: '123456', @@ -713,7 +713,7 @@ describe('participant Tests', () => { 'fspiop-destination': 'payerfsp', 'content-type': 'application/vnd.interoperability.participants+json;version=1.1', date: '2019-05-24 08:52:19', - 'fspiop-source': Enums.Http.Headers.FSPIOP.SWITCH.value + 'fspiop-source': Config.HUB_NAME } const params = { ID: '123456', @@ -751,7 +751,7 @@ describe('participant Tests', () => { 'fspiop-destination': 'payerfsp', 'content-type': 'application/vnd.interoperability.participants+json;version=1.1', date: '2019-05-24 08:52:19', - 'fspiop-source': Enums.Http.Headers.FSPIOP.SWITCH.value + 'fspiop-source': Config.HUB_NAME } const params = { ID: '123456', @@ -788,7 +788,7 @@ describe('participant Tests', () => { 'fspiop-destination': 'payerfsp', 'content-type': 'application/vnd.interoperability.participants+json;version=1.1', date: '2019-05-24 08:52:19', - 'fspiop-source': Enums.Http.Headers.FSPIOP.SWITCH.value + 'fspiop-source': Config.HUB_NAME } const params = { ID: '123456', @@ -826,7 +826,7 @@ describe('participant Tests', () => { 'fspiop-destination': 'payerfsp', 'content-type': 'application/vnd.interoperability.participants+json;version=1.1', date: '2019-05-24 08:52:19', - 'fspiop-source': Enums.Http.Headers.FSPIOP.SWITCH.value + 'fspiop-source': Config.HUB_NAME } const params = { ID: '123456', @@ -878,7 +878,7 @@ describe('participant Tests', () => { participant.sendRequest = sandbox.stub() const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -917,7 +917,7 @@ describe('participant Tests', () => { const expectedCallbackEndpointType = Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -988,7 +988,7 @@ describe('participant Tests', () => { participant.sendErrorToParticipant = sandbox.stub() const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -1020,7 +1020,7 @@ describe('participant Tests', () => { const expectedErrorCallbackEndpointType = Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -1054,7 +1054,7 @@ describe('participant Tests', () => { participant.sendErrorToParticipant = sandbox.stub() const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -1085,7 +1085,7 @@ describe('participant Tests', () => { const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -1116,7 +1116,7 @@ describe('participant Tests', () => { const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -1147,7 +1147,7 @@ describe('participant Tests', () => { const expectedErrorCallbackEndpointType = Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -1202,7 +1202,7 @@ describe('participant Tests', () => { const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -1301,7 +1301,7 @@ describe('participant Tests', () => { const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -1349,7 +1349,7 @@ describe('participant Tests', () => { const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -1383,7 +1383,7 @@ describe('participant Tests', () => { const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' @@ -1422,7 +1422,7 @@ describe('participant Tests', () => { const headers = { accept: 'application/vnd.interoperability.participants+json;version=1', - 'fspiop-destination': Enums.Http.Headers.FSPIOP.SWITCH.value, + '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' From a4dd18f1713d21d23fc142595d070b3ca868ea8c Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Fri, 21 Jun 2024 14:59:29 +0100 Subject: [PATCH 2/4] test: fix tests --- config/default.json | 3 +-- docker/account-lookup-service/default.json | 5 ++++- src/lib/config.js | 2 +- test/integration-config.json | 5 ++++- .../domain/participants/participants.test.js | 12 +++++------ .../models/participantEndpoint/facade.test.js | 20 +++++++++---------- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/config/default.json b/config/default.json index 60d1f6fa..f18e8f71 100644 --- a/config/default.json +++ b/config/default.json @@ -1,7 +1,7 @@ { "HUB_PARTICIPANT": { "ID": 1, - "NAME": "switch" + "NAME": "Hub" }, "ADMIN_PORT": 4001, "API_PORT": 4002, @@ -78,7 +78,6 @@ "ENDPOINT_SECURITY":{ "JWS": { "JWS_SIGN": false, - "FSPIOP_SOURCE_TO_SIGN": "switch", "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key" } }, diff --git a/docker/account-lookup-service/default.json b/docker/account-lookup-service/default.json index b424b93d..b7863d97 100644 --- a/docker/account-lookup-service/default.json +++ b/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" } }, diff --git a/src/lib/config.js b/src/lib/config.js index 0bcc6d10..5c159f28 100644 --- a/src/lib/config.js +++ b/src/lib/config.js @@ -153,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, diff --git a/test/integration-config.json b/test/integration-config.json index 2fa2049e..f49c33f4 100644 --- a/test/integration-config.json +++ b/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" } }, diff --git a/test/unit/domain/participants/participants.test.js b/test/unit/domain/participants/participants.test.js index 033c5f62..574739ca 100644 --- a/test/unit/domain/participants/participants.test.js +++ b/test/unit/domain/participants/participants.test.js @@ -333,7 +333,7 @@ describe('participant Tests', () => { // Assert expect(participant.sendRequest.callCount).toBe(1) const firstCallArgs = participant.sendRequest.getCall(0).args - expect(firstCallArgs[0][Enums.Http.Headers.FSPIOP.DESTINATION]).toBe('switch') + expect(firstCallArgs[0][Enums.Http.Headers.FSPIOP.DESTINATION]).toBe(Config.HUB_NAME) }) it('sends put request to the participant with SubId', async () => { @@ -373,7 +373,7 @@ describe('participant Tests', () => { // Assert expect(participant.sendRequest.callCount).toBe(1) const firstCallArgs = participant.sendRequest.getCall(0).args - expect(firstCallArgs[0][Enums.Http.Headers.FSPIOP.DESTINATION]).toBe('switch') + expect(firstCallArgs[0][Enums.Http.Headers.FSPIOP.DESTINATION]).toBe(Config.HUB_NAME) expect(firstCallArgs[2]).toBe(expectedCallbackEndpointType) expect(firstCallArgs[4].partyList[0].partySubIdOrType).toBe('subId') }) @@ -808,7 +808,7 @@ describe('participant Tests', () => { const firstCallArgs = participant.sendErrorToParticipant.getCall(0).args const secondCallArgs = participant.sendErrorToParticipant.getCall(1).args expect(firstCallArgs[1]).toBe(expectedCallbackEndpointType) - expect(secondCallArgs[0]).toBe('switch') + expect(secondCallArgs[0]).toBe(Config.HUB_NAME) expect(Logger.error.callCount).toBe(2) }) @@ -847,7 +847,7 @@ describe('participant Tests', () => { const firstCallArgs = participant.sendErrorToParticipant.getCall(0).args const secondCallArgs = participant.sendErrorToParticipant.getCall(1).args expect(firstCallArgs[1]).toBe(expectedCallbackEndpointType) - expect(secondCallArgs[0]).toBe('switch') + expect(secondCallArgs[0]).toBe(Config.HUB_NAME) expect(Logger.error.callCount).toBe(2) }) }) @@ -898,7 +898,7 @@ describe('participant Tests', () => { // Assert expect(participant.sendRequest.callCount).toBe(1) const firstCallArgs = participant.sendRequest.getCall(0).args - expect(firstCallArgs[0][Enums.Http.Headers.FSPIOP.DESTINATION]).toBe('switch') + expect(firstCallArgs[0][Enums.Http.Headers.FSPIOP.DESTINATION]).toBe(Config.HUB_NAME) }) it('sends the request to the participant with SubId', async () => { @@ -938,7 +938,7 @@ describe('participant Tests', () => { // Assert expect(participant.sendRequest.callCount).toBe(1) const firstCallArgs = participant.sendRequest.getCall(0).args - expect(firstCallArgs[0][Enums.Http.Headers.FSPIOP.DESTINATION]).toBe('switch') + expect(firstCallArgs[0][Enums.Http.Headers.FSPIOP.DESTINATION]).toBe(Config.HUB_NAME) expect(firstCallArgs[2]).toBe(expectedCallbackEndpointType) expect(firstCallArgs[4].partyList[0].partySubIdOrType).toBe('subId') }) diff --git a/test/unit/models/participantEndpoint/facade.test.js b/test/unit/models/participantEndpoint/facade.test.js index c2892fd5..d6bdc3f5 100644 --- a/test/unit/models/participantEndpoint/facade.test.js +++ b/test/unit/models/participantEndpoint/facade.test.js @@ -32,7 +32,7 @@ const mockGetParticipant = jest.fn() const mockSendRequest = jest.fn() const mockEnums = { Http: { - Headers: { FSPIOP: { DESTINATION: 'fsp1', SOURCE: 'fsp2', SWITCH: { value: 'switch' } } }, + Headers: { FSPIOP: { DESTINATION: 'fsp1', SOURCE: 'fsp2', SWITCH: { value: 'Hub' } } }, RestMethods: { PUT: 'PUT' }, ResponseTypes: { JSON: 'json' }, HeaderResources: { PARTICIPANTS: 'value' } @@ -69,7 +69,7 @@ describe('participantEndpoint Facade', () => { // Arrange const mockedConfig = { JWS_SIGN: false, - FSPIOP_SOURCE_TO_SIGN: 'switch', + FSPIOP_SOURCE_TO_SIGN: 'Hub', PROTOCOL_VERSIONS: { CONTENT: { DEFAULT: '2.1', @@ -112,7 +112,7 @@ describe('participantEndpoint Facade', () => { // Arrange const mockedConfig = { JWS_SIGN: false, - FSPIOP_SOURCE_TO_SIGN: 'switch', + FSPIOP_SOURCE_TO_SIGN: 'Hub', PROTOCOL_VERSIONS: { CONTENT: { DEFAULT: '2.1', @@ -154,7 +154,7 @@ describe('participantEndpoint Facade', () => { it('should define jwsSigner and add fspiop-signature header', async () => { jest.mock('../../../../src/lib/config', () => ({ JWS_SIGN: true, - FSPIOP_SOURCE_TO_SIGN: 'switch', + FSPIOP_SOURCE_TO_SIGN: 'Hub', JWS_SIGNING_KEY_PATH: 'secrets/jwsSigningKey.key', JWS_SIGNING_KEY: 'somekey', PROTOCOL_VERSIONS: { @@ -171,8 +171,8 @@ describe('participantEndpoint Facade', () => { const participantName = 'fsp1' const headers = { [mockEnums.Http.Headers.FSPIOP.DESTINATION]: participantName, - [mockEnums.Http.Headers.FSPIOP.SOURCE]: 'switch', - 'fspiop-source': 'switch' + [mockEnums.Http.Headers.FSPIOP.SOURCE]: 'Hub', + 'fspiop-source': 'Hub' } const endpointType = 'URL' const method = 'PUT' @@ -204,7 +204,7 @@ describe('participantEndpoint Facade', () => { // Arrange jest.mock('../../../../src/lib/config', () => ({ JWS_SIGN: false, - FSPIOP_SOURCE_TO_SIGN: 'switch', + FSPIOP_SOURCE_TO_SIGN: 'Hub', JWS_SIGNING_KEY_PATH: 'secrets/jwsSigningKey.key', JWS_SIGNING_KEY: 'somekey', PROTOCOL_VERSIONS: { @@ -248,7 +248,7 @@ describe('participantEndpoint Facade', () => { // Arrange const mockedConfig = { JWS_SIGN: false, - FSPIOP_SOURCE_TO_SIGN: 'switch', + FSPIOP_SOURCE_TO_SIGN: 'Hub', JWS_SIGNING_KEY_PATH: 'secrets/jwsSigningKey.key', JWS_SIGNING_KEY: 'somekey', PROTOCOL_VERSIONS: { @@ -302,7 +302,7 @@ describe('participantEndpoint Facade', () => { // Arrange const mockedConfig = { JWS_SIGN: true, - FSPIOP_SOURCE_TO_SIGN: 'switch', + FSPIOP_SOURCE_TO_SIGN: 'Hub', JWS_SIGNING_KEY_PATH: 'secrets/jwsSigningKey.key', JWS_SIGNING_KEY: 'somekey', PROTOCOL_VERSIONS: { @@ -337,7 +337,7 @@ describe('participantEndpoint Facade', () => { } const headers = {} headers[mockEnums.Http.Headers.FSPIOP.DESTINATION] = 'fsp1' - headers[mockEnums.Http.Headers.FSPIOP.SOURCE] = 'switch' + headers[mockEnums.Http.Headers.FSPIOP.SOURCE] = 'Hub' // Act const action = async () => ParticipantFacade.sendErrorToParticipant(participantName, endpointType, errorInformation, headers) From 7916338ad0b9dac92ab514dbc523443fdb583f04 Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Tue, 25 Jun 2024 08:50:54 +0100 Subject: [PATCH 3/4] test: update tests to use configured HUB_NAME --- .../models/participantEndpoint/facade.test.js | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/test/unit/models/participantEndpoint/facade.test.js b/test/unit/models/participantEndpoint/facade.test.js index d6bdc3f5..85e4b71f 100644 --- a/test/unit/models/participantEndpoint/facade.test.js +++ b/test/unit/models/participantEndpoint/facade.test.js @@ -30,9 +30,10 @@ const mockGetEndpoint = jest.fn() const mockGetParticipant = jest.fn() const mockSendRequest = jest.fn() +const mockHubName = require('../../../util/testConfig').HUB_NAME const mockEnums = { Http: { - Headers: { FSPIOP: { DESTINATION: 'fsp1', SOURCE: 'fsp2', SWITCH: { value: 'Hub' } } }, + Headers: { FSPIOP: { DESTINATION: 'fsp1', SOURCE: 'fsp2', SWITCH: { value: mockHubName } } }, RestMethods: { PUT: 'PUT' }, ResponseTypes: { JSON: 'json' }, HeaderResources: { PARTICIPANTS: 'value' } @@ -69,7 +70,7 @@ describe('participantEndpoint Facade', () => { // Arrange const mockedConfig = { JWS_SIGN: false, - FSPIOP_SOURCE_TO_SIGN: 'Hub', + FSPIOP_SOURCE_TO_SIGN: mockHubName, PROTOCOL_VERSIONS: { CONTENT: { DEFAULT: '2.1', @@ -112,7 +113,7 @@ describe('participantEndpoint Facade', () => { // Arrange const mockedConfig = { JWS_SIGN: false, - FSPIOP_SOURCE_TO_SIGN: 'Hub', + FSPIOP_SOURCE_TO_SIGN: mockHubName, PROTOCOL_VERSIONS: { CONTENT: { DEFAULT: '2.1', @@ -154,7 +155,7 @@ describe('participantEndpoint Facade', () => { it('should define jwsSigner and add fspiop-signature header', async () => { jest.mock('../../../../src/lib/config', () => ({ JWS_SIGN: true, - FSPIOP_SOURCE_TO_SIGN: 'Hub', + FSPIOP_SOURCE_TO_SIGN: mockHubName, JWS_SIGNING_KEY_PATH: 'secrets/jwsSigningKey.key', JWS_SIGNING_KEY: 'somekey', PROTOCOL_VERSIONS: { @@ -171,8 +172,8 @@ describe('participantEndpoint Facade', () => { const participantName = 'fsp1' const headers = { [mockEnums.Http.Headers.FSPIOP.DESTINATION]: participantName, - [mockEnums.Http.Headers.FSPIOP.SOURCE]: 'Hub', - 'fspiop-source': 'Hub' + [mockEnums.Http.Headers.FSPIOP.SOURCE]: mockHubName, + 'fspiop-source': mockHubName } const endpointType = 'URL' const method = 'PUT' @@ -204,7 +205,7 @@ describe('participantEndpoint Facade', () => { // Arrange jest.mock('../../../../src/lib/config', () => ({ JWS_SIGN: false, - FSPIOP_SOURCE_TO_SIGN: 'Hub', + FSPIOP_SOURCE_TO_SIGN: mockHubName, JWS_SIGNING_KEY_PATH: 'secrets/jwsSigningKey.key', JWS_SIGNING_KEY: 'somekey', PROTOCOL_VERSIONS: { @@ -248,7 +249,7 @@ describe('participantEndpoint Facade', () => { // Arrange const mockedConfig = { JWS_SIGN: false, - FSPIOP_SOURCE_TO_SIGN: 'Hub', + FSPIOP_SOURCE_TO_SIGN: mockHubName, JWS_SIGNING_KEY_PATH: 'secrets/jwsSigningKey.key', JWS_SIGNING_KEY: 'somekey', PROTOCOL_VERSIONS: { @@ -302,7 +303,7 @@ describe('participantEndpoint Facade', () => { // Arrange const mockedConfig = { JWS_SIGN: true, - FSPIOP_SOURCE_TO_SIGN: 'Hub', + FSPIOP_SOURCE_TO_SIGN: mockHubName, JWS_SIGNING_KEY_PATH: 'secrets/jwsSigningKey.key', JWS_SIGNING_KEY: 'somekey', PROTOCOL_VERSIONS: { @@ -337,7 +338,7 @@ describe('participantEndpoint Facade', () => { } const headers = {} headers[mockEnums.Http.Headers.FSPIOP.DESTINATION] = 'fsp1' - headers[mockEnums.Http.Headers.FSPIOP.SOURCE] = 'Hub' + headers[mockEnums.Http.Headers.FSPIOP.SOURCE] = mockHubName // Act const action = async () => ParticipantFacade.sendErrorToParticipant(participantName, endpointType, errorInformation, headers) From 2f5311bd5673f0f38dce06e54e1429f2c49b200c Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Tue, 25 Jun 2024 08:52:05 +0100 Subject: [PATCH 4/4] test: update test --- test/unit/models/participantEndpoint/facade.test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/unit/models/participantEndpoint/facade.test.js b/test/unit/models/participantEndpoint/facade.test.js index 85e4b71f..17c5d435 100644 --- a/test/unit/models/participantEndpoint/facade.test.js +++ b/test/unit/models/participantEndpoint/facade.test.js @@ -27,10 +27,11 @@ 'use strict' +const mockHubName = require('../../../util/testConfig').HUB_NAME + const mockGetEndpoint = jest.fn() const mockGetParticipant = jest.fn() const mockSendRequest = jest.fn() -const mockHubName = require('../../../util/testConfig').HUB_NAME const mockEnums = { Http: { Headers: { FSPIOP: { DESTINATION: 'fsp1', SOURCE: 'fsp2', SWITCH: { value: mockHubName } } },