Skip to content

Added support for HTTPS proxies, fixed out of date dependencies to resolve security issues, Fixed failing unit tests #6

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

Closed
breeny wants to merge 2 commits into from
Closed

Added support for HTTPS proxies, fixed out of date dependencies to resolve security issues, Fixed failing unit tests #6

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
cf531f6
Added support for HTTPS proxies, fixed out of date dependencies to re…
breeny Feb 18, 2016
96885d4
Fix issue with non-proxy based Pin instances
breeny Mar 6, 2016
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
100 changes: 52 additions & 48 deletions lib/pin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var request = require('superagent');
require('superagent-proxy')(request);

var liveUrl = 'https://api.pin.net.au';
var testUrl = 'https://test-api.pin.net.au';
Expand All @@ -9,104 +10,107 @@ var Pin = function(options) {

var generateRequest = function(req, fields, callback) {
var field, field2;
if (process.env.https_proxy) {
req.proxy(process.env.https_proxy)
}
req.auth(options.key, '')
for(field in fields) {
if(typeof fields[field] === 'object') {
for(field2 in fields[field]) {
req.field(field+'['+field2+']', ''+fields[field][field2])
}
} else {
req.field(field, ''+fields[field])
for (field in fields) {
if (typeof fields[field] === 'object') {
for (field2 in fields[field]) {
req.field(field + '[' + field2 + ']', '' + fields[field][field2])
}
} else {
req.field(field, '' + fields[field])
}
}

req.end(function(err,res){
if(res && !res.ok){
req.end(function(err, res) {
if (res && !res.ok) {
err = new Error(res.body.error_description);
};
callback.call(this, err, res.body.response);
});
};


this.createCard = function (fields, callback) {
this.createCard = function(fields, callback) {
var req = request.post(options.url + '/1/cards');
generateRequest(req, fields, callback);
};


this.createCustomer = function (fields, callback) {
this.createCustomer = function(fields, callback) {
var req = request.post(options.url + '/1/customers');
generateRequest(req, fields, callback);
};

this.retrieveCustomer = function (token, callback) {
this.retrieveCustomer = function(token, callback) {
var req = request.get(options.url + '/1/customers/' + token);
generateRequest(req, {}, callback);
};

this.refundCharge = function (chargeId, fields, callback) {
this.refundCharge = function(chargeId, fields, callback) {

var req = request.post(options.url + '/1/charges/' + chargeId + '/refunds');
generateRequest(req, fields, callback);
};

this.retrieveCharge = function (chargeId, callback) {
this.retrieveCharge = function(chargeId, callback) {

var req = request.get(options.url + '/1/charges/' + chargeId);
generateRequest(req, {}, callback);
};

this.createCharge = function (fields, callback) {
this.createCharge = function(fields, callback) {
var req = request.post(options.url + '/1/charges');
generateRequest(req, fields, callback);
};

//Recipients

this.createRecipient = function(fields,callback){
this.createRecipient = function(fields, callback) {
var req = request.post(options.url + '/1/recipients');
generateRequest(req,fields,callback);
generateRequest(req, fields, callback);
}

this.getRecipientsList = function(callback){
var req = request.get(options.url +'/1/recipients');
generateRequest(req,{},callback);
this.getRecipientsList = function(callback) {
var req = request.get(options.url + '/1/recipients');
generateRequest(req, {}, callback);
}

this.getRecipientData = function(token,callback){
this.getRecipientData = function(token, callback) {
var req = request.get(options.url + '/1/recipients/' + token);
generateRequest(req,{},callback);
generateRequest(req, {}, callback);
}

this.updateRecipientData = function(token,fields,callback){
this.updateRecipientData = function(token, fields, callback) {
var req = request.put(options.url + '/1/recipients/' + token);
generateRequest(req,fields,callback);
}

this.getRecipientTransfers = function(token,callback){
var req = request.get(options.url +'/1/recipients/' + token +'/transfers');
generateRequest(req,{},callback);
}
this.createTransfer = function(fields,callback){
var req = request.post(options.url+'/1/transfers');
generateRequest(req,fields,callback);
},
this.getTransfersList = function(callback){
var req = request.get(options.url + '/1/transfers')
generateRequest(req,{},callback);
generateRequest(req, fields, callback);
}

this.getTransferDetails = function(transferToken, callback){
var req = request.get(options.url + '/1/transfers/' + transferToken);
generateRequest(req,{},callback);
},

this.getTransferLineItems = function(transferToken, callback){
var req = request.get(options.url + '/1/transfers/' + transferToken+'/line_items');
generateRequest(req,{},callback);
this.getRecipientTransfers = function(token, callback) {
var req = request.get(options.url + '/1/recipients/' + token + '/transfers');
generateRequest(req, {}, callback);
}
//Transfers
this.createTransfer = function(fields, callback) {
var req = request.post(options.url + '/1/transfers');
generateRequest(req, fields, callback);
},
this.getTransfersList = function(callback) {
var req = request.get(options.url + '/1/transfers')
generateRequest(req, {}, callback);
}

this.getTransferDetails = function(transferToken, callback) {
var req = request.get(options.url + '/1/transfers/' + transferToken);
generateRequest(req, {}, callback);
},

this.getTransferLineItems = function(transferToken, callback) {
var req = request.get(options.url + '/1/transfers/' + transferToken + '/line_items');
generateRequest(req, {}, callback);
}
//Transfers

// this.createTransfer = function(fields){

Expand All @@ -115,9 +119,9 @@ var Pin = function(options) {

};

var setup = function (options) {
var setup = function(options) {
options.url = liveUrl;
if(!options.production) {
if (!options.production) {
options.url = testUrl;
}
var pin = new Pin(options);
Expand Down
7 changes: 5 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@
"main": "./lib/pin",
"version": "1.0.1",
"dependencies": {
"superagent": "~0.9.4"
"superagent": "~1.7.2",
"superagent-proxy": "^1.0.0"
},
"devDependencies": {
"chai": "^3.5.0",
"chai-things": "^0.2.0",
"mocha": "~1.5.0",
"underscore" : "~1.7.0"
"underscore": "~1.7.0"
},
"keywords": [
"payment",
Expand Down
Loading