PR: Implement Request Page Components (Card, Requests, Reject Modal)

.husky/pre-commit

@@ -1,4 +1,3 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-cd frontend && npx lint-staged && cd ../backend && npx lint-staged

backend/.env.example

@@ -1,8 +1,8 @@
 MONGODB_URI = mongodb://localhost:27017/cosadatabase
 JWT_SECRET_TOKEN='secret-token'
 FRONTEND_URL=http://localhost:3000
-BACKEND_URL=http://localhost:5000
-PORT=5000
+BACKEND_URL=http://localhost:8000
+PORT=8000
 
 GOOGLE_CLIENT_ID=OAuth_Client_ID_from_google_cloud_console
 GOOGLE_CLIENT_SECRET=OAuth_Client_Secret_from_google_cloud_console

backend/db.js → backend/config/db.js

@@ -5,10 +5,8 @@ dotenv.config();
 const connectDB = async () => {
   try {
     const ConnectDB = process.env.MONGODB_URI;
-    await mongoose.connect(ConnectDB, {
-      useNewUrlParser: true,
-      useUnifiedTopology: true,
-    });
+    //Removing the options as they are no longer needed from mongoose6+
+    await mongoose.connect(ConnectDB);
     console.log("MongoDB Connected");
   } catch (error) {
     console.error("MongoDB Connection Error:", error);

backend/config/passportConfig.js

@@ -0,0 +1,116 @@
+const passport = require("passport");
+const GoogleStrategy = require("passport-google-oauth20").Strategy;
+const LocalStrategy = require("passport-local").Strategy;
+const isIITBhilaiEmail = require("../utils/isIITBhilaiEmail");
+const User = require("../models/userSchema");
+const { loginValidate } = require("../utils/authValidate");
+const bcrypt = require("bcrypt");
+// Google OAuth Strategy
+passport.use(
+  new GoogleStrategy(
+    {
+      clientID: process.env.GOOGLE_CLIENT_ID,
+      clientSecret: process.env.GOOGLE_CLIENT_SECRET,
+      callbackURL: `${process.env.BACKEND_URL}/auth/google/verify`, // Update with your callback URL
+    },
+    async (accessToken, refreshToken, profile, done) => {
+      // Check if the user already exists in your database
+      const email = profile.emails?.[0]?.value;  
+      if (!email) {  
+        //console.log("No email found in Google profile");
+        return done(null, false, { message: "Email not available from Google." });  
+      }  
+
+      if (!isIITBhilaiEmail(profile.emails[0].value)) {
+        console.log("Google OAuth blocked for: ", profile.emails[0].value);
+        return done(null, false, {
+          message: "Only @iitbhilai.ac.in emails are allowed.",
+        });
+      }  
+      try {
+        const user = await User.findOne({ username: email });
+        //console.log("Looking for existing user with email:", email, "Found:", !!user);
+
+        if (user) {
+          // If user exists, return the user
+          //console.log("Returning existing user:", user.username);
+          return done(null, user);
+        }
+        // If user doesn't exist, create a new user in your database
+        const newUser = await User.create({
+          username: email,
+          role: "STUDENT",
+          strategy: "google",
+          personal_info: {
+            name: profile.displayName || "No Name",
+            email: email,
+            profilePic:
+              profile.photos && profile.photos.length > 0
+                ? profile.photos[0].value
+                : "https://www.gravatar.com/avatar/?d=mp",
+          },
+          onboardingComplete: false,
+        });
+        //console.log("User is",newUser);
+        return done(null, newUser);
+      } catch (error) {
+        console.error("Error in Google strategy:", error);
+        return done(error);
+      }
+    },
+  ),
+);
+
+//Local Strategy
+passport.use(new LocalStrategy(async (username, password, done) => {
+
+  const result = loginValidate.safeParse({ username, password });
+
+  if (!result.success) {
+    let errors = result.error.issues.map((issue) => issue.message);
+    return done(null, false, {message: errors});
+  }
+
+  try{
+
+      const user = await User.findOne({ username });
+      if (!user) {
+        return done(null, false, {message: "Invalid user credentials"});
+      }
+
+
+      if (user.strategy !== "local" || !user.password) {
+          return done(null, false, { message: "Invalid login method" });
+      }
+
+      const isValid = await bcrypt.compare(password, user.password);
+      if (!isValid) {
+        return done(null, false, { message: "Invalid user credentials" });
+      }
+      return done(null, user);
+  }catch(err){
+    return done(err);
+  }
+
+}));
+
+
+//When login succeeds this will run 
+// serialize basically converts user obj into a format that can be transmitted(like a string, etc...)
+// here take user obj and done callback and store only userId in session 
+passport.serializeUser((user, done) => {
+  done(null, user._id.toString());
+});
+
+//When a request comes in, take the stored id, fetch full user from DB, and attach it to req.user.
+passport.deserializeUser(async (id, done) => {
+  try {
+    let user = await User.findById(id);
+    if(!user) return done(null, false);
+    done(null, user);
+  } catch (err) {
+    done(err, null);
+  }
+});
+
+module.exports = passport;

backend/controllers/analyticsController.js

@@ -1,7 +1,13 @@
-const {User, Achievement, UserSkill, Event, Position, PositionHolder,OrganizationalUnit}=require('../models/schema');
 const mongoose = require("mongoose");
 const getCurrentTenureRange = require('../utils/getTenureRange');
 
+const User = require("../models/userSchema"); 
+const Achievement = require("../models/achievementSchema"); 
+const Position = require("../models/positionSchema"); 
+const PositionHolder = require("../models/positionHolderSchema"); 
+const OrganizationalUnit = require("../models/organizationSchema"); 
+const Event = require("../models/eventSchema"); 
+const { UserSkill } = require("../models/schema");
 
 exports.getPresidentAnalytics= async (req,res) => {
    try {