@mojaloop/sdk-scheme-adapter 12.2.3 → 13.0.1

package/test/unit/api/transfers/utils.js

@@ -35,7 +35,7 @@ function createGetTransfersTester({ reqInbound, reqOutbound, apiSpecsOutbound })
 
             return reqInbound.put(putUrl)
                 .send(putBody)
-                .set('content-type', 'application/vnd.interoperability.transfers+json;version=1.0')
+                .set('content-type', 'application/vnd.interoperability.transfers+json;version=1.1')
                 .set('Date', new Date().toISOString())
                 .set('fspiop-source', 'mojaloop-sdk')
                 .expect(200);
@@ -50,9 +50,49 @@ function createGetTransfersTester({ reqInbound, reqOutbound, apiSpecsOutbound })
         const res = await reqOutbound.get(`/transfers/${TRANSFER_ID}`);
         const {body} = res;
         expect(res.statusCode).toEqual(responseCode);
+
+        // remove elements of the response we do not want/need to compare for correctness.
+        // timestamps on requests/responses for example will be set by the HTTP framework
+        // and we dont want to compare against static values.
         delete body.initiatedTimestamp;
         if (body.transferState) {
             delete body.transferState.initiatedTimestamp;
+            if(body.transferState.quoteResponse) {
+                delete body.transferState.quoteResponse.headers;
+            }
+            if(body.transferState.getPartiesResponse) {
+                delete body.transferState.getPartiesResponse.headers;
+            }
+            if(body.transferState.fulfil) {
+                delete body.transferState.fulfil.headers;
+            }
+            if(body.transferState.quoteRequest) {
+                delete body.transferState.quoteRequest;
+            }
+            if(body.transferState.getPartiesRequest) {
+                delete body.transferState.getPartiesRequest;
+            }
+            if(body.transferState.prepare) {
+                delete body.transferState.prepare;
+            }
+        }
+        if(body.quoteResponse) {
+            delete body.quoteResponse.headers;
+        }
+        if(body.getPartiesResponse) {
+            delete body.getPartiesResponse.headers;
+        }
+        if(body.fulfil) {
+            delete body.fulfil.headers;
+        }
+        if(body.quoteRequest) {
+            delete body.quoteRequest;
+        }
+        if(body.getPartiesRequest) {
+            delete body.getPartiesRequest;
+        }
+        if(body.prepare) {
+            delete body.prepare;
         }
         expect(body).toEqual(responseBody);
         const responseValidator = new OpenAPIResponseValidator(apiSpecsOutbound.paths['/transfers/{transferId}'].get);
@@ -108,17 +148,17 @@ function createPostTransfersTester(
             if (urlPath.startsWith('/parties/')) {
                 putBody = await Promise.resolve(bodyFn.parties.put());
                 putUrl = urlPath;
-                contentType = 'application/vnd.interoperability.parties+json;version=1.0';
+                contentType = 'application/vnd.interoperability.parties+json;version=1.1';
             } else if (urlPath === '/quotes') {
                 expect(body).toEqual(bodyFn.quotes.post(body));
                 putBody = await Promise.resolve(bodyFn.quotes.put(body));
                 putUrl = `/quotes/${body.quoteId}`;
-                contentType = 'application/vnd.interoperability.quotes+json;version=1.0';
+                contentType = 'application/vnd.interoperability.quotes+json;version=1.1';
             } else if (urlPath === '/transfers') {
                 expect(body).toEqual(bodyFn.transfers.post(body));
                 putBody = await Promise.resolve(bodyFn.transfers.put(body));
                 putUrl = `/transfers/${body.transferId}`;
-                contentType = 'application/vnd.interoperability.transfers+json;version=1.0';
+                contentType = 'application/vnd.interoperability.transfers+json;version=1.1';
             } else {
                 throw new Error(`Unexpected url ${urlPath}`);
             }
@@ -162,10 +202,51 @@ function createPostTransfersTester(
 
         const res = await reqOutbound.post('/transfers').send(postTransfersSimpleBody);
         const {body} = res;
+        console.log(body)
         expect(res.statusCode).toEqual(responseCode);
+
+        // remove elements of the response we do not want/need to compare for correctness.
+        // timestamps on requests/responses for example will be set by the HTTP framework
+        // and we dont want to compare against static values.
         delete body.initiatedTimestamp;
         if (body.transferState) {
             delete body.transferState.initiatedTimestamp;
+            if(body.transferState.quoteResponse) {
+                delete body.transferState.quoteResponse.headers;
+            }
+            if(body.transferState.getPartiesResponse) {
+                delete body.transferState.getPartiesResponse.headers;
+            }
+            if(body.transferState.fulfil) {
+                delete body.transferState.fulfil.headers;
+            }
+            if(body.transferState.quoteRequest) {
+                delete body.transferState.quoteRequest;
+            }
+            if(body.transferState.getPartiesRequest) {
+                delete body.transferState.getPartiesRequest;
+            }
+            if(body.transferState.prepare) {
+                delete body.transferState.prepare;
+            }
+        }
+        if(body.quoteResponse) {
+            delete body.quoteResponse.headers;
+        }
+        if(body.getPartiesResponse) {
+            delete body.getPartiesResponse.headers;
+        }
+        if(body.fulfil) {
+            delete body.fulfil.headers;
+        }
+        if(body.quoteRequest) {
+            delete body.quoteRequest;
+        }
+        if(body.getPartiesRequest) {
+            delete body.getPartiesRequest;
+        }
+        if(body.prepare) {
+            delete body.prepare;
         }
         expect(body).toEqual(responseBody);
         const responseValidator = new OpenAPIResponseValidator(apiSpecsOutbound.paths['/transfers'].post);

package/test/unit/api/utils.js

@@ -6,6 +6,7 @@ const Validate = require('~/lib/validate');
 
 const InboundServer = require('~/InboundServer');
 const OutboundServer = require('~/OutboundServer');
+const { MetricsClient } = require('~/lib/metrics');
 const { Logger } = require('@mojaloop/sdk-standard-components');
 const Cache = require('~/lib/cache');
 
@@ -47,7 +48,9 @@ const createTestServers = async (config) => {
     });
     await cache.connect();
     defConfig.requestProcessingTimeoutSeconds = 2;
-    const serverOutbound = new OutboundServer(defConfig, logger, cache);
+    const metricsClient = new MetricsClient();
+    metricsClient._prometheusRegister.clear();
+    const serverOutbound = new OutboundServer(defConfig, logger, cache, metricsClient);
     await serverOutbound.start();
     const reqOutbound = supertest(serverOutbound._server);
 

package/test/unit/data/commonHttpHeaders.json

@@ -1,4 +1,5 @@
 {
+  "content-type": "application/vnd.interoperability.parties+json;version=1.1",
   "fspiop-source": "other-dfsp",
   "fspiop-destination": "mojaloop-sdk",
   "fspiop-signature": "{\"signature\":\"aTTa1TTCBJA1K1VoEFgpSicWYU0q1VYXV-bjkk7uoeNicog7QSp9_AbwtYm4u8NJ1HFM_3mekE8wioAs5YNugnTlJ1k-q4Ouvp5Jo3ZnozoPVtnLaqdhxRMUBOHfDp0X8eCHEo7lETjKcCcH4r5_KT_9Vwx5TMytoG_y9Be8PpviJFkOqOV5jCeIl7XzL_pZQoY0pRJdkXDzYpXDu-HTYKr8ckxWQzx4HO-viJQd2ByQkbqPfQom9IQaAX1t4yztCCpOQn1LY9j9sbfEX9RPXG3UbY6UyDsNjUKYP9BAhXwI9pFWlgv2i9FvEtay2QYdwbW7XEpIiGZ_vi5d6yc12w\",\"protectedHeader\":\"eyJhbGciOiJSUzI1NiIsIkZTUElPUC1VUkkiOiIvcGFydGllcy9NU0lTRE4vMTIzNDU2Nzg5IiwiRlNQSU9QLUhUVFAtTWV0aG9kIjoiUFVUIiwiRlNQSU9QLVNvdXJjZSI6InNpbSIsIkZTUElPUC1EZXN0aW5hdGlvbiI6ImRmc3AiLCJEYXRlIjoiVGh1LCAzMSBPY3QgMjAxOSAxMTo0MTo0MyBHTVQifQ\"}",

package/test/unit/inboundApi/handlers.test.js

@@ -58,7 +58,7 @@ describe('Inbound API handlers:', () => {
             await expect(handlers['/quotes'].post(mockContext)).resolves.toBe(undefined);
 
             expect(quoteRequestSpy).toHaveBeenCalledTimes(1);
-            expect(quoteRequestSpy.mock.calls[0][0]).toBe(mockContext.request.body);
+            expect(quoteRequestSpy.mock.calls[0][0]).toStrictEqual(mockContext.request);
             expect(quoteRequestSpy.mock.calls[0][1]).toBe(mockContext.request.headers['fspiop-source']);
         });
 
@@ -138,7 +138,10 @@ describe('Inbound API handlers:', () => {
             expect(triggerDeferredJobSpy).toHaveBeenCalledTimes(1);
             expect(triggerDeferredJobSpy).toBeCalledWith({
                 cache: mockContext.state.cache,
-                message: mockContext.request.body,
+                message: {
+                    body: mockContext.request.body,
+                    headers: mockContext.request.headers,
+                },
                 args: {
                     quoteId: mockContext.state.path.params.ID
                 }
@@ -215,8 +218,10 @@ describe('Inbound API handlers:', () => {
             expect(bulkQuotesSpy).toHaveBeenCalledTimes(1);
             expect(bulkQuotesSpy.mock.calls[0][1]).toMatchObject({
                 type: 'bulkQuoteResponse',
-                data: mockContext.request.body,
-                headers: mockContext.request.headers
+                data: {
+                    body: mockContext.request.body,
+                    headers: mockContext.request.headers,
+                }
             });
         });
     });
@@ -263,7 +268,10 @@ describe('Inbound API handlers:', () => {
             expect(bulkQuotesSpy).toHaveBeenCalledTimes(1);
             expect(bulkQuotesSpy.mock.calls[0][1]).toMatchObject({
                 type: 'bulkQuoteResponseError',
-                data: mockContext.request.body
+                data: {
+                    body: mockContext.request.body,
+                    headers: mockContext.request.headers,
+                }
             });
         });
     });
@@ -372,8 +380,10 @@ describe('Inbound API handlers:', () => {
             expect(bulkTransfersSpy).toHaveBeenCalledTimes(1);
             expect(bulkTransfersSpy.mock.calls[0][1]).toMatchObject({
                 type: 'bulkTransferResponse',
-                data: mockContext.request.body,
-                headers: mockContext.request.headers
+                data: {
+                    body: mockContext.request.body,
+                    headers: mockContext.request.headers,
+                }
             });
         });
     });
@@ -420,7 +430,10 @@ describe('Inbound API handlers:', () => {
             expect(bulkTransfersSpy).toHaveBeenCalledTimes(1);
             expect(bulkTransfersSpy.mock.calls[0][1]).toMatchObject({
                 type: 'bulkTransferResponseError',
-                data: mockContext.request.body
+                data: {
+                    body: mockContext.request.body,
+                    headers: mockContext.request.headers,
+                }
             });
         });
     });
@@ -601,7 +614,10 @@ describe('Inbound API handlers:', () => {
             expect(triggerDeferredJobSpy).toHaveBeenCalledTimes(1);
             expect(triggerDeferredJobSpy).toBeCalledWith({
                 cache: mockContext.state.cache,
-                message: mockContext.request.body,
+                message: {
+                    body: mockContext.request.body,
+                    headers: mockContext.request.headers,
+                },
                 args: {
                     type: mockContext.state.path.params.Type,
                     id: mockContext.state.path.params.ID
@@ -620,7 +636,10 @@ describe('Inbound API handlers:', () => {
             expect(triggerDeferredJobSpy).toHaveBeenCalledTimes(1);
             expect(triggerDeferredJobSpy).toBeCalledWith({
                 cache: mockContext.state.cache,
-                message: mockContext.request.body,
+                message: {
+                    body: mockContext.request.body,
+                    headers: mockContext.request.headers,
+                },
                 args: {
                     type: mockContext.state.path.params.Type,
                     id: mockContext.state.path.params.ID,
@@ -667,7 +686,10 @@ describe('Inbound API handlers:', () => {
             expect(triggerDeferredJobSpy).toHaveBeenCalledTimes(1);
             expect(triggerDeferredJobSpy).toBeCalledWith({
                 cache: mockContext.state.cache,
-                message: mockContext.request.body,
+                message: {
+                    body: mockContext.request.body,
+                    headers: mockContext.request.headers,
+                },
                 args: {
                     transferId: mockContext.state.path.params.ID
                 }
@@ -682,7 +704,10 @@ describe('Inbound API handlers:', () => {
             expect(triggerDeferredJobSpy).toHaveBeenCalledTimes(1);
             expect(triggerDeferredJobSpy).toBeCalledWith({
                 cache: mockContext.state.cache,
-                message: mockContext.request.body,
+                message: {
+                    body: mockContext.request.body,
+                    headers: mockContext.request.headers,
+                },
                 args: {
                     transferId: mockContext.state.path.params.ID,
                 }
@@ -728,7 +753,10 @@ describe('Inbound API handlers:', () => {
             expect(triggerDeferredJobSpy).toHaveBeenCalledTimes(1);
             expect(triggerDeferredJobSpy).toBeCalledWith({
                 cache: mockContext.state.cache,
-                message: mockContext.request.body,
+                message: {
+                    body: mockContext.request.body,
+                    headers: mockContext.request.headers,
+                },
                 args: {
                     transferId: mockContext.state.path.params.ID
                 }
@@ -743,7 +771,10 @@ describe('Inbound API handlers:', () => {
             expect(triggerDeferredJobSpy).toHaveBeenCalledTimes(1);
             expect(triggerDeferredJobSpy).toBeCalledWith({
                 cache: mockContext.state.cache,
-                message: mockContext.request.body,
+                message: {
+                    body: mockContext.request.body,
+                    headers: mockContext.request.headers,
+                },
                 args: {
                     transferId: mockContext.state.path.params.ID,
                 }

package/test/unit/index.test.js

@@ -10,13 +10,18 @@
 
 'use strict';
 
-const { Logger } = require('@mojaloop/sdk-standard-components');
-const defaultConfig = require('./data/defaultConfig');
-
 jest.mock('dotenv', () => ({
     config: jest.fn()
 }));
 
+const promClient = require('prom-client');
+const defaultConfig = require('./data/defaultConfig.json');
+const { Logger } = require('@mojaloop/sdk-standard-components');
+const { MetricsClient } = require('~/lib/metrics');
+
+const TestControlServer = require('./ControlServer');
+
+
 process.env.PEER_ENDPOINT = '172.17.0.3:4000';
 process.env.BACKEND_ENDPOINT = '172.17.0.5:4000';
 process.env.CACHE_HOST = '172.17.0.2';
@@ -26,6 +31,10 @@ process.env.MGMT_API_WS_URL = '0.0.0.0';
 const index = require('~/index.js');
 
 describe('index.js', () => {
+    beforeEach(() => {
+        promClient.register.clear();
+    });
+
     test('WSO2 error events in OutboundServer propagate to top-level server', () => {
         const logger = new Logger.Logger({ stringify: () => '' });
         const svr = new index.Server(defaultConfig, logger);
@@ -53,3 +62,86 @@ describe('index.js', () => {
         expect(typeof(index.Cache)).toBe('function');
     });
 });
+
+describe('Server', () => {
+    let server, controlServer, conf, logger;
+
+    beforeEach(async () => {
+        promClient.register.clear();
+        logger = new Logger.Logger({ stringify: () => '' });
+        conf = JSON.parse(JSON.stringify(defaultConfig));
+        conf.enableTestFeatures = true;
+        conf.pm4mlEnabled = true;
+        conf.control.mgmtAPIWsUrl = 'localhost';
+        conf.control.mgmtAPIWsPort = 4005;
+        conf.control.port = conf.control.mgmtAPIWsPort;
+        controlServer = new TestControlServer.Server({ logger, appConfig: conf });
+        server = new index.Server(conf, logger);
+        await server.start();
+    });
+
+    afterEach(async () => {
+        await controlServer.stop();
+        await server.stop();
+    });
+
+    describe('is reconfigured correctly by the control client', () => {
+        let newConf;
+        beforeEach(async () => {
+            // not every server restarts on every config change, we'll make sure they all restart
+            newConf = { ...conf, logIndent: conf.logIndent + 1, control: { ...conf.control, rubbish: 'data' }, test: { trash: 'data' } };
+            // Just in case, we'll assert the new configuration is different to the old one
+            expect(newConf).not.toEqual(conf);
+        });
+
+        it('reconfigures and restarts constituent servers when triggered by control client', async () => {
+            const [restartInbound, restartOutbound, restartControl, restartOAuthTest, restartTest] =
+                 Array.from({ length: 5 }).map(() => jest.fn());
+            server.inboundServer.reconfigure = jest.fn(() => restartInbound);
+            server.outboundServer.reconfigure = jest.fn(() => restartOutbound);
+            server.testServer.reconfigure = jest.fn(() => restartTest);
+            server.oauthTestServer.reconfigure = jest.fn(() => restartOAuthTest);
+            server.controlClient.reconfigure = jest.fn(() => restartControl);
+
+            await controlServer.broadcastConfigChange(newConf);
+
+            // We wait for the servers to get restarted
+            await new Promise((wait) => setTimeout(wait, 1000));
+
+            expect(server.inboundServer.reconfigure).toHaveBeenCalledTimes(1);
+            expect(server.inboundServer.reconfigure).toHaveBeenCalledWith(
+                newConf, expect.any(Logger.Logger), expect.any(index.Cache)
+            );
+            expect(server.outboundServer.reconfigure).toHaveBeenCalledTimes(1);
+            const metricsClient = new MetricsClient();
+            expect(server.outboundServer.reconfigure).toHaveBeenCalledWith(
+                newConf, expect.any(Logger.Logger), expect.any(index.Cache), metricsClient
+            );
+            expect(server.controlClient.reconfigure).toHaveBeenCalledTimes(1);
+            expect(server.controlClient.reconfigure).toHaveBeenCalledWith({
+                logger: expect.any(Logger.Logger),
+                port: newConf.control.port,
+                appConfig: newConf
+            });
+            expect(server.testServer.reconfigure).toHaveBeenCalledTimes(1);
+            expect(server.testServer.reconfigure).toHaveBeenCalledWith({
+                logger: expect.any(Logger.Logger),
+                cache: expect.any(index.Cache),
+                port: newConf.test.port
+            });
+            expect(server.oauthTestServer.reconfigure).toHaveBeenCalledTimes(1);
+            expect(server.oauthTestServer.reconfigure).toHaveBeenCalledWith({
+                logger: expect.any(Logger.Logger),
+                clientKey: newConf.oauthTestServer.clientKey,
+                clientSecret: newConf.oauthTestServer.clientSecret,
+                port: newConf.oauthTestServer.listenPort,
+            });
+
+            expect(restartInbound).toHaveBeenCalledTimes(1);
+            expect(restartOutbound).toHaveBeenCalledTimes(1);
+            expect(restartTest).toHaveBeenCalledTimes(1);
+            expect(restartOAuthTest).toHaveBeenCalledTimes(1);
+            expect(restartControl).toHaveBeenCalledTimes(1);
+        });
+    });
+});

package/test/unit/lib/model/AccountsModel.test.js

@@ -51,14 +51,17 @@ describe('AccountsModel', () => {
             const response = {
                 type: 'accountsCreationSuccessfulResponse',
                 data: {
-                    partyList: request.partyList.map(party => ({
-                        partyId: party,
-                        // errorInformation: null
-                    })),
-                    currency: request.currency,
+                    body: {
+                        partyList: request.partyList.map(party => ({
+                            partyId: party,
+                            // errorInformation: null
+                        })),
+                        currency: request.currency,
+                    },
+                    headers: {}
                 },
             };
-            cache.publish(`ac_${request.requestId}`, JSON.stringify(response));
+            cache.publish(`ac_${request.requestId}`, response);
             return Promise.resolve();
         });