Merge pull request #8 from isocolsky/status

get status
This commit is contained in:
Matias Alejo Garcia 2015-02-13 16:08:13 -03:00
commit 8df3b18848
1 changed files with 29 additions and 5 deletions

34
app.js
View File

@ -59,7 +59,7 @@ function returnError(err, res, req) {
} }
var m = message || err.toString(); var m = message || err.toString();
console.log('[app.js.60]'); //TODO console.log('[app.js.60]'); //TODO
log.error('Error: ' + req.url + ' :' + code + ':' + m); log.error('Error: ' + req.url + ' :' + code + ':' + m);
res.status(code || 500).json({ res.status(code || 500).json({
error: m, error: m,
@ -113,9 +113,33 @@ router.post('/v1/wallets/:id/copayers/', function(req, res) {
router.get('/v1/wallets/', function(req, res) { router.get('/v1/wallets/', function(req, res) {
getServerWithAuth(req, res, function(server) { getServerWithAuth(req, res, function(server) {
server.getWallet({}, function(err, wallet) { var result = {};
if (err) returnError(err, res, req); async.parallel([
res.json(wallet);
function(next) {
server.getWallet({}, function(err, wallet) {
if (err) return next(err);
result.wallet = wallet;
next();
});
},
function(next) {
server.getBalance({}, function(err, balance) {
if (err) return next(err);
result.balance = balance;
next();
});
},
function(next) {
server.getPendingTxs({}, function(err, pendingTxps) {
if (err) return next(err);
result.pendingTxps = pendingTxps;
next();
});
},
], function(err) {
if (err) return returnError(err, res, req);
res.json(result);
}); });
}); });
}); });
@ -151,7 +175,7 @@ router.get('/v1/addresses/', function(req, res) {
router.get('/v1/balance/', function(req, res) { router.get('/v1/balance/', function(req, res) {
getServerWithAuth(req, res, function(server) { getServerWithAuth(req, res, function(server) {
server.getBalance({}, function(err, balance) { server.getBalance({}, function(err, balance) {
if (err) return returnError(err, res,req); if (err) return returnError(err, res, req);
res.json(balance); res.json(balance);
}); });
}); });