improved assets support

4 files changed, 68 insertions, 27 deletions

diff --git a/lib/passport.js b/lib/passport.js
index 81f4e948..e0c2dd62 100644
--- a/lib/passport.js
+++ b/lib/passport.js
@@ -1,6 +1,5 @@
 const Passport = require("passport");
 const jwt = require("passport-jwt");
-const { getUser } = require("./utils");
 
 function cookieExtractor(req) {
   if (req && req.cookies) return req.cookies["token"];
diff --git a/lib/sockets.js b/lib/sockets.js
index ad7295b0..9a5457c3 100644
--- a/lib/sockets.js
+++ b/lib/sockets.js
@@ -1,6 +1,5 @@
 const jwt = require("jsonwebtoken");
 const io = require("socket.io");
-const { getUser } = require("./utils");
 
 /* eslint-disable-next-line */
 const pick = (O, ...K) => K.reduce((o, k) => ((o[k] = O[k]), o), {});
diff --git a/lib/utils.js b/lib/utils.js
index 7784ae5c..2f0214d5 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -1,30 +1,69 @@
 const { Op } = require("sequelize");
 
-module.exports = {
-  async getUser(username) {
-    return db.User.findOne({
-      include: [
-        {
-          model: db.Payment,
-          as: "payments",
-          order: [["id", "DESC"]],
-          where: {
-            [Op.or]: {
-              received: true,
-              amount: {
-                [Op.lt]: 0
-              }
+getUser = async username => {
+  return db.User.findOne({
+    include: [
+      {
+        model: db.Payment,
+        as: "payments",
+        order: [["id", "DESC"]],
+        where: {
+          [Op.or]: {
+            received: true,
+            amount: {
+              [Op.lt]: 0
             }
-          },
-          limit: 12
+          }
         },
-        {
+        limit: 12,
+        include: {
           model: db.Account,
-          as: "accounts"
+          as: "account"
         }
-      ],
-      where:
-      { [Op.or]: { username, id: username }}
-    });
-  }
+      },
+      {
+        model: db.Account,
+        as: "accounts"
+      },
+      {
+        model: db.Account,
+        as: "account"
+      }
+    ],
+    where: { username }
+  });
+};
+
+getUserById = async id => {
+  return db.User.findOne({
+    include: [
+      {
+        model: db.Payment,
+        as: "payments",
+        order: [["id", "DESC"]],
+        where: {
+          [Op.or]: {
+            received: true,
+            amount: {
+              [Op.lt]: 0
+            }
+          }
+        },
+        limit: 12,
+        include: {
+          model: db.Account,
+          as: "account"
+        }
+      },
+      {
+        model: db.Account,
+        as: "accounts"
+      },
+      {
+        model: db.Account,
+        as: "account"
+      }
+    ],
+    where: { id }
+  });
 };
diff --git a/lib/whitelist.js b/lib/whitelist.js
index e5f672b2..8af95820 100644
--- a/lib/whitelist.js
+++ b/lib/whitelist.js
@@ -1,5 +1,7 @@
 whitelist = [
 'id',
+'account',
+'account_id',
 'unit',
 'fbtoken',
 'username',
@@ -7,11 +9,13 @@ whitelist = [
 'symbol',
 'currency',
 'currencies',
-'balance',
-'pending',
 'name',
 'pic',
 'twofa',
 'liquid',
 'confidential',
+'accounts',
+'payments',
+'balance',
+'pending',
 ]