From 190efd4d7022cebc943f0763474795d0a6a22d44 Mon Sep 17 00:00:00 2001 From: Josh Harvey Date: Sat, 14 May 2016 02:12:30 +0300 Subject: [PATCH] WIP -- fix back compat with raqia --- lib/postgresql_interface.js | 6 ++++-- lib/routes.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/postgresql_interface.js b/lib/postgresql_interface.js index d80be7b9..5a00bdcb 100644 --- a/lib/postgresql_interface.js +++ b/lib/postgresql_interface.js @@ -489,12 +489,14 @@ function insertDispense (client, session, tx, cartridges, transactionId, cb) { exports.addIncomingPhone = function addIncomingPhone (session, tx, notified, cb) { var sql = 'UPDATE transactions SET phone=$1, notified=$2 ' + - 'WHERE incoming=$3 AND device_fingerprint=$4 AND session_id=$5 AND phone IS NULL' + 'WHERE incoming=$3 AND device_fingerprint=$4 AND session_id=$5 ' + + 'AND stage=$6 AND authority=$7 AND phone IS NULL' return new Promise((resolve, reject) => { connect(function (cerr, client, done) { if (cerr) return reject(cerr) - var values = [tx.phone, notified, true, session.fingerprint, tx.sessionId] + var values = [tx.phone, notified, true, session.fingerprint, + tx.sessionId, 'initial_request', 'pending'] query(client, sql, values, function (err, results) { done(err) if (err) return reject(err) diff --git a/lib/routes.js b/lib/routes.js index 5f752613..d211d3e8 100644 --- a/lib/routes.js +++ b/lib/routes.js @@ -240,7 +240,7 @@ function phoneCode (req, res) { function updatePhone (req, res) { const notified = req.query.notified === 'true' return plugins.updatePhone(session(req), req.body, notified) - .then(res => res.json(res)) + .then(r => res.json(r)) .catch(err => { logger.error(err) res.sendStatus(500)