From 588deae0b318a17988bdece3e11cfc77b3ce2eff Mon Sep 17 00:00:00 2001 From: Stephen Keep Date: Mon, 13 Apr 2015 15:57:28 +0100 Subject: [PATCH 1/5] Update magento.js Add switch to load secure connection --- src/magento.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/magento.js b/src/magento.js index 1d3938b..cdcaee2 100644 --- a/src/magento.js +++ b/src/magento.js @@ -77,7 +77,13 @@ function Magento(config) { } this.config = magentoConfig; - this.client = xmlrpc.createClient(this.config); + + if (this.config.secure === true) { + this.client = xmlrpc.createSecureClient(this.config); + } else { + this.client = xmlrpc.createClient(this.config); + } + this.queue = []; this.queue.running = 0; this.queue.parallelLimit = this.config.parallelLimit; From 41af37afeee0bc2b5c49e506a4cd6c9b660ca1e6 Mon Sep 17 00:00:00 2001 From: Stephen Keep Date: Mon, 13 Apr 2015 15:57:52 +0100 Subject: [PATCH 2/5] Update magento.js --- src/magento.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/magento.js b/src/magento.js index cdcaee2..6c3ba08 100644 --- a/src/magento.js +++ b/src/magento.js @@ -48,7 +48,8 @@ var configDefaults = { path: mandatory, login: mandatory, pass: mandatory, - parallelLimit: Infinity + parallelLimit: Infinity, + secure: false }; /** From 2f5ea69d96cb03705aeb0b6a19a5d92afc5118bc Mon Sep 17 00:00:00 2001 From: Stephen Keep Date: Wed, 15 Apr 2015 13:12:30 +0100 Subject: [PATCH 3/5] Update package.json --- package.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index f4ebf39..4da27ee 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,14 @@ { "name": "magento", - "author": "Tim Marshall ", + "author": "Stephen Keep ", "description": "Magento SOAP API wrapper for Node.js", - "version": "0.0.5", + "version": "0.0.6", "main": "./src/magento", "contributors": [ + { + "name": "Stephen Keep", + "email": "stephenkeep@gmail.com" + }, { "name": "Tim Marshall", "email": "timothyjmarshall@gmail.com" @@ -23,6 +27,6 @@ "api", "xml" ], - "repository": "git://github.com/MadisonReed/magentoapi", + "repository": "git://github.com/stephenkeep/magentoapi", "license": "MIT" } From 65d6cd2802d3ca28eed8d26def9b370f869a2634 Mon Sep 17 00:00:00 2001 From: Stephen Keep Date: Wed, 15 Apr 2015 13:27:02 +0100 Subject: [PATCH 4/5] Update package.json --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 4da27ee..023f1f0 100644 --- a/package.json +++ b/package.json @@ -17,10 +17,7 @@ "engines": { "node": ">=0.10.20" }, - "dependencies" : { - "request": "2.34.0", - "xmlrpc": "1.2.0" - }, + "dependencies" : {}, "keywords": [ "magento", "soap", From 59f41d1eff361a1cadf04a52c720285c73453186 Mon Sep 17 00:00:00 2001 From: Stephen Keep Date: Wed, 15 Apr 2015 13:31:04 +0100 Subject: [PATCH 5/5] Update package.json --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 023f1f0..1625519 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,10 @@ "engines": { "node": ">=0.10.20" }, - "dependencies" : {}, + "dependencies" : { +- "request": "2.34.0", +- "xmlrpc": "1.2.0" +- }, "keywords": [ "magento", "soap",