From 720c020c86d885ac7bc3bc85898f192ff4711e59 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 8 Oct 2019 08:24:21 -0700 Subject: fix pay user function --- payUser.js | 62 ++++++++++++++++++++++++++++++------------------------------- payments.js | 2 +- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/payUser.js b/payUser.js index 98cc1ac8..cb2681a4 100644 --- a/payUser.js +++ b/payUser.js @@ -1,38 +1,36 @@ -module.exports = db => async (req, res) => { - let { payuser, amount } = req.body; +module.exports = (app, db, lnb) => async (req, res) => { + let { payuser, amount } = req.body; - let user = await db.User.findOne({ - where: { - username: payuser - } - }); - - if (!user) { - return res - .status(500) - .send("Couldn't find the user you're trying to pay"); + let user = await db.User.findOne({ + where: { + username: payuser } - let err = m => res.status(500).send(m); + }); - let invoice; - try { - invoice = await lnb.addInvoice({ value: amount }); - } catch (e) { - return err(e.message); - } + if (!user) { + return res.status(500).send("Couldn't find the user you're trying to pay"); + } + let err = m => res.status(500).send(m); - let hash = invoice.payment_request; + let invoice; + try { + invoice = await lnb.addInvoice({ value: amount }); + } catch (e) { + return err(e.message); + } - await db.Payment.create({ - user_id: user.id, - hash, - amount, - currency: "CAD", - rate: app.get("rates").ask, - tip: 0 - }); + let hash = invoice.payment_request; - req.url = "/sendPayment"; - req.body.payreq = invoice.payment_request; - return app._router.handle(req, res); - } + await db.Payment.create({ + user_id: user.id, + hash, + amount, + currency: "CAD", + rate: app.get("rates").ask, + tip: 0 + }); + + req.url = "/sendPayment"; + req.body.payreq = invoice.payment_request; + return app._router.handle(req, res); +}; diff --git a/payments.js b/payments.js index d2e89b44..519cd1b4 100644 --- a/payments.js +++ b/payments.js @@ -13,7 +13,7 @@ module.exports = async (app, auth, addresses, bc, db, emit, seen, payments) => { auth, require("./sendPayment")(app, db, emit, seen, lna, lnb) ); - app.post("/payUser", auth, require("./payUser")(db, lnb)); + app.post("/payUser", auth, require("./payUser")(app, db, lnb)); app.post("/sendCoins", auth, require("./sendCoins")(app, bc, db, emit)); app.post("/addInvoice", auth, require("./addInvoice")(app, db, lnb)); }; -- cgit v1.2.3