bump version

* Add Z53 order type
* Create utils container and move dateRange functionality to there

.eslintrc

@@ -1,7 +1,8 @@
 {
 	"extends": "airbnb-base",
 	"env": {
-		"node": true
+		"node": true,
+		"mocha": true
 	},
 	"parserOptions": {
 		"ecmaVersion": 8,

lib/BankLetter.js

@@ -63,9 +63,9 @@ module.exports = class BankLetter {
 
 		try {
 			fs.writeFileSync(path, letter);
-			console.log('Data written to file');
+			console.log(`Data written to file on path '${path}'`);
 		} catch (error) {
-			console.log(error);
+			console.error(`error while writing bank letter to path '${path}' with error ${error}`);
 			throw error;
 		}
 		return new Promise(resolve => resolve(true));

lib/Client.js

@@ -42,7 +42,7 @@ module.exports = class Client {
 			throw new Error('passphrase is requierd');
 
 		if (!keyStorage || typeof keyStorage.read !== 'function' || typeof keyStorage.write !== 'function')
-			throw new Error('keyStorage implemntation missing or wrong');
+			throw new Error('keyStorage implementation missing or wrong');
 
 		this.url = url;
 		this.partnerId = partnerId;

lib/consts.js

@@ -2,7 +2,7 @@
 
 const packageJson = require('../package.json');
 
-const name = 'eCollect Node Ebics Client';
+const name = 'Node Ebics Client';
 const { version } = packageJson;
 const orderOperations = {
 	ini: 'INI',

lib/orders/H004/response.js

@@ -124,8 +124,8 @@ module.exports = (xml, keys) => ({
 
 		for (let i = 0; i < keyNodes.length; i++) {
 			const type = lastChild(keyNodes[i].parentNode).textContent;
-			const modulus = xpath.select("//*[local-name(.)='Modulus']", keyNodes[i])[0].textContent;
+			const modulus = xpath.select(".//*[local-name(.)='Modulus']", keyNodes[i])[0].textContent;
-			const exponent = xpath.select("//*[local-name(.)='Exponent']", keyNodes[i])[0].textContent;
+			const exponent = xpath.select(".//*[local-name(.)='Exponent']", keyNodes[i])[0].textContent;
 
 			const mod = new BN(Buffer.from(modulus, 'base64'), 2).toBuffer();
 			const exp = new BN(Buffer.from(exponent, 'base64')).toNumber();

lib/predefinedOrders/HAC.js

@@ -1,23 +1,13 @@
 'use strict';
 
-const dateRange = (start, end) => {
+const utils = require('../utils');
-	if (start && end)
-		return {
-			DateRange: {
-				Start: start,
-				End: end,
-			},
-		};
-
-	return {};
-};
 
 module.exports = (start = null, end = null) => ({
 	version: 'h004',
 	orderDetails: {
 		OrderType: 'HAC',
 		OrderAttribute: 'DZHNN',
-		StandardOrderParams: dateRange(start, end),
+		StandardOrderParams: utils.dateRange(start, end),
 	},
 	operation: 'download',
 });

lib/predefinedOrders/PTK.js

@@ -1,23 +1,13 @@
 'use strict';
 
-const dateRange = (start, end) => {
+const utils = require('../utils');
-	if (start && end)
-		return {
-			DateRange: {
-				Start: start,
-				End: end,
-			},
-		};
-
-	return {};
-};
 
 module.exports = (start = null, end = null) => ({
 	version: 'h004',
 	orderDetails: {
 		OrderType: 'PTK',
 		OrderAttribute: 'DZHNN',
-		StandardOrderParams: dateRange(start, end),
+		StandardOrderParams: utils.dateRange(start, end),
 	},
 	operation: 'download',
 });

lib/predefinedOrders/STA.js

@@ -1,23 +1,13 @@
 'use strict';
 
-const dateRange = (start, end) => {
+const utils = require('../utils');
-	if (start && end)
-		return {
-			DateRange: {
-				Start: start,
-				End: end,
-			},
-		};
-
-	return {};
-};
 
 module.exports = (start = null, end = null) => ({
 	version: 'h004',
 	orderDetails: {
 		OrderType: 'STA',
 		OrderAttribute: 'DZHNN',
-		StandardOrderParams: dateRange(start, end),
+		StandardOrderParams: utils.dateRange(start, end),
 	},
 	operation: 'download',
 });

lib/predefinedOrders/VMK.js

@@ -1,23 +1,13 @@
 'use strict';
 
-const dateRange = (start, end) => {
+const utils = require('../utils');
-	if (start && end)
-		return {
-			DateRange: {
-				Start: start,
-				End: end,
-			},
-		};
-
-	return {};
-};
 
 module.exports = (start = null, end = null) => ({
 	version: 'h004',
 	orderDetails: {
 		OrderType: 'VMK',
 		OrderAttribute: 'DZHNN',
-		StandardOrderParams: dateRange(start, end),
+		StandardOrderParams: utils.dateRange(start, end),
 	},
 	operation: 'download',
 });

lib/predefinedOrders/XCT.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = document => ({
+	version: 'h004',
+	orderDetails: { OrderType: 'XCT', OrderAttribute: 'OZHNN', StandardOrderParams: {} },
+	operation: 'upload',
+	document,
+});

lib/predefinedOrders/Z53.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const utils = require('../utils');
+
+module.exports = (start = null, end = null) => ({
+	version: 'h004',
+	orderDetails: {
+		OrderType: 'Z53',
+		OrderAttribute: 'DZHNN',
+		StandardOrderParams: utils.dateRange(start, end),
+	},
+	operation: 'download',
+});

lib/predefinedOrders/index.js

@@ -12,6 +12,7 @@ const CDS = require('./CDS');
 const CCT = require('./CCT');
 const CCS = require('./CCS');
 const XE3 = require('./XE3');
+const XCT = require('./XCT');
 
 const STA = require('./STA');
 const VMK = require('./VMK');
@@ -21,11 +22,13 @@ const HPD = require('./HPD');
 const HKD = require('./HKD');
 const PTK = require('./PTK');
 const HAC = require('./HAC');
+const Z53 = require('./Z53');
 
 module.exports = {
 	INI,
 	HIA,
 	HPB,
+	Z53,
 
 	AZV,
 	CD1,
@@ -35,7 +38,7 @@ module.exports = {
 	CCT,
 	CCS,
 	XE3,
-
+	XCT,
 	STA,
 	VMK,
 	HAA,

lib/utils.js

@@ -0,0 +1,18 @@
+'use strict';
+
+const dateRange = (start, end) => {
+	if (start && end)
+		return {
+			DateRange: {
+				Start: start,
+				End: end,
+			},
+		};
+
+	return {};
+};
+
+
+module.exports = {
+	dateRange,
+};

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ebics-client",
-	"version": "0.0.4",
+	"version": "0.0.7",
 	"description": "Node.js ISO 20022 Compliant EBICS Client",
 	"main": "index.js",
 	"scripts": {
@@ -17,6 +17,12 @@
 		"api"
 	],
 	"author": "eCollect Sofia Tech Team",
+	"contributors": [
+		{
+			"name": "Vasyl Stashuk",
+			"url": "https://github.com/vasyas"
+		}
+	],
 	"license": "MIT",
 	"dependencies": {
 		"bn.js": "^4.11.8",
@@ -31,8 +37,10 @@
 		"xpath": "0.0.27"
 	},
 	"devDependencies": {
+		"chai": "^4.2.0",
 		"eslint": "^4.19.1",
 		"eslint-config-airbnb-base": "^12.1.0",
-		"eslint-plugin-import": "^2.12.0"
+		"eslint-plugin-import": "^2.12.0",
+		"mocha": "^6.1.4"
 	}
 }

test/responseParser.js

@@ -0,0 +1,43 @@
+'use strict';
+
+const { assert } = require('chai');
+const H004Response = require('../lib/orders/H004/response');
+
+describe('H004 response parsing', () => {
+	it('parses bank keys', () => {
+		const response = H004Response('<xml/>', {});
+
+		const x002mod = 'ntbX6WFjAJP5RyH4ogDG/26wZGzEJXsTudyvcgXmUdk1AExCNqArXDiSlGXpVNq4BKddUMFUmVOyvkdNckPRV2mk3uHNCE5T3tFKQI3FlwHSJHvPSpb9gtHnsK03jByMigWjhTKvsjIdfLVay5m5Bctxq9+5JMHwlNk7MlVXBQcqaFiHFFS1lPfA3Wk1bptPeeGyYcP0+U798oQWnCABKwS8hmYcp5xBtozGoRj9L/NDE68pdP8o/wTKNwT4Jo5nQKYfDsgO4R+z9vVv37Htp6bWhK8Jw3tpkcd3JnkYWx+Ylg0XBpg8LfjFhY2Jc7FqLlx0Bn0Y3PRLI1apxgC85w==';
+		const e002mod = '4eOGrzcJHVzbEgZTmyPYUIq9kFoua8Ure1Mvyq6XlawFgCWskfu/xSKNLIMJ7H675wl/5y0Oy16P/b6pJEhWrzOw8omW46PBDTaXw9BDYBTuBblluz1yUnzpgfblP8gkRmxAo+QMIskmwdSzuZMiJcLNSzu/bkmLHK2RdrVYMAZLlB6QXTykdenPZtNmc2z4VU6TRmGljAwg2VUNF6iQoucbzDUuca+yUo3fiXZp69nfXv81X2ND+p1ir6zQpx7tbOdfauw0sEKI/Z/lC+E4fMrMlh/ZvOxSYUMA55J4liC3aUV3mTR3dPJHWu1aD1a7EfJnNw0eHLwlB+36qfgGuw==';
+
+		response.orderData = () => `<?xml version="1.0" encoding="UTF-8"?>
+			<HPBResponseOrderData xmlns="urn:org:ebics:H004" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+			  <AuthenticationPubKeyInfo>
+				<PubKeyValue>
+				  <ds:RSAKeyValue>
+					<ds:Modulus>${x002mod}</ds:Modulus>
+					<ds:Exponent>AQAB</ds:Exponent>
+				  </ds:RSAKeyValue>
+				  <TimeStamp>2015-02-25T08:01:13.061Z</TimeStamp>
+				</PubKeyValue>
+				<AuthenticationVersion>X002</AuthenticationVersion>
+			  </AuthenticationPubKeyInfo>
+			  <EncryptionPubKeyInfo>
+				<PubKeyValue>  
+				  <ds:RSAKeyValue>
+					<ds:Modulus>${e002mod}</ds:Modulus>
+					<ds:Exponent>AQAB</ds:Exponent>
+				  </ds:RSAKeyValue>
+				  <TimeStamp>2015-02-25T08:01:12.344Z</TimeStamp>
+				</PubKeyValue>
+				<EncryptionVersion>E002</EncryptionVersion>
+			  </EncryptionPubKeyInfo>
+			  <HostID>SBKPR01</HostID>
+			</HPBResponseOrderData>`;
+
+		const bankKeys = response.bankKeys();
+
+		assert.equal(bankKeys.bankX002.mod.toString('base64'), x002mod);
+		assert.equal(bankKeys.bankE002.mod.toString('base64'), e002mod);
+	});
+});