Merge pull request #40 from Naresh-chandanbatve/main

added sessions integration and remaining schemas

.gitignore

@@ -60,6 +60,7 @@ sysinfo.txt
 *.aab
 *.unitypackage
 *.app
+dist/
 
 #server files
 node_modules/

server/.dockerignore

@@ -1,3 +1,4 @@
 node_modules/
 *.env
-.env
+.env
+dist/

server/package.json

@@ -6,8 +6,7 @@
   "type": "module",
   "scripts": {
     "start": "ncc build index.js && node index.js",
-    "server": "nodemon index.js",
-    "build": "mkdir -p dist && cp index.js src/api dist/"
+    "server": "nodemon index.js"
   },
   "author": "Siddhant Patil, Naresh Chandanbatve, Vishal Kesharwani, Harshal Lade and Saurabh Yadav",
   "license": "ISC",
@@ -17,6 +16,7 @@
     "cors": "^2.8.5",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
+    "express-session": "^1.17.3",
     "jsonwebtoken": "^9.0.0",
     "mongoose": "^7.4.2",
     "nodemailer": "^6.9.2",

server/src/api/controllers/index.js

@@ -1,5 +1,31 @@
+import jwt from 'jsonwebtoken'
+
  const indexController = async (req, res) => {
-    res.status(200).json({message:"Arrow Server is running..."})
+
+     /**
+      * check if there is already any session 
+      * if yes get the session data and login
+      * else redirect to landing page
+      */
+    if(req.session.user){
+
+        let isTokenValid = jwt.decode(req.session.user.token)
+        if(isTokenValid){
+            res.status(200).json({
+                success: true,
+                user: req.session.user,
+                msg: req.session.user.user.name +" is logged in successfully"
+              });
+        }
+
+    }
+    else{
+         //show landing page
+         res.status(200).json({message:"Arrow Server is running..."})
+    }
+
+
+
 }
 
 export default indexController;

server/src/api/controllers/userAdmin.js

@@ -124,6 +124,11 @@ export const signin = async (req, res) => {
 
           const token = generateToken(oldUser, SECRET);
 
+          req.session.user = {
+            token: token,
+            user: oldUser
+          }
+
           res.status(200).json({
             success: true,
             result: oldUser,
@@ -137,6 +142,6 @@ export const signin = async (req, res) => {
         }
       }
       else{
-        res.json({msg:"User Admin does not exist"})
+        res.json({ msg:"User Admin does not exist" })
       }
 }

server/src/api/controllers/userStudent.js

@@ -2,6 +2,7 @@ import userStudentModel from "../models/userStudentModel.js"
 import bcrypt from 'bcrypt'
 import generateToken from "../middlewares/generateToken.js"
 
+
 /**
  * Route: /userStudent
  * Desc: to show or Access user Student
@@ -123,6 +124,11 @@ export const signin = async (req, res) => {
 
       const token = generateToken(oldUser, SECRET);
 
+      req.session.user = {
+        token: token,
+        user: oldUser
+      }
+
       res.status(200).json({
         success: true,
         result: oldUser,

server/src/api/middlewares/authAdmin.js

@@ -0,0 +1,29 @@
+import jwt from "jsonwebtoken"
+
+const SECRET = process.env.ADMIN_SECRET
+
+const authAdmin = (req, next) => {
+
+    try {
+        const token = req.headers.authprization.split(" ")[1]
+        const isCustomAuth = token.lenght < 500
+
+        let decodedData 
+        if(token && isCustomAuth){
+          decodedData = jwt.verify(token, SECRET)  
+          req.userId = decodedData?.id    
+        }
+        else{
+          decodedData = jwt.decode(token)  
+          req.userId = decodedData?.sub  
+        }
+
+        next()
+    } catch (error) {
+        console.log(error)
+    }
+
+}
+
+
+export default authAdmin

server/src/api/middlewares/session.js

@@ -0,0 +1,19 @@
+import express from "express"
+import session from 'express-session'
+import * as dotenv from "dotenv";
+dotenv.config();
+
+
+const app = express();
+app.use(session({
+  secret: process.env.SESSION_SECRET,
+  resave: false,
+  saveUninitialized: false
+},
+ (next)=>{
+  next()
+ }
+))
+
+export default app
+

server/src/api/models/userFacultyModel.js

@@ -0,0 +1,19 @@
+import mongoose from "mongoose";
+
+
+//estimated user schema
+const userFacultyModel = mongoose.Schema({
+     id: { type: String },
+     name: { type: String, required: true },
+     branch: { type: String, required: true },
+     email: { type: String, required: true },
+     password: { type: String, required: true },
+     subjects: { type: String, required: true },
+     designation: { type: String, required: true },
+     education: { type: String, required: true },
+     bio: { type: String },
+     intrest: { type: String }
+
+})
+
+export default mongoose.model("userFaculties",userFacultyModel);

server/src/api/models/userGuestModel.js

@@ -0,0 +1,14 @@
+import mongoose from "mongoose";
+
+
+//estimated user schema
+const userGuestModel = mongoose.Schema({
+     id: { type: String },
+     name: { type: String, required: true },
+     email: { type: String, required: true },
+     password: { type: String, required: true },
+     bio: { type: String, required: true },
+
+})
+
+export default mongoose.model("userGuests", userGuestModel);

server/src/api/models/userStaffModel.js

@@ -0,0 +1,17 @@
+import mongoose from "mongoose";
+
+
+//estimated user schema
+const userStaffModel = mongoose.Schema({
+     id: { type: String },
+     name: { type: String, required: true },
+     branch: { type: String, required: true },
+     email: { type: String, required: true },
+     password: { type: String, required: true },
+     designation: { type: String, required: true },
+     bio: { type: String },
+     mobile: { type: Number }
+
+})
+
+export default mongoose.model("userStaffs",userStaffModel);

server/src/api/models/userStudentModel.js

@@ -5,11 +5,11 @@ import mongoose from "mongoose";
 const userStudentModel = mongoose.Schema({
      id: { type: String },
      name: { type: String, required: true },
-     enrollNo: { type: String, required: true },
      email: { type: String, required: true },
      password: { type: String, required: true },
+     year: { type: String, required: true },
      branch: { type: String },
-     year: { type: String },
+     intrest: {type: String},
      roll: { type: Number },
      mobile: { type: Number }
 

server/src/api/routes/index.js

@@ -1,9 +1,10 @@
 import express from 'express';
+import session from '../middlewares/session.js';
 const router = express.Router();
 
 import indexController from "../controllers/index.js";
 
 
-router.get("/", indexController)
+router.get("/", session, indexController)
 
 export default router;

server/src/api/routes/userAdmin.js

@@ -1,11 +1,13 @@
 import express from 'express';
+import session from '../middlewares/session.js'
+
 const router = express.Router();
 
 import {userAdmin, signup, signin} from "../controllers/userAdmin.js";
 
 
 router.get("/", userAdmin)
 router.post("/signup", signup)
-router.post("/signin", signin)
+router.post("/signin", session, signin)
 
 export default router;

server/src/api/routes/userStudent.js

@@ -1,11 +1,12 @@
 import express from 'express';
 const router = express.Router();
+import session from '../middlewares/session.js';
 
 import {userStudent, signup, signin} from "../controllers/userStudent.js";
 
 
 router.get("/", userStudent)
 router.post("/signup", signup)
-router.post("/signin", signin)
+router.post("/signin",session, signin)
 
 export default router;