From f15ad832203d022c5decc74e82fe2568ba951f47 Mon Sep 17 00:00:00 2001 From: Angie Date: Fri, 25 Jul 2025 00:15:44 +0200 Subject: [PATCH] feat: updated backend logic for /me endpoint --- backend/routes/auth.js | 7 +++---- backend/server.js | 3 +++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/routes/auth.js b/backend/routes/auth.js index a1c4c4f..79635d9 100644 --- a/backend/routes/auth.js +++ b/backend/routes/auth.js @@ -68,20 +68,19 @@ router.post( } ); -// Get current user router.get("/me", verifyToken, (req, res) => { db.get( - "SELECT id, username, name, role FROM users WHERE id = ?", + "SELECT id, username, fullName, role FROM users WHERE id = ?", [req.user.userId], (err, user) => { if (err) { return res.status(500).json({ error: "Database error" }); } - if (!user) { return res.status(404).json({ error: "User not found" }); } - + // Ensure name field exists for frontend (even if null) + user.fullName = user.fullName || ""; res.json({ user }); } ); diff --git a/backend/server.js b/backend/server.js index 903f149..857dd94 100644 --- a/backend/server.js +++ b/backend/server.js @@ -26,6 +26,9 @@ app.use( }) ); +console.log("Loaded ENV PORT:", process.env.PORT); +console.log("Loaded ENV FRONTEND_URL:", process.env.FRONTEND_URL); + // Compression app.use(compression());