Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 29 additions & 13 deletions auth/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ router.post("/login", async (req, res) => {

// Find user
const user = await User.findOne({ where: { username } });
user.checkPassword(password);
if (!user) {
// Adjusted to make sure that we don't get null users
if (!user || !user.checkPassword(password)) {
return res.status(401).send({ error: "Invalid credentials" });
}

Expand Down Expand Up @@ -215,19 +215,35 @@ router.post("/logout", (req, res) => {
});

// Get current user route (protected)
router.get("/me", (req, res) => {
const token = req.cookies.token;
router.put("/me", authenticateJWT, async (req, res) => {
try {
const { firstName, lastName, email, profilePicture } = req.body;
const user = await User.findByPk(req.user.id);

if (!token) {
return res.send({});
}
if (!user) return res.status(404).send({ error: "User not found" });

jwt.verify(token, JWT_SECRET, (err, user) => {
if (err) {
return res.status(403).send({ error: "Invalid or expired token" });
}
res.send({ user: user });
});
if (firstName !== undefined) user.firstName = firstName;
if (lastName !== undefined) user.lastName = lastName;
if (email !== undefined) user.email = email;
if (profilePicture !== undefined) user.profilePicture = profilePicture;

await user.save();

res.send({
message: "Profile updated successfully",
user: {
id: user.id,
username: user.username,
email: user.email,
firstName: user.firstName,
lastName: user.lastName,
profilePicture: user.profilePicture,
},
});
} catch (err) {
console.error("Update profile error:", err);
res.status(500).send({ error: "Failed to update profile" });
}
});

module.exports = { router, authenticateJWT };
13 changes: 13 additions & 0 deletions database/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,19 @@ const User = db.define("user", {
type: DataTypes.STRING,
allowNull: true,
},
firstName: {
type: DataTypes.STRING,
allowNull: true,
},
lastName: {
type: DataTypes.STRING,
allowNull: true,
},
profilePicture: {
type: DataTypes.STRING,
allowNull: true,
defaultValue: "https://i.imgur.com/default-avatar.png",
},
});

// Instance method to check password
Expand Down