From 79211b79a7aec6a0429e757be40e79f8a7a0a7c9 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 29 Apr 2020 14:12:16 -0700
Subject: get user before emitting

---
 routes/liquid/receive.js | 2 +-
 routes/users.js          | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js
index fd280eb9..e6425db0 100644
--- a/routes/liquid/receive.js
+++ b/routes/liquid/receive.js
@@ -159,7 +159,7 @@ setInterval(async () => {
     let user = await getUserById(p.user_id);
     emit(user.username, "user", user);
     emit(user.username, "payment", p);
-    l.info("liquid confirmed", user.username, p.asset, p.amount, p.tip);
+    l.info("liquid confirmed", user.username, p.account.asset, p.amount, p.tip);
 
     delete queue[hash];
   }
diff --git a/routes/users.js b/routes/users.js
index 9e2700b0..82f4264a 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -144,6 +144,7 @@ app.post("/disable2fa", auth, twofa, async (req, res) => {
   let { user } = req;
   user.twofa = false;
   await user.save();
+  user = await getUser(user.username);
   emit(user.username, "user", user);
   emit(user.username, "otpsecret", user.otpsecret);
   l.info("disabled 2fa", user.username);
@@ -163,6 +164,7 @@ app.post("/2fa", auth, async (req, res) => {
     if (isValid) {
       user.twofa = true;
       user.save();
+      user = await getUser(user.username);
       emit(user.username, "user", req.user);
     } else {
       return res.status(500).send("Invalid token");
@@ -364,6 +366,7 @@ app.post("/address", auth, async (req, res) => {
   user.address = await bc.getNewAddress("", req.body.type || "bech32");
   await user.save();
   addresses[user.address] = user.username;
+  user = await getUser(user.username);
   emit(user.username, "user", user);
   res.send(user.address);
 });
-- 
cgit v1.2.3