minor import changes
This commit is contained in:
+2
-3
@@ -3,7 +3,7 @@ const bodyParser = require("body-parser");
|
|||||||
const cors = require("cors");
|
const cors = require("cors");
|
||||||
const authRoutes = require("./routes/auth");
|
const authRoutes = require("./routes/auth");
|
||||||
const userRoutes = require("./routes/user");
|
const userRoutes = require("./routes/user");
|
||||||
const roomRoutes = require('./routes/room')
|
const roomRoutes = require("./routes/room");
|
||||||
const mongoose = require("mongoose");
|
const mongoose = require("mongoose");
|
||||||
require("dotenv").config();
|
require("dotenv").config();
|
||||||
|
|
||||||
@@ -17,7 +17,6 @@ const http = require("http");
|
|||||||
const server = http.createServer(app);
|
const server = http.createServer(app);
|
||||||
const { socketIOServerInit } = require("./socket");
|
const { socketIOServerInit } = require("./socket");
|
||||||
|
|
||||||
|
|
||||||
app.use(cors({ origin: "*" }));
|
app.use(cors({ origin: "*" }));
|
||||||
app.use(bodyParser.json());
|
app.use(bodyParser.json());
|
||||||
app.use((req, res, next) => {
|
app.use((req, res, next) => {
|
||||||
@@ -37,7 +36,7 @@ app.use((req, res, next) => {
|
|||||||
// app.use("/", (req, res, next) => res.send('Hello'));
|
// app.use("/", (req, res, next) => res.send('Hello'));
|
||||||
app.use("/api/auth", authRoutes);
|
app.use("/api/auth", authRoutes);
|
||||||
app.use("/api/user", userRoutes);
|
app.use("/api/user", userRoutes);
|
||||||
app.use("/api/room", roomRoutes)
|
app.use("/api/room", roomRoutes);
|
||||||
|
|
||||||
app.use((error, req, res, next) => {
|
app.use((error, req, res, next) => {
|
||||||
const status = error.status || 500;
|
const status = error.status || 500;
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
const nodemailer = require("nodemailer");
|
const nodemailer = require("nodemailer");
|
||||||
|
require("dotenv").config();
|
||||||
|
|
||||||
const transporter = nodemailer.createTransport({
|
const transporter = nodemailer.createTransport({
|
||||||
service: "gmail",
|
service: "gmail",
|
||||||
auth: {
|
auth: {
|
||||||
|
|||||||
+12
-10
@@ -3,24 +3,26 @@ const uuid = require("uuid");
|
|||||||
const { createRoom } = require("../socket");
|
const { createRoom } = require("../socket");
|
||||||
const { sendEmail } = require("../mail");
|
const { sendEmail } = require("../mail");
|
||||||
const { User } = require("../models/user");
|
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
|
// rooms can only be created through HTTP requests and destroyed only by socket.io server
|
||||||
// and vice versan is not true
|
// and vice versa is not true
|
||||||
|
router.post("/create", checkAuth, async (req, res, next) => {
|
||||||
router.post("/create", async (req, res, next) => {
|
console.log(req.body);
|
||||||
// challenger and challenged are username
|
// challenger and challenged are username
|
||||||
const { challenger, challenged } = req.body;
|
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();
|
const roomID = uuid.v4();
|
||||||
createRoom(roomID, req.body.timeLimit);
|
createRoom(roomID, req.body.timeLimit);
|
||||||
|
|
||||||
sendEmail(
|
// sendEmail(
|
||||||
challengedEmail,
|
// challengedEmail,
|
||||||
`Challenge from ${challenger}`,
|
// `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}`
|
// `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 });
|
res.json({ roomID });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,9 @@ const socket = require("socket.io");
|
|||||||
let activeRooms = new Map();
|
let activeRooms = new Map();
|
||||||
|
|
||||||
function createRoom(roomID, timeLimit) {
|
function createRoom(roomID, timeLimit) {
|
||||||
|
console.log(roomID, "created");
|
||||||
activeRooms.set(roomID, { timeLimit, players: [] });
|
activeRooms.set(roomID, { timeLimit, players: [] });
|
||||||
|
console.log("Currently active rooms", activeRooms.size);
|
||||||
}
|
}
|
||||||
|
|
||||||
// structure of userDetails: {username,color}
|
// structure of userDetails: {username,color}
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ function checkAuthMiddleware(req, res, next) {
|
|||||||
return next(new NotAuthError("Not authenticated."));
|
return next(new NotAuthError("Not authenticated."));
|
||||||
}
|
}
|
||||||
const authFragments = req.headers.authorization.split(" ");
|
const authFragments = req.headers.authorization.split(" ");
|
||||||
console.log(authFragments);
|
|
||||||
|
|
||||||
if (authFragments.length !== 2) {
|
if (authFragments.length !== 2) {
|
||||||
console.log("NOT AUTH. AUTH HEADER INVALID.");
|
console.log("NOT AUTH. AUTH HEADER INVALID.");
|
||||||
|
|||||||
Reference in New Issue
Block a user