@mojaloop/central-services-shared 18.6.0-proxy.3 → 18.6.0-proxy.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/central-services-shared",
-  "version": "18.6.0-proxy.3",
+  "version": "18.6.0-proxy.4",
   "description": "Shared code for mojaloop central services",
   "license": "Apache-2.0",
   "author": "ModusBox",

package/src/util/endpoints.js

@@ -147,6 +147,8 @@ exports.getEndpoint = async (switchUrl, fsp, endpointType, options = {}, renderO
   ).startTimer()
   switchEndpoint = switchUrl
   Logger.isDebugEnabled && Logger.debug(`participantEndpointCache::getEndpoint::endpointType - ${endpointType}`)
+  let isProxy = false
+  const result = url => proxyConfig ? { url, isProxy } : url
   try {
     // If a service passes in `getDecoratedValue` as true, then an object
     // { value, cached, report } is returned, where value is the cached value,
@@ -159,6 +161,7 @@ exports.getEndpoint = async (switchUrl, fsp, endpointType, options = {}, renderO
         await proxy.connect()
       }
       const proxyId = await proxy.lookupProxyByDfspId(fsp)
+      isProxy = true
       endpoints = proxyId && await policy.get(proxyId)
     }
     if (!endpoints) throw ErrorHandler.CreateFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND)
@@ -171,16 +174,16 @@ exports.getEndpoint = async (switchUrl, fsp, endpointType, options = {}, renderO
       const endpoint = new Map(endpoints.value).get(endpointType)
       if (renderOptions.path) {
         const renderedEndpoint = (endpoint === undefined) ? endpoint : endpoint + renderOptions.path
-        return Mustache.render(renderedEndpoint, options)
+        return result(Mustache.render(renderedEndpoint, options))
       }
-      return Mustache.render(endpoint, options)
+      return result(Mustache.render(endpoint, options))
     }
     let endpoint = new Map(endpoints).get(endpointType)
     if (renderOptions.path) {
       endpoint = (endpoint === undefined) ? endpoint : endpoint + renderOptions.path
     }
     histTimer({ success: true, hit: false })
-    return Mustache.render(endpoint, options)
+    return result(Mustache.render(endpoint, options))
   } catch (err) {
     histTimer({ success: false, hit: false })
     Logger.isErrorEnabled && Logger.error(`participantEndpointCache::getEndpoint:: ERROR:'${err}'`)

package/test/unit/util/endpoints.test.js

@@ -122,8 +122,10 @@ Test('Cache Test', (cacheTest) => {
         { fsp: proxiedFsp }
       )
       const endpointType = FSPIOP_CALLBACK_URL_TRANSFER_PUT
-      const expected =
-        'http://localhost:1080/transfers/97b01bd3-b223-415b-b37b-ab5bef9bdbed'
+      const expected = {
+        url: 'http://localhost:1080/transfers/97b01bd3-b223-415b-b37b-ab5bef9bdbed',
+        isProxy: true
+      }
 
       await Cache.initializeCache(Config.ENDPOINT_CACHE_CONFIG, {
         hubName, hubNameRegex
@@ -144,7 +146,7 @@ Test('Cache Test', (cacheTest) => {
           undefined,
           {}
         )
-        test.equal(result, expected, 'The results match')
+        test.deepEqual(result, expected, 'The results match')
 
         await Cache.stopCache()
         test.end()