-
-
+
setUsername(e.target.value)}
+ />
+ setPassword(e.target.value)}
+ />
-
+
From 0c079f51bc25a90b381479f656f56241eac90ec0 Mon Sep 17 00:00:00 2001
From: tanishsingla51 <131950694+tanishsingla51@users.noreply.github.com>
Date: Mon, 13 May 2024 11:58:06 +0530
Subject: [PATCH 4/5] whomsoever is signed up , that name should not be visible
in filter data users, or all the users
---
backend/routes/user.js | 23 +++++++++++++----------
frontend/src/components/Users.jsx | 6 +++++-
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/backend/routes/user.js b/backend/routes/user.js
index 0a74a387..5ae10ea6 100644
--- a/backend/routes/user.js
+++ b/backend/routes/user.js
@@ -76,10 +76,12 @@ router.post("/signin", async (req, res) => {
password: req.body.password,
});
+ const userId = existingUser._id;
+
if (existingUser) {
const token = jwt.sign(
{
- userId: existingUser._id,
+ userId,
},
JWT_SECRET
);
@@ -114,21 +116,22 @@ router.put("/", authMiddleware, async (req, res) => {
});
});
-router.get("/bulk", async (req, res) => {
+router.get("/bulk", authMiddleware, async (req, res) => {
const filter = req.query.filter || "";
+ const signedInUser = req.userId; // Assuming your authentication middleware sets req.user with user details
const users = await User.find({
- $or: [
+ _id: { $ne: signedInUser }, // Exclude the current user
+ $and: [
{
- firstName: {
- $regex: filter,
- },
+ $or: [
+ { firstName: { $regex: filter } },
+ { lastName: { $regex: filter } },
+ ],
},
{
- lastName: {
- $regex: filter,
- },
- },
+ _id: { $ne: signedInUser },
+ }, // Ensure signed-in user is excluded again
],
});
diff --git a/frontend/src/components/Users.jsx b/frontend/src/components/Users.jsx
index 66a77605..87cfa828 100644
--- a/frontend/src/components/Users.jsx
+++ b/frontend/src/components/Users.jsx
@@ -10,7 +10,11 @@ export const Users = () => {
useEffect(() => {
axios
- .get("http://localhost:3000/api/v1/user/bulk?filter=" + filter)
+ .get("http://localhost:3000/api/v1/user/bulk?filter=" + filter, {
+ headers: {
+ Authorization: `Bearer ${localStorage.getItem("token")}`,
+ },
+ })
.then((response) => {
setUsers(response.data.user);
});
From b68d044545556fb254622c353539c850271a3719 Mon Sep 17 00:00:00 2001
From: tanishsingla51 <131950694+tanishsingla51@users.noreply.github.com>
Date: Fri, 6 Sep 2024 20:58:10 +0530
Subject: [PATCH 5/5] "commit"
---
backend/routes/user.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/backend/routes/user.js b/backend/routes/user.js
index 5ae10ea6..a83d8c2d 100644
--- a/backend/routes/user.js
+++ b/backend/routes/user.js
@@ -83,6 +83,7 @@ router.post("/signin", async (req, res) => {
{
userId,
},
+ { userId },
JWT_SECRET
);