internal payments

5 files changed, 41 insertions, 142 deletions

diff --git a/routes/invoices.js b/routes/invoices.js
index f7ab78cf..10a80b90 100644
--- a/routes/invoices.js
+++ b/routes/invoices.js
@@ -9,7 +9,6 @@ import ln from "$lib/ln";
 app.get("/invoice", async ({ query: { id } }, res) => {
   let invoice = await g(`invoice:${id}`);
   invoice.user = await g(`user:${invoice.user_id}`);
-  console.log("INV", invoice)
   res.send(invoice);
 });
 
@@ -48,7 +47,8 @@ app.post(
       rate,
       tip,
       user_id,
-      text
+      text,
+      received: 0
     };
 
     l(
diff --git a/routes/lightning/receive.js b/routes/lightning/receive.js
index a37dc716..ffb0ad95 100644
--- a/routes/lightning/receive.js
+++ b/routes/lightning/receive.js
@@ -1,3 +1,4 @@
+import { v4 } from "uuid";
 import store from "$lib/store";
 import { emit } from "$lib/sockets";
 import config from "$config";
@@ -35,7 +36,9 @@ let handle = async () => {
     let amount = parseInt(received) - tip;
     if (amount < 0) throw new Error("amount out of range");
 
+    let id = v4();
     let payment = {
+      id,
       user_id,
       hash,
       memo,
@@ -44,7 +47,8 @@ let handle = async () => {
       secret,
       rate,
       tip,
-      invoice_id: invoice.id
+      invoice_id: invoice.id,
+      created_at: Date.now()
     };
 
     total = amount + tip;
@@ -64,6 +68,10 @@ let handle = async () => {
     await t();
 
     payment.invoice = invoice;
+
+    await s(`payment:${id}`, payment);
+    await rd.lPush(`${user.id}:payments`, id);
+
     callWebhook(invoice, payment);
 
     emit(user.username, "payment", payment);
diff --git a/routes/payments.js b/routes/payments.js
index 7b094ccc..b328e763 100644
--- a/routes/payments.js
+++ b/routes/payments.js
@@ -1,6 +1,7 @@
 import app from "$app";
 import config from "$config";
 import store from "$lib/store";
+import { g, rd } from "$lib/redis";
 
 import { auth, adminAuth, optionalAuth } from "$lib/passport";
 import fs from "fs";
@@ -22,7 +23,7 @@ app.post("/lightning/send", auth, lnRoutes.send);
 app.get(
   "/payments",
   auth,
-  async ({ uuid, query: { start, end, limit, offset } }, res) => {
+  async ({ user: { id }, query: { start, end, limit, offset } }, res) => {
     if (limit) limit = parseInt(limit);
     if (offset) offset = parseInt(offset);
 
@@ -30,8 +31,10 @@ app.get(
     // if (start) where.createdAt[Op.gte] = new Date(parseInt(start));
     // if (end) where.createdAt[Op.lte] = new Date(parseInt(end));
 
-    let payments = await redis.get(`${uuid}:payments`);
-    res.send({ payments, total });
+    let payments = (await rd.lRange(`${id}:payments`, 0, -1)) || [];
+    payments = await Promise.all(payments.map(id => g(`payment:${id}`)));
+    payments = payments.filter(p => p);
+    res.send({ payments, total: payments.length });
   }
 );
 
diff --git a/routes/send.js b/routes/send.js
index 591b5ab7..3f71a496 100644
--- a/routes/send.js
+++ b/routes/send.js
@@ -8,6 +8,7 @@ export default async (req, res, next) => {
     let payment = await sendInternal(req.body, req.user);
     res.send(payment);
   } catch (e) {
+    console.log(e)
     err("problem sending internal payment", e.message);
     return res.code(500).send(e.message);
   }
diff --git a/routes/users.js b/routes/users.js
index 97ff9dd4..c0324803 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -84,72 +84,53 @@ app.post("/register", async (req, res) => {
   }
 });
 
-app.post("/disable2fa", auth, async (req, res) => {
-  try {
-    let {
-      user,
-      body: { token }
-    } = req;
-
-    if (user.twofa && !authenticator.check(token, user.otpsecret)) {
-      return res.code(401).send("2fa required");
-    }
-
-    user.twofa = false;
-    await user.save();
-    emit(user.username, "user", user);
-    emit(user.username, "otpsecret", user.otpsecret);
-    l("disabled 2fa", user.username);
-    res.send({});
-  } catch (e) {
-    res.code(500).send("Problem disabling 2fa");
+app.post("/disable2fa", auth, async ({ user, body: { token } }, res) => {
+  let { id, twofa, username, otpsecret } = user;
+  if (twofa && !authenticator.check(token, otpsecret)) {
+    return res.code(401).send("2fa required");
   }
+
+  user.twofa = false;
+  await s(`user:${id}`, user);
+  emit(username, "user", user);
+  emit(username, "otpsecret", user.otpsecret);
+  l("disabled 2fa", username);
+  res.send({});
 });
 
-app.post("/2fa", auth, async (req, res) => {
-  let { user } = req;
-  try {
-    const isValid = authenticator.check(req.body.token, req.user.otpsecret);
-    if (isValid) {
-      user.twofa = true;
-      user.save();
-      emit(user.username, "user", req.user);
-    } else {
-      return res.code(500).send("Invalid token");
-    }
-  } catch (e) {
-    err("error setting up 2fa", e);
+app.post("/2fa", auth, async ({ user, body: { token } }, res) => {
+  let { id, otpsecret, username } = user;
+  const isValid = authenticator.check(token, otpsecret);
+  if (isValid) {
+    user.twofa = true;
+    await s(`user:${id}`, user);
+    emit(username, "user", user);
+  } else {
+    return res.code(500).send("Invalid token");
   }
 
-  l("enabled 2fa", user.username);
+  l("enabled 2fa", username);
   res.send({});
 });
 
-app.post("/user", auth, async (req, res) => {
+app.post("/user", auth, async ({ user, body: { confirm, password, pin, newpin, username }}, res) => {
   try {
     let { user } = req;
 
     l("updating user", user.username);
 
-    let { confirm, password, pin, newpin, username } = req.body;
-
     if (user.pin && !(pin === user.pin)) throw new Error("Pin required");
     if (typeof newpin !== "undefined") user.pin = newpin;
     if (!user.pin) user.pin = null;
 
     let exists;
-
-    if (username)
-      exists = await db.User.findOne({
-        where: { username }
-      });
+    if (username) exists = await g(`user:${username}`);
 
     let token;
     if (user.username !== username && exists) {
       err("username taken", username, user.username, exists.username);
       throw new Error("Username taken");
     } else if (username) {
-      store.sockets[username] = store.sockets[user.username];
       if (user.username !== username)
         l("changing username", user.username, username);
       user.username = username;
@@ -195,99 +176,6 @@ app.post("/user", auth, async (req, res) => {
   }
 });
 
-app.post("/keys", auth, async (req, res) => {
-  const { key: hex } = req.body;
-  const key = await db.Key.create({
-    user_id: req.user.id,
-    hex
-  });
-  emit(req.user.username, "key", key);
-  res.send(key);
-});
-
-app.post("/keys/delete", auth, async (req, res) => {
-  const { hex } = req.body;
-  (
-    await db.Key.findOne({
-      where: {
-        user_id: req.user.id,
-        hex
-      }
-    })
-  ).destroy();
-});
-
-app.post("/updateSeeds", auth, async (req, res) => {
-  let { user } = req;
-  let { seeds } = req.body;
-  let keys = Object.keys(seeds);
-
-  for (let i = 0; i < keys.length; i++) {
-    let id = keys[i];
-    let seed = seeds[id];
-    await db.Account.update(
-      { seed },
-      {
-        where: { id, user_id: user.id }
-      }
-    );
-
-    const account = await db.Account.findOne({
-      where: { id }
-    });
-
-    emit(user.username, "account", account);
-  }
-
-  res.send({});
-});
-
-app.post("/accounts/delete", auth, async (req, res) => {
-  const { id } = req.body;
-  const account = await db.Account.findOne({ where: { id } });
-  if (account) await account.destroy();
-  res.send({});
-});
-
-app.post("/accounts", auth, async (req, res) => {
-  const {
-    name,
-    seed,
-    pubkey,
-    ticker,
-    precision,
-    path,
-    privkey,
-    network
-  } = req.body;
-  const { user } = req;
-
-  let account = await db.Account.create({
-    user_id: user.id,
-    asset: config.liquid.btcasset,
-    balance: 0,
-    pending: 0,
-    name,
-    ticker,
-    precision,
-    pubkey,
-    privkey,
-    seed,
-    path,
-    network
-  });
-
-  emit(user.username, "account", account);
-
-  if (pubkey) user.index++;
-  user.account_id = account.id;
-  await user.save();
-  user.account = account;
-  emit(user.username, "user", user);
-
-  res.send(account);
-});
-
 let login = async (req, res) => {
   try {
     const { params, sig, key, password, username, token: twofa } = req.body;
@@ -337,7 +225,6 @@ let login = async (req, res) => {
     let token = jwt.sign(payload, config.jwt);
     res.cookie("token", token, { expires: new Date(Date.now() + 432000000) });
     user = pick(user, whitelist);
-    console.log("SENDING", user, token)
     res.send({ user, token });
   } catch (e) {
     console.log(e);