From 3563e3ce82200abbdc06b3ffb832e2ba6cf7f659 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 16 Jan 2024 17:46:40 +0000
Subject: log user errors

---
 lib/utils.js    |  2 +-
 routes/users.js | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/lib/utils.js b/lib/utils.js
index 7b468f3b..d286d093 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -67,6 +67,6 @@ export let fields = [
 
 export let getUser = async (username) => {
   let user = await migrate(username);
-  if (!user || username === "undefined") fail("user not found");
+  if (!user || username === "undefined") fail(`user ${username} not found`);
   return user;
 };
diff --git a/routes/users.js b/routes/users.js
index 2d9c4a1b..e5f16d8d 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -126,7 +126,7 @@ export default {
 
       res.send(pick(user, whitelist));
     } catch (e) {
-      console.log(e);
+      err("problem getting user", e.message);
       res.code(500).send(e.message);
     }
   },
@@ -275,14 +275,8 @@ export default {
         l("logging in", username, req.headers["cf-connecting-ip"]);
 
       username = username.toLowerCase().replace(/\s/g, "");
-      let uid = await g(`user:${username}`);
       let user = await getUser(username);
 
-      if (!user) {
-        user = await migrate(username);
-        if (user) uid = user.id;
-      }
-
       if (
         !user ||
         (user.password &&
@@ -306,13 +300,12 @@ export default {
 
       if (username !== "coinos") l("logged in", username);
 
-      let payload = { id: uid };
+      let payload = { id: user.id };
       let token = jwt.sign(payload, config.jwt);
       res.cookie("token", token, { expires: new Date(Date.now() + 432000000) });
       user = pick(user, whitelist);
       res.send({ user, token });
     } catch (e) {
-      console.log(e);
       err("login error", e.message, req.socket.remoteAddress);
       res.code(401).send({});
     }
-- 
cgit v1.2.3