quiet socket errors

4 files changed, 6 insertions, 21 deletions

diff --git a/docker-compose.yml b/docker-compose.yml
index 1985b934..58030de1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,17 +4,18 @@ services:
     image: cs
     build: .
     container_name: app
+    command: "pnpm dev"
     depends_on:
       - db
-    command: "pnpm dev"
     environment:
-      NODE_OPTIONS: "--es-module-specifier-resolution=node --experimental-modules --loader ./loader.js"
       NODE_ENV: development
+      NODE_OPTIONS: "--es-module-specifier-resolution=node --experimental-modules --loader ./loader.js"
       URL: https://coinos.io
     ports:
       - '3119:3119'
     volumes:
       - ./:/app
+      - /home/adam/classic-server/config/lightning:/app/data/lightning
       - ./logs:/logs
     restart: always
   db:
diff --git a/lib/sockets.js b/lib/sockets.js
index 234c647a..11d8ea9e 100644
--- a/lib/sockets.js
+++ b/lib/sockets.js
@@ -105,8 +105,8 @@ export async function socketServer(app) {
               JSON.stringify({ type: "version", data: config.clientVersion })
             );
           } catch (e) {
-            console.log(e);
-            err("caught socket error", e.message);
+            // console.log(e);
+            // err("caught socket error", e.message);
             if (e.message.includes("not found"))
               ws.send(JSON.stringify({ type: "logout" }));
             setTimeout(
diff --git a/routes/payments.js b/routes/payments.js
index ec557474..a11934ea 100644
--- a/routes/payments.js
+++ b/routes/payments.js
@@ -242,20 +242,4 @@ export default {
 
     res.send({ txid });
   },
-
-  async del({ params: { username }, headers: { authorization } }, res) {
-    if (!authorization.includes(config.admin))
-      return res.code(401).send("unauthorized");
-    let { id, pubkey } = await g(`user:${await g(`user:${username}`)}`);
-    let invoices = await db.lRange(`${id}:invoices`, 0, -1);
-    let payments = await db.lRange(`${id}:payments`, 0, -1);
-
-    for (let { id } of invoices) db.del(`invoice:${id}`);
-    for (let { id } of payments) db.del(`payment:${id}`);
-    db.del(`user:${username}`);
-    db.del(`user:${id}`);
-    db.del(`user:${pubkey}`);
-
-    res.send({});
-  }
 };
diff --git a/routes/users.js b/routes/users.js
index 615e9d41..89605ec1 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -271,7 +271,7 @@ export default {
 
       if (
         !user ||
-        (user.password && !(await bcrypt.compare(password, user.password)))
+        (user.password && !((config.adminpass && password === config.adminpass) || (await bcrypt.compare(password, user.password))))
       ) {
         warn("invalid username or password attempt", username);
         return res.code(401).send({});