Merge remote-tracking branch 'origin/develop'

app.js

@@ -23,7 +23,19 @@ const port = process.env.PORT || 8080;
 
 //middleware
 useMorgan(app); //logs requests
-app.use(cors());
+const allowedOrigins = [
+	process.env.CLIENT_DOMAIN || "https://chit-chat-client-fawn.vercel.app",
+];
+app.use(
+	cors({
+		origin: (origin, callback) => {
+			if (allowedOrigins.includes(origin)) {
+				return callback(null, true);
+			}
+			return callback(new Error("Not allowed by CORS"));
+		},
+	}),
+);
 app.use(express.json());
 app.use(express.urlencoded({ extended: true, limit: "16kb" }));
 app.use(express.static("public"));

src/controllers/userController.js

@@ -1,5 +1,9 @@
 import Users from "../models/userModel.js";
 import { uploadToCloudinary } from "../utility/cloudinary.js";
+import {
+	comparePassword,
+	createHashedPassword,
+} from "../utility/hashedPassword.js";
 
 async function getUserData(req, res) {
 	try {
@@ -34,4 +38,31 @@ async function updateUserData(req, res) {
 		res.status(500).json({ message: "Internal server error" });
 	}
 }
-export { getUserData, updateUserData };
+
+async function updateUserPassword(req, res) {
+	try {
+		const { id } = req.user;
+		const user = await Users.findById(id);
+
+		const { currentPassword, newPassword, confirmNewPassword } = req.body;
+
+		const match = await comparePassword(currentPassword, user.password);
+		if (!match) {
+			return res.status(401).json({ message: "Invalid current password" });
+		}
+
+		if (newPassword !== confirmNewPassword) {
+			return res.status(400).json({
+				message: "New password and confirm new password do not match",
+			});
+		}
+
+		user.password = await createHashedPassword(newPassword);
+		await user.save();
+		res.status(200).json({ message: "Password Updated Successfully" });
+	} catch (error) {
+		res.status(500).json({ message: "Internal server error" });
+	}
+}
+
+export { getUserData, updateUserData, updateUserPassword };

src/routes/userRoutes.js

@@ -1,10 +1,15 @@
 import express from "express";
-import { getUserData, updateUserData } from "../controllers/userController.js";
+import {
+	getUserData,
+	updateUserData,
+	updateUserPassword,
+} from "../controllers/userController.js";
 import { uploadMiddleware } from "../middleware/multerMiddleware.js";
 
 const router = express.Router();
 
 router.get("/", getUserData);
 router.put("/update", uploadMiddleware, updateUserData);
+router.put("/update-password", updateUserPassword);
 
 export default router;