From cfd207e41f1fd33e8e409e69717f8a95f9e6efff Mon Sep 17 00:00:00 2001 From: Moon Patel Date: Sun, 2 Jul 2023 17:56:28 +0530 Subject: [PATCH] minor import changes --- backend/app.js | 5 ++--- backend/mail.js | 2 ++ backend/routes/room.js | 22 ++++++++++++---------- backend/socket.js | 2 ++ backend/util/auth.js | 1 - 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/backend/app.js b/backend/app.js index 5bdcc99..4b329ed 100644 --- a/backend/app.js +++ b/backend/app.js @@ -3,7 +3,7 @@ const bodyParser = require("body-parser"); const cors = require("cors"); const authRoutes = require("./routes/auth"); const userRoutes = require("./routes/user"); -const roomRoutes = require('./routes/room') +const roomRoutes = require("./routes/room"); const mongoose = require("mongoose"); require("dotenv").config(); @@ -17,7 +17,6 @@ const http = require("http"); const server = http.createServer(app); const { socketIOServerInit } = require("./socket"); - app.use(cors({ origin: "*" })); app.use(bodyParser.json()); app.use((req, res, next) => { @@ -37,7 +36,7 @@ app.use((req, res, next) => { // app.use("/", (req, res, next) => res.send('Hello')); app.use("/api/auth", authRoutes); app.use("/api/user", userRoutes); -app.use("/api/room", roomRoutes) +app.use("/api/room", roomRoutes); app.use((error, req, res, next) => { const status = error.status || 500; diff --git a/backend/mail.js b/backend/mail.js index e955e9b..8c17b71 100644 --- a/backend/mail.js +++ b/backend/mail.js @@ -1,4 +1,6 @@ const nodemailer = require("nodemailer"); +require("dotenv").config(); + const transporter = nodemailer.createTransport({ service: "gmail", auth: { diff --git a/backend/routes/room.js b/backend/routes/room.js index 7a7e878..6702588 100644 --- a/backend/routes/room.js +++ b/backend/routes/room.js @@ -3,24 +3,26 @@ const uuid = require("uuid"); const { createRoom } = require("../socket"); const { sendEmail } = require("../mail"); const { User } = require("../models/user"); +const { checkAuth } = require("../util/auth"); // rooms can only be created through HTTP requests and destroyed only by socket.io server -// and vice versan is not true - -router.post("/create", async (req, res, next) => { +// and vice versa is not true +router.post("/create", checkAuth, async (req, res, next) => { + console.log(req.body); // challenger and challenged are username const { challenger, challenged } = req.body; - const challengedEmail = await User.findOne({ username: challenged }).email; + const challengedEmail = (await User.findOne({ username: challenged })).email; + console.log(challengedEmail); const roomID = uuid.v4(); createRoom(roomID, req.body.timeLimit); - - sendEmail( - challengedEmail, - `Challenge from ${challenger}`, - `To accept the challenge follow the link: http://192.168.136.99:5173/game/challenges/${challenged}/${roomID} \n login through: http://192.168.136.99:5173/login \n roomid:${roomID}` - ); + + // sendEmail( + // challengedEmail, + // `Challenge from ${challenger}`, + // `To accept the challenge follow the link: http://192.168.136.99:5173/game/challenges/${challenged}/${roomID} \n login through: http://192.168.136.99:5173/login \n roomid:${roomID}` + // ); res.json({ roomID }); }); diff --git a/backend/socket.js b/backend/socket.js index e0d1102..d97e96f 100644 --- a/backend/socket.js +++ b/backend/socket.js @@ -3,7 +3,9 @@ const socket = require("socket.io"); let activeRooms = new Map(); function createRoom(roomID, timeLimit) { + console.log(roomID, "created"); activeRooms.set(roomID, { timeLimit, players: [] }); + console.log("Currently active rooms", activeRooms.size); } // structure of userDetails: {username,color} diff --git a/backend/util/auth.js b/backend/util/auth.js index 611c7a9..052cd29 100644 --- a/backend/util/auth.js +++ b/backend/util/auth.js @@ -30,7 +30,6 @@ function checkAuthMiddleware(req, res, next) { return next(new NotAuthError("Not authenticated.")); } const authFragments = req.headers.authorization.split(" "); - console.log(authFragments); if (authFragments.length !== 2) { console.log("NOT AUTH. AUTH HEADER INVALID.");