fix: validations refactored

config/passport-googleAuth-strategy.js

@@ -22,7 +22,7 @@ passport.use(
           user = await User.create({
             name: profile.displayName,
             email: profile.emails[0].value,
-            username: profile.emails[0].value.split("@")[0],
+            userName: profile.emails[0].value.split("@")[0],
             password: crypto.randomBytes(20).toString("hex"),
           });
 

index.js

@@ -8,12 +8,15 @@ const passport = require("passport");
 require("./config/passport-googleAuth-strategy");
 
 const path = require("path");
+const bodyParser = require("body-parser");
 
 let port = process.env.PORT || 5000;
 const app = express();
 dotenv.config();
 connectToMongo();
 
+app.use(bodyParser.json({ limit: "10mb" }));
+
 app.use(
   cors({
     origin: (origin, callback) => {

package.json

@@ -17,6 +17,7 @@
     "@geoapify/geocoder-autocomplete": "^1.5.1",
     "@geoapify/react-geocoder-autocomplete": "^1.5.0",
     "bcryptjs": "^2.4.3",
+    "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "crypto": "^1.0.1",

routes/club/Club.js

@@ -5,10 +5,10 @@ const router = express.Router();
 
 router.get("/", async (req, res) => {
   try {
-    const { username } = req.query;
+    const { userName } = req.query;
 
-    if (username) {
-      const clubdetails = await User.findOne({ username });
+    if (userName) {
+      const clubdetails = await User.findOne({ userName });
       if (!clubdetails)
         return res
           .status(STATUSCODE.NOT_FOUND)
@@ -17,7 +17,7 @@ router.get("/", async (req, res) => {
     }
 
     const clubs = await User.find({
-      usertype: "club",
+      userType: "club",
     });
 
     res.json(clubs);

routes/display/Display.js

@@ -20,7 +20,7 @@ router.get("/users", async (req, res) => {
 // * Route 2 - Show all available Clubs in the DB
 router.get("/clubs", async (req, res) => {
   try {
-    const allClubs = await User.find({ usertype: "club" });
+    const allClubs = await User.find({ userType: "club" });
     res.json(allClubs);
   } catch (error) {
     res

routes/events/Event.js

@@ -38,17 +38,12 @@ router.post("/create", async (req, res) => {
       !data.description ||
       !data.coverImage ||
       !data.mode ||
-      !data.startDate ||
-      !data.endDate ||
-      !data.startTime ||
-      !data.endTime ||
       !data.city ||
       !data.state ||
       !data.country ||
       !data.address ||
       !data.mapIframe
     ) {
-      console.log(data);
       return res
         .status(STATUSCODE.BAD_REQUEST)
         .json({ message: "Missing Required Fields" });
@@ -71,7 +66,7 @@ router.post("/create", async (req, res) => {
       ...data,
       uid,
       hostName: user.name,
-      hostUsername: user.username,
+      hostUsername: user.userName,
       createdAt: setTime(),
       updatedAt: setTime(),
     });

routes/user/Auth.js

@@ -36,11 +36,11 @@ router.post("/signup", async (req, res) => {
     }
 
     const hashedPassword = await bcrypt.hash(data.password, 10);
-    const username = email.split("@")[0];
+    const userName = email.split("@")[0];
 
     const newUser = new User({
       ...data,
-      username,
+      userName,
       email,
       password: hashedPassword,
     });
@@ -55,9 +55,9 @@ router.post("/signup", async (req, res) => {
     res
       .status(STATUSCODE.CREATED)
       .cookie("Token", token, defaultCookie)
-      .cookie("username", username, frontendCookie)
+      .cookie("userName", userName, frontendCookie)
       .cookie("isLoggedIn", true, frontendCookie)
-      .cookie("usertype", data?.usertype, frontendCookie)
+      .cookie("userType", data?.userType, frontendCookie)
       .json({
         message: STATUSMESSAGE.SIGNUP_SUCCESS,
         user,
@@ -99,9 +99,9 @@ router.post("/signin", async (req, res) => {
     res
       .status(STATUSCODE.CREATED)
       .cookie("Token", token, defaultCookie)
-      .cookie("username", existingUser.username, frontendCookie)
+      .cookie("userName", existingUser.userName, frontendCookie)
       .cookie("isLoggedIn", true, frontendCookie)
-      .cookie("usertype", existingUser.usertype, frontendCookie)
+      .cookie("userType", existingUser.userType, frontendCookie)
       .json({
         message: STATUSMESSAGE.LOGIN_SUCCESS,
         user,
@@ -145,8 +145,8 @@ router.post("/update", async (req, res) => {
 
     // Updated User
     const UserData = {
-      firstname: existingUser.firstname,
-      lastname: existingUser.lastname,
+      firstName: existingUser.firstName,
+      lastName: existingUser.lastName,
       email: email,
       password: newHashedPassword,
       address: existingUser.address,
@@ -171,7 +171,7 @@ router.get("/google", (req, res) => {
     redirect_uri: process.env.CALLBACK_URL,
     scope: "profile email ",
     client_id: process.env.CLIENT_ID,
-    state: req.query.usertype,
+    state: req.query.userType,
   });
 
   const redirectURL = `${googleAuthURL}?${params}`;
@@ -186,17 +186,17 @@ router.get(
     failureRedirect: "auth/login/failed",
   }),
   async (req, res) => {
-    const usertype = req.query.state;
+    const userType = req.query.state;
     if (req.isAuthenticated()) {
       const user = req.user;
       try {
         const existingUser = await User.findOne({ email: user.email });
 
         if (!existingUser) {
-          // This is a new account, update usertype
+          // This is a new account, update userType
           await User.create({
             email: user.email,
-            usertype: usertype,
+            userType: userType,
           });
         }
         res
@@ -246,9 +246,9 @@ router.get("/login/success", (req, res) => {
         domain: process.env.ORIGIN_DOMAIN,
       })
       .cookie("Token", token, defaultCookie)
-      .cookie("username", req.user.username, frontendCookie)
+      .cookie("userName", req.user.userName, frontendCookie)
       .cookie("isLoggedIn", true, frontendCookie)
-      .cookie("usertype", "user", frontendCookie)
+      .cookie("userType", "user", frontendCookie)
       .json({
         message: STATUSMESSAGE.LOGIN_SUCCESS,
         user,
@@ -270,7 +270,7 @@ router.get("/logout", (req, res) => {
       sameSite: "none",
       domain: process.env.ORIGIN_DOMAIN,
     })
-    .cookie("username", false, {
+    .cookie("userName", false, {
       expires: new Date(0),
       httpOnly: false,
       secure: true,
@@ -284,7 +284,7 @@ router.get("/logout", (req, res) => {
       sameSite: "none",
       domain: process.env.ORIGIN_DOMAIN,
     })
-    .cookie("usertype", false, {
+    .cookie("userType", false, {
       expires: new Date(0),
       httpOnly: false,
       secure: true,

routes/user/User.js

@@ -7,10 +7,10 @@ const jwt = require("jsonwebtoken");
 
 router.get("/", async (req, res) => {
   try {
-    const { username } = req.query;
+    const { userName } = req.query;
 
-    if (username) {
-      const userdetails = await User.findOne({ username });
+    if (userName) {
+      const userdetails = await User.findOne({ userName });
 
       if (!userdetails)
         return res
@@ -21,7 +21,7 @@ router.get("/", async (req, res) => {
     }
 
     const users = await User.find({
-      usertype: "individual",
+      userType: "individual",
     });
 
     res.json(users);
@@ -96,8 +96,8 @@ router.post("/report", async (req, res) => {
     const data = req.body;
 
     const ReportData = ReportProblem({
-      firstname: data.firstname,
-      lastname: data.lastname,
+      firstName: data.firstName,
+      lastName: data.lastName,
       email: data.email,
       reportmessage: data.reportmessage,
     });

schema/club/ClubSchema.js

@@ -41,7 +41,7 @@ const ClubsSchema = mongoose.Schema({
     type: String,
     required: true,
   },
-  username: {
+  userName: {
     type: String,
     required: true,
   },

schema/user/ReportProblemSchema.js

@@ -2,11 +2,11 @@ const mongoose = require("mongoose");
 
 const ReportProblemSchema = mongoose.Schema(
   {
-    firstname: {
+    firstName: {
       type: String,
       required: true,
     },
-    lastname: {
+    lastName: {
       type: String,
       required: true,
     },

schema/user/UserSchema.js

@@ -1,14 +1,14 @@
 const mongoose = require("mongoose");
 
 const UserSchema = mongoose.Schema({
-  usertype: { type: String },
-  username: {
+  userType: { type: String },
+  userName: {
     type: String,
     required: true,
   },
   name: { type: String },
-  firstname: { type: String },
-  lastname: { type: String },
+  firstName: { type: String },
+  lastName: { type: String },
   email: {
     type: String,
     required: true,