From 306357c24d3014b55ae1cd25b954a695ea2e5cc6 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 22 Apr 2020 23:01:57 -0700 Subject: log failed password --- routes/balances.js | 29 +++++++++++++++++------------ routes/users.js | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/routes/balances.js b/routes/balances.js index 895cc1ff..eff361ea 100644 --- a/routes/balances.js +++ b/routes/balances.js @@ -23,20 +23,25 @@ app.get("/balances", async (req, res) => { liquid: parseInt(assets.bitcoin * SATS), lnchannel: parseInt((await lna.channelBalance({})).balance), lnwallet: parseInt((await lna.walletBalance({})).total_balance), - user: parseInt((await db["User"].findAll({ - attributes: [[sequelize.fn("sum", sequelize.col("balance")), "total"]], - raw: true, - order: sequelize.literal("total DESC") - }))[0].total) + user: parseInt( + (await db["User"].findAll({ + attributes: [[sequelize.fn("sum", sequelize.col("balance")), "total"]], + raw: true, + order: sequelize.literal("total DESC") + }))[0].total + ) }; const { bitcoin, liquid, lnchannel, user, lnwallet } = balances; - balances.ratio = ( - (parseInt(bitcoin) + - parseInt(liquid) + - parseInt(lnchannel) + - parseInt(lnwallet)) / - parseInt(user) - ).toFixed(2); + + balances.total = + parseInt(bitcoin) + + parseInt(liquid) + + parseInt(lnchannel) + + parseInt(lnwallet); + + balances.ratio = (balances.total / parseInt(user)).toFixed(2); + + res.send(balances); }); diff --git a/routes/users.js b/routes/users.js index 514c39f5..1d9a4f3d 100644 --- a/routes/users.js +++ b/routes/users.js @@ -212,7 +212,7 @@ app.post("/login", async (req, res) => { (user.password && !(await bcrypt.compare(req.body.password, user.password))) ) { - l.warn("invalid username or password attempt"); + l.warn("invalid username or password attempt", req.body.username, req.body.password); return res.status(401).end(); } -- cgit v1.2.3