@mojaloop/sdk-scheme-adapter 13.0.2 → 14.0.0

package/.circleci/config.yml

@@ -64,7 +64,7 @@ executors:
   default-docker:
     working_directory: /home/circleci/project
     docker:
-      - image: node:16-alpine
+      - image: node:16.15.0-alpine
 
   default-machine:
     machine:

package/.nvmrc

@@ -1 +1 @@
-v16.14
+v16.15.0

package/CHANGELOG.md

@@ -1,4 +1,29 @@
 # Changelog: [mojaloop/thirdparty-api-svc](https://github.com/mojaloop/thirdparty-api-svc)
+## [14.0.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v13.0.4...v14.0.0) (2022-05-19)
+
+
+### ⚠ BREAKING CHANGES
+
+* bump nodejs version and update central services (#319)
+
+### Features
+
+* bump nodejs version and update central services ([#319](https://github.com/mojaloop/sdk-scheme-adapter/issues/319)) ([ee5a6da](https://github.com/mojaloop/sdk-scheme-adapter/commit/ee5a6da0650aa186114755c88889c441da6dfe8a))
+
+### [13.0.4](https://github.com/mojaloop/sdk-scheme-adapter/compare/v13.0.3...v13.0.4) (2022-05-13)
+
+
+### Bug Fixes
+
+* reformat error information response ([#318](https://github.com/mojaloop/sdk-scheme-adapter/issues/318)) ([ed844b1](https://github.com/mojaloop/sdk-scheme-adapter/commit/ed844b1d2da6c58d3c61622c07c326bda3ca3b86))
+
+### [13.0.3](https://github.com/mojaloop/sdk-scheme-adapter/compare/v13.0.2...v13.0.3) (2022-05-12)
+
+
+### Bug Fixes
+
+* correct party outbound response ([#317](https://github.com/mojaloop/sdk-scheme-adapter/issues/317)) ([752e8b4](https://github.com/mojaloop/sdk-scheme-adapter/commit/752e8b4d315a6e9c3b8ad4ff1b65761c41e3d721))
+
 ### [13.0.2](https://github.com/mojaloop/sdk-scheme-adapter/compare/v13.0.1...v13.0.2) (2022-05-12)
 
 

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-alpine as builder
+FROM node:16.15.0-alpine as builder
 
 RUN apk add --no-cache git python3 build-base
 
@@ -12,7 +12,7 @@ WORKDIR /src
 COPY ./package.json .
 COPY ./package-lock.json .
 RUN npm ci --only=production
-FROM node:16-alpine
+FROM node:16.15.0-alpine
 
 ARG BUILD_DATE
 ARG VCS_URL

package/audit-resolve.json

@@ -417,8 +417,8 @@
     },
     "1070030|@mojaloop/central-services-shared>widdershins>markdown-it": {
       "decision": "ignore",
-      "madeAt": 1650460940438,
-      "expiresAt": 1653052932045
+      "madeAt": 1652982823332,
+      "expiresAt": 1655574816261
     },
     "1070030|@mojaloop/central-services-shared>shins>markdown-it": {
       "decision": "ignore",
@@ -504,8 +504,38 @@
       "decision": "ignore",
       "madeAt": 1651249549067,
       "expiresAt": 1653841542147
+    },
+    "1068155|@mojaloop/central-services-shared>shins>markdown-it>sanitize-html": {
+      "decision": "ignore",
+      "madeAt": 1652981366297,
+      "expiresAt": 1655573359219
+    },
+    "1070260|@mojaloop/central-services-shared>shins>markdown-it>sanitize-html": {
+      "decision": "ignore",
+      "madeAt": 1652981367363,
+      "expiresAt": 1655573359219
+    },
+    "1070030|shins>markdown-it": {
+      "decision": "ignore",
+      "madeAt": 1652982823332,
+      "expiresAt": 1655574816261
+    },
+    "1068310|@mojaloop/central-services-shared>widdershins>markdown-it>yargs>yargs-parser": {
+      "decision": "ignore",
+      "madeAt": 1652982824567,
+      "expiresAt": 1655574816261
+    },
+    "1068155|shins>markdown-it>sanitize-html": {
+      "decision": "ignore",
+      "madeAt": 1652982826025,
+      "expiresAt": 1655574816261
+    },
+    "1070260|shins>markdown-it>sanitize-html": {
+      "decision": "ignore",
+      "madeAt": 1652982827137,
+      "expiresAt": 1655574816261
     }
   },
   "rules": {},
   "version": 1
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "13.0.2",
+  "version": "14.0.0",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -54,15 +54,9 @@
   },
   "dependencies": {
     "@koa/cors": "^3.1.0",
-    "@mojaloop/central-services-error-handling": "11.3.0",
-    "@mojaloop/central-services-health": "13.0.0",
-    "@mojaloop/central-services-logger": "10.6.1",
-    "@mojaloop/central-services-metrics": "11.0.0",
-    "@mojaloop/central-services-shared": "14.0.0",
-    "@mojaloop/event-sdk": "10.7.1",
-    "@mojaloop/sdk-standard-components": "^16.0.0",
-    "ajv": "8.6.3",
-    "ajv-keywords": "5.0.0",
+    "@mojaloop/central-services-shared": "17.0.2",
+    "@mojaloop/sdk-standard-components": "^17.0.1",
+    "ajv": "8.11.0",
     "axios": "^0.21.4",
     "co-body": "^6.1.0",
     "dotenv": "^10.0.0",

package/src/lib/model/OutboundBulkQuotesModel.js

@@ -162,8 +162,8 @@ class OutboundBulkQuotesModel {
                             }
                         }
                     } else if (message.type === 'bulkQuoteResponseError') {
-                        error = new BackendError(`Got an error response requesting bulk quote: ${util.inspect(message.data, { depth: Infinity })}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response requesting bulk quote: ${util.inspect(message.data.body, { depth: Infinity })}`, 500);
+                        error.mojaloopError = message.data.body;
                     }
                     else {
                         this._logger.push({ message }).log(`Ignoring cache notification for bulk quote ${bulkQuoteKey}. Unknown message type ${message.type}.`);
@@ -297,8 +297,8 @@ class OutboundBulkQuotesModel {
                     let message = JSON.parse(msg);
 
                     if (message.type === 'bulkQuoteError') {
-                        error = new BackendError(`Got an error response retrieving bulk quote: ${util.inspect(message.data, { depth: Infinity })}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response retrieving bulk quote: ${util.inspect(message.data.body, { depth: Infinity })}`, 500);
+                        error.mojaloopError = message.data.body;
                     } else if (message.type !== 'bulkQuoteResponse') {
                         this._logger.push({ message }).log(`Ignoring cache notification for bulk quote ${bulkQuoteKey}. Uknokwn message type ${message.type}.`);
                         return;

package/src/lib/model/OutboundBulkTransfersModel.js

@@ -161,8 +161,8 @@ class OutboundBulkTransfersModel {
                             }
                         }
                     } else if (message.type === 'bulkTransferError') {
-                        error = new BackendError(`Got an error response preparing bulk transfer: ${util.inspect(message.data, { depth: Infinity })}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response preparing bulk transfer: ${util.inspect(message.data.body, { depth: Infinity })}`, 500);
+                        error.mojaloopError = message.data.body;
                     }
                     else {
                         this._logger.push({ message }).log(`Ignoring cache notification for bulk transfer ${bulkTransferKey}. Unknown message type ${message.type}.`);
@@ -289,8 +289,8 @@ class OutboundBulkTransfersModel {
                     let message = JSON.parse(msg);
 
                     if (message.type === 'bulkTransferError') {
-                        error = new BackendError(`Got an error response retrieving bulk transfer: ${util.inspect(message.data, { depth: Infinity })}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response retrieving bulk transfer: ${util.inspect(message.data.body, { depth: Infinity })}`, 500);
+                        error.mojaloopError = message.data.body;
                     } else if (message.type !== 'bulkTransferFulfil') {
                         this._logger.push({ message }).log(`Ignoring cache notification for bulk transfer ${bulkTransferKey}. Uknokwn message type ${message.type}.`);
                         return;

package/src/lib/model/OutboundRequestToPayTransferModel.js

@@ -267,11 +267,10 @@ class OutboundRequestToPayTransferModel {
             const subId = await this._cache.subscribe(payeeKey, (cn, msg, subId) => {
                 try {
                     let payee = JSON.parse(msg);
-
-                    if(payee.errorInformation) {
+                    if(payee.body && payee.body.errorInformation) {
                         // this is an error response to our GET /parties request
-                        const err = new BackendError(`Got an error response resolving party: ${util.inspect(payee)}`, 500);
-                        err.mojaloopError = payee;
+                        const err = new BackendError(`Got an error response resolving party: ${util.inspect(payee.body)}`, 500);
+                        err.mojaloopError = payee.body;
 
                         // cancel the timeout handler
                         clearTimeout(timeout);
@@ -405,8 +404,8 @@ class OutboundRequestToPayTransferModel {
                             }
                         }
                     } else if (message.type === 'quoteResponseError') {
-                        error = new BackendError(`Got an error response requesting quote: ${util.inspect(message.data)}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response requesting quote: ${util.inspect(message.data.body)}`, 500);
+                        error.mojaloopError = message.data.body;
                     }
                     else {
                         this._logger.push({ message }).log(`Ignoring cache notification for quote ${quoteKey}. Unknown message type ${message.type}.`);
@@ -620,8 +619,8 @@ class OutboundRequestToPayTransferModel {
                             }
                         }
                     } else if (message.type === 'transferError') {
-                        error = new BackendError(`Got an error response preparing transfer: ${util.inspect(message.data)}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response preparing transfer: ${util.inspect(message.data.body)}`, 500);
+                        error.mojaloopError = message.data.body;
                     } else {
                         this._logger.push({ message }).log(`Ignoring cache notification for transfer ${transferKey}. Uknokwn message type ${message.type}.`);
                         return;
@@ -701,8 +700,8 @@ class OutboundRequestToPayTransferModel {
                     let message = JSON.parse(msg);
 
                     if (message.type === 'transferError') {
-                        error = new BackendError(`Got an error response retrieving transfer: ${util.inspect(message.data)}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response retrieving transfer: ${util.inspect(message.data.body)}`, 500);
+                        error.mojaloopError = message.data.body;
                     } else if (message.type !== 'transferFulfil') {
                         this._logger.push({ message }).log(`Ignoring cache notification for transfer ${transferKey}. Uknokwn message type ${message.type}.`);
                         return;

package/src/lib/model/OutboundTransfersModel.js

@@ -497,8 +497,8 @@ class OutboundTransfersModel {
                             }
                         }
                     } else if (message.type === 'quoteResponseError') {
-                        error = new BackendError(`Got an error response requesting quote: ${util.inspect(message.data, { depth: Infinity })}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response requesting quote: ${util.inspect(message.data.body, { depth: Infinity })}`, 500);
+                        error.mojaloopError = message.data.body;
                     }
                     else {
                         this._logger.push({ message }).log(`Ignoring cache notification for quote ${quoteKey}. Unknown message type ${message.type}.`);

package/src/lib/model/PartiesModel.js

@@ -66,7 +66,10 @@ function argsValidation({ type, id, subId }) {
  */
 function reformatMessage(message) {
     return {
-        party: { ...message }
+        party: {
+            body: { ...message.body.party },
+            headers: { ...message.headers }
+        }
     };
 }
 

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

@@ -207,10 +207,13 @@ describe('OutboundBulkQuotesModel', () => {
         const expectError = {
             type: 'bulkQuoteResponseError',
             data: {
-                errorInformation: {
-                    errorCode: '3205',
-                    errorDescription: 'Bulk quote ID not found'
-                }
+                body: {
+                    errorInformation: {
+                        errorCode: '3205',
+                        errorDescription: 'Bulk quote ID not found'
+                    }
+                },
+                headers: {}
             }
         };
 
@@ -239,7 +242,7 @@ describe('OutboundBulkQuotesModel', () => {
             expect(err.message.replace(/[ \n]/g,'')).toEqual(errMsg.replace(/[ \n]/g,''));
             expect(err.bulkQuoteState).toBeTruthy();
             expect(err.bulkQuoteState.lastError).toBeTruthy();
-            expect(err.bulkQuoteState.lastError.mojaloopError).toEqual(expectError.data);
+            expect(err.bulkQuoteState.lastError.mojaloopError).toEqual(expectError.data.body);
             expect(err.bulkQuoteState.lastError.bulkQuoteState).toBe(undefined);
             return;
         }

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

@@ -202,10 +202,13 @@ describe('outboundBulkTransferModel', () => {
         const expectError = {
             type: 'bulkTransferError',
             data: {
-                errorInformation: {
-                    errorCode: '4001',
-                    errorDescription: 'Payer FSP insufficient liquidity'
-                }
+                body: {
+                    errorInformation: {
+                        errorCode: '4001',
+                        errorDescription: 'Payer FSP insufficient liquidity'
+                    }
+                },
+                headers: {}
             }
         };
 
@@ -234,7 +237,7 @@ describe('outboundBulkTransferModel', () => {
             expect(err.message.replace(/[ \n]/g,'')).toEqual(errMsg.replace(/[ \n]/g,''));
             expect(err.bulkTransferState).toBeTruthy();
             expect(err.bulkTransferState.lastError).toBeTruthy();
-            expect(err.bulkTransferState.lastError.mojaloopError).toEqual(expectError.data);
+            expect(err.bulkTransferState.lastError.mojaloopError).toEqual(expectError.data.body);
             expect(err.bulkTransferState.lastError.bulkTransferState).toBe(undefined);
             return;
         }

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

@@ -1390,10 +1390,13 @@ describe('outboundModel', () => {
         const expectError = {
             type: 'quoteResponseError',
             data: {
-                errorInformation: {
-                    errorCode: '3205',
-                    errorDescription: 'Quote ID not found'
-                }
+                body: {
+                    errorInformation: {
+                        errorCode: '3205',
+                        errorDescription: 'Quote ID not found'
+                    }
+                },
+                headers: {}
             }
         };
 
@@ -1430,7 +1433,7 @@ describe('outboundModel', () => {
             expect(err.message.replace(/[ \n]/g,'')).toEqual(errMsg.replace(/[ \n]/g,''));
             expect(err.transferState).toBeTruthy();
             expect(err.transferState.lastError).toBeTruthy();
-            expect(err.transferState.lastError.mojaloopError).toEqual(expectError.data);
+            expect(err.transferState.lastError.mojaloopError).toEqual(expectError.data.body);
             expect(err.transferState.lastError.transferState).toBe(undefined);
             return;
         }

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

@@ -178,7 +178,10 @@ describe('PartiesModel', () => {
 
                         // check that this.context.data is updated
                         expect(model.context.data).toEqual({
-                            party: { ...message },
+                            party: {
+                                body: { ...message.body.party },
+                                headers: { ...message.headers }
+                            },
                             // current state will be updated by onAfterTransition which isn't called
                             // when manual invocation of transition handler happens
                             currentState: 'start'