Skip to content

Allow for https connections #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timw4mail wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow for https connections #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee8f5c5
Allow xmlrpc module to have secure connections
Mar 6, 2015
b089769
Increment version
Mar 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento",
"author": "Tim Marshall <[email protected]>",
"description": "Magento SOAP API wrapper for Node.js",
"version": "0.0.5",
"version": "0.0.6",
"main": "./src/magento",
"contributors": [
{
Expand Down
20 changes: 19 additions & 1 deletion src/magento.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ var resources = {
store: './resources/store.js'
};
var mandatory = {};
var isSecure = false;
var configDefaults = {
host: mandatory,
port: 80,
Expand Down Expand Up @@ -76,8 +77,25 @@ function Magento(config) {
}
}

// Handle secure authentication
// Port 443, or isSecure: true in the
// options should make secure requests
if (magentoConfig.isSecure !== undefined) {
isSecure = magentoConfig.isSecure;
delete magentoConfig.isSecure;
}
if (magentoConfig.port !== undefined) {
if (isSecure && magentoConfig.port == 80) {
magentoConfig.port == 443;
} else if (!isSecure && magentoConfig.port == 443) {
isSecure = true;
}
}

this.config = magentoConfig;
this.client = xmlrpc.createClient(this.config);
this.client = (isSecure)
? xmlrpc.createSecureClient(this.config)
: xmlrpc.createClient(this.config);
this.queue = [];
this.queue.running = 0;
this.queue.parallelLimit = this.config.parallelLimit;
Expand Down