diff --git a/server/package-lock.json b/server/package-lock.json index 9ce7fe1..2eb84fc 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -174,7 +174,6 @@ "resolved": "https://registry.npmjs.org/@redis/client/-/client-5.11.0.tgz", "integrity": "sha512-GHoprlNQD51Xq2Ztd94HHV94MdFZQ3CVrpA04Fz8MVoHM0B7SlbmPEVIjwTbcv58z8QyjnrOuikS0rWF03k5dQ==", "license": "MIT", - "peer": true, "dependencies": { "cluster-key-slot": "1.1.2" }, @@ -376,7 +375,6 @@ "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==", "dev": true, "license": "Apache-2.0", - "peer": true, "peerDependencies": { "bare-abort-controller": "*" }, @@ -1024,7 +1022,6 @@ "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", "license": "MIT", - "peer": true, "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -3139,7 +3136,6 @@ "resolved": "https://registry.npmjs.org/winston/-/winston-3.19.0.tgz", "integrity": "sha512-LZNJgPzfKR+/J3cHkxcpHKpKKvGfDZVPS4hfJCc4cCG0CgYzvlD6yE/S3CIL/Yt91ak327YCpiF/0MyeZHEHKA==", "license": "MIT", - "peer": true, "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.8", @@ -3315,7 +3311,6 @@ "version": "5.11.0", "resolved": "https://registry.npmjs.org/@redis/client/-/client-5.11.0.tgz", "integrity": "sha512-GHoprlNQD51Xq2Ztd94HHV94MdFZQ3CVrpA04Fz8MVoHM0B7SlbmPEVIjwTbcv58z8QyjnrOuikS0rWF03k5dQ==", - "peer": true, "requires": { "cluster-key-slot": "1.1.2" } @@ -3455,7 +3450,6 @@ "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz", "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==", "dev": true, - "peer": true, "requires": {} }, "bare-fs": { @@ -3865,7 +3859,6 @@ "version": "4.22.1", "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", - "peer": true, "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -5235,7 +5228,6 @@ "version": "3.19.0", "resolved": "https://registry.npmjs.org/winston/-/winston-3.19.0.tgz", "integrity": "sha512-LZNJgPzfKR+/J3cHkxcpHKpKKvGfDZVPS4hfJCc4cCG0CgYzvlD6yE/S3CIL/Yt91ak327YCpiF/0MyeZHEHKA==", - "peer": true, "requires": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.8", diff --git a/server/src/routes/chat.js b/server/src/routes/chat.js index 78ed84a..e9006d1 100644 --- a/server/src/routes/chat.js +++ b/server/src/routes/chat.js @@ -14,6 +14,7 @@ import { getChats } from "../services/chatService.js"; import { incrementServerUnread } from "../services/unreadService.js"; import { getIO } from "../socket/runtime.js"; +import { authToken } from "../middleware/auth.js"; import expressRateLimit from "../middleware/rateLimit.js"; import { deleteServerMessageValidator, editServerMessageValidator, getMessagesValidator, storeMessageValidator } from "../validators/chat.js"; @@ -56,7 +57,7 @@ function findChatMessage(channel, timestamp, senderId) { ); } -router.post("/store_message", expressRateLimit("chat"), storeMessageValidator, validate, async (req, res) => { +router.post("/store_message", authToken, expressRateLimit("chat"), storeMessageValidator, validate, async (req, res) => { const { message, server_id, @@ -169,7 +170,7 @@ router.post("/store_message", expressRateLimit("chat"), storeMessageValidator, v } }); -router.post("/get_messages", getMessagesValidator, validate, async (req, res) => { +router.post("/get_messages", authToken, getMessagesValidator, validate, async (req, res) => { const { channel_id, server_id } = req.body; try { @@ -246,7 +247,7 @@ router.post("/edit_server_message", editServerMessageValidator, validate, async } }); -router.post("/toggle_server_message_pin", async (req, res) => { +router.post("/toggle_server_message_pin", authToken, async (req, res) => { const { server_id, channel_id, timestamp, sender_id } = req.body; const user = getAuthorizedUser(req, res); if (!user) { diff --git a/server/src/routes/invites.js b/server/src/routes/invites.js index 19667b5..dc7baba 100644 --- a/server/src/routes/invites.js +++ b/server/src/routes/invites.js @@ -17,11 +17,12 @@ import { createInviteLinkValidator, inviteLinkInfoValidator, } from "../validators/invites.js"; +import { authToken } from "../middleware/auth.js"; import validate from "../middleware/validate.js"; const router = express.Router(); -router.post("/create_invite_link", createInviteLinkValidator, validate, async (req, res) => { +router.post("/create_invite_link", authToken, createInviteLinkValidator, validate, async (req, res) => { const { inviter_name, inviter_id, @@ -79,7 +80,7 @@ router.post("/create_invite_link", createInviteLinkValidator, validate, async (r }); }); -router.post("/invite_link_info", inviteLinkInfoValidator, validate, async (req, res) => { +router.post("/invite_link_info", authToken, inviteLinkInfoValidator, validate, async (req, res) => { const { invite_link } = req.body; try { const invite = await Invite.findOne({ invite_code: invite_link }).lean(); @@ -101,7 +102,7 @@ router.post("/invite_link_info", inviteLinkInfoValidator, validate, async (req, } }); -router.post("/accept_invite", acceptInviteValidator, validate, async (req, res) => { +router.post("/accept_invite", authToken, acceptInviteValidator, validate, async (req, res) => { const { user_details, server_details } = req.body; const { id } = user_details; const server_id = server_details.invite_details.server_id; diff --git a/server/src/routes/servers.js b/server/src/routes/servers.js index 7938afa..71ed56a 100644 --- a/server/src/routes/servers.js +++ b/server/src/routes/servers.js @@ -28,6 +28,7 @@ import { leaveServerValidator, serverInfoValidator, } from "../validators/servers.js"; +import { authToken } from "../middleware/auth.js"; import validate from "../middleware/validate.js"; const router = express.Router(); @@ -96,7 +97,7 @@ router.post("/server_info", serverInfoValidator, validate, async (req, res) => { res.json(serverInfo); }); -router.post("/add_new_channel", addNewChannelValidator, validate, async (req, res) => { +router.post("/add_new_channel", authToken, addNewChannelValidator, validate, async (req, res) => { const { category_id, channel_name, channel_type, server_id } = req.body; const newChannel = { $push: { @@ -130,7 +131,7 @@ router.post("/add_new_channel", addNewChannelValidator, validate, async (req, re } }); -router.post("/add_new_category", addNewCategoryValidator, validate, async (req, res) => { +router.post("/add_new_category", authToken, addNewCategoryValidator, validate, async (req, res) => { const { category_name, server_id } = req.body; const newCategory = { $push: { categories: { category_name, channels: [] } },