From 653b55dc1a209310ede70d7054e204f269462f55 Mon Sep 17 00:00:00 2001
From: Josh Harvey <josh@lamassu.is>
Date: Mon, 9 May 2016 23:02:01 +0300
Subject: [PATCH] bug fixes

---
 lib/postgresql_interface.js | 19 +++++++++++--------
 lib/routes.js               |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/postgresql_interface.js b/lib/postgresql_interface.js
index 1e442426..8177491e 100644
--- a/lib/postgresql_interface.js
+++ b/lib/postgresql_interface.js
@@ -728,15 +728,18 @@ exports.updateTxStatus = function updateTxStatus (tx, status, cb) {
 
 exports.updateRedeem = function updateRedeem (session, cb) {
   var sql = 'UPDATE transactions SET redeem=$1 ' +
-  'WHERE incoming=$1 AND device_fingerprint=$2 AND session_id=$3 ' +
-  'AND stage=$4 AND authority=$5'
+  'WHERE incoming=$2 AND device_fingerprint=$3 AND session_id=$4 ' +
+  'AND stage=$5 AND authority=$6'
 
-  connect(function (cerr, client, done) {
-    if (cerr) return cb(cerr)
-    var values = [true, true, session.fingerprint, session.id, 'initial_request', 'pending']
-    query(client, sql, values, function (err) {
-      done(err)
-      cb(err)
+  return new Promise((resolve, reject) => {
+    connect(function (cerr, client, done) {
+      if (cerr) return reject(cerr)
+      var values = [true, true, session.fingerprint, session.id, 'initial_request', 'pending']
+      query(client, sql, values, function (err) {
+        done(err)
+        if (err) return reject(err)
+        resolve()
+      })
     })
   })
 }
diff --git a/lib/routes.js b/lib/routes.js
index 52c918aa..4cc6aacd 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -244,7 +244,7 @@ function fetchPhoneTx (req, res) {
 
 function registerRedeem (req, res) {
   return plugins.registerRedeem(session(req))
-  .then(r => res.json())
+  .then(() => res.json({success: true}))
   .catch(err => {
     logger.error(err)
     res.send(500)