lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug fixes

Browse source
This commit is contained in:
Josh Harvey 2016-05-09 23:02:01 +03:00
parent 014033b73e
commit 653b55dc1a
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/postgresql_interface.js
View file

@ -728,15 +728,18 @@ exports.updateTxStatus = function updateTxStatus (tx, status, cb) {
exports.updateRedeem = function updateRedeem (session, cb) { exports.updateRedeem = function updateRedeem (session, cb) {
var sql = 'UPDATE transactions SET redeem=$1 ' + var sql = 'UPDATE transactions SET redeem=$1 ' +
'WHERE incoming=$1 AND device_fingerprint=$2 AND session_id=$3 ' + 'WHERE incoming=$2 AND device_fingerprint=$3 AND session_id=$4 ' +
'AND stage=$4 AND authority=$5' 'AND stage=$5 AND authority=$6'
connect(function (cerr, client, done) { return new Promise((resolve, reject) => {
if (cerr) return cb(cerr) connect(function (cerr, client, done) {
var values = [true, true, session.fingerprint, session.id, 'initial_request', 'pending'] if (cerr) return reject(cerr)
query(client, sql, values, function (err) { var values = [true, true, session.fingerprint, session.id, 'initial_request', 'pending']
done(err) query(client, sql, values, function (err) {
cb(err) done(err)
if (err) return reject(err)
resolve()
})
}) })
}) })
} }

2
lib/routes.js
View file

@ -244,7 +244,7 @@ function fetchPhoneTx (req, res) {
function registerRedeem (req, res) { function registerRedeem (req, res) {
return plugins.registerRedeem(session(req)) return plugins.registerRedeem(session(req))
.then(r => res.json()) .then(() => res.json({success: true}))
.catch(err => { .catch(err => {
logger.error(err) logger.error(err)
res.send(500) res.send(500)