Merge pull request #91 from Naresh-chandanbatve/improve-signup

Improved signup as required
UBA-GCOEN · Oct 2, 2023 · d36ab7d · d36ab7d
2 parents 1a520cb + 5148eb3
commit d36ab7d
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 14 deletions.
diff --git a/server/src/api/controllers/deleteUser.js b/server/src/api/controllers/deleteUser.js
@@ -45,6 +45,7 @@ export const deleteUser = async (req, res) => {
         "@hotmail.com",
         "@aol.com",
         "@outlook.com",
+        "@gcoen.ac.in",
         ];
 
 

diff --git a/server/src/api/controllers/profile.js b/server/src/api/controllers/profile.js
@@ -25,6 +25,7 @@ export const updateProfile = async (req, res) => {
         "@hotmail.com",
         "@aol.com",
         "@outlook.com",
+        "@gcoen.ac.in",
         ];
 
     var result = {}    
@@ -151,6 +152,7 @@ export const updateProfile = async (req, res) => {
 
 
         res.json({
+            success: true,
             msg: "user "+newResult.role+" updated successfully",
             user: newResult
     })

diff --git a/server/src/api/controllers/user.js b/server/src/api/controllers/user.js
@@ -19,7 +19,7 @@ export const user = async (req, res) => {
  * Route: /user/signup
  * Desc: user sign up
  */
-export const signup = async (req, res) => {
+export const signup = async (req, res, next) => {
        const { email, password, confirmPassword} = req.body
 
 
@@ -37,11 +37,12 @@ export const signup = async (req, res) => {
       /^(?=.*[a-z])(?=.*[A-Z])(?=.*[@$%#^&*])(?=.*[0-9]).{8,}$/;
 
       const emailDomains = [
-       "@gmail.com",
-       "@yahoo.com",
-       "@hotmail.com",
-       "@aol.com",
-       "@outlook.com",
+        "@gmail.com",
+        "@yahoo.com",
+        "@hotmail.com",
+        "@aol.com",
+        "@outlook.com",
+        "@gcoen.ac.in",
        ];
 
 
@@ -102,15 +103,33 @@ export const signup = async (req, res) => {
              });
 
              if(result){
-                res.json({
-                    success: true,
-                    msg: "User Added Successfully !"})
+
+              const oldUser = await userModel.findOne({email})
+
+              const SECRET = process.env.USER_SECRET
+
+              const token = generateToken(oldUser, SECRET);
+
+              req.session.user = {
+                token: token,
+                user: oldUser
+              }
+
+              res.status(200).json({
+                success: true,
+                result: oldUser,
+                token,
+                // csrfToken: req.csrfToken,
+                msg: "User added and logged in successfully"
+              });
              }
            }
            else{
-            res.json({
-                success: false,
-                msg: "user already exist"})
+            res.status(403).json({
+              success: false,
+              msg: "user already exist"
+            })
+
            }
       }
       catch(err){

diff --git a/server/src/api/middlewares/generateToken.js b/server/src/api/middlewares/generateToken.js
@@ -2,7 +2,7 @@ import jwt from "jsonwebtoken";
 import * as dotenv from "dotenv";
 dotenv.config();
 
-const generateToken = (result, SECRET, tokenValidity = "1h") => {
+const generateToken = (result, SECRET, tokenValidity = "7d") => {
   return jwt.sign({ email: result.email, id: result._id }, SECRET, {
     expiresIn: tokenValidity,
   });

diff --git a/server/src/api/models/userModel.js b/server/src/api/models/userModel.js
@@ -5,6 +5,7 @@ import sanitizerPlugin from 'mongoose-sanitizer'
 const userModel = mongoose.Schema({
      id: { type: String },
      name: { type: String },
+     collegeEmail: { type: String },
      email: { type: String, required: true },
      password: { type: String, required: true },
      role: { type: String, default: 'faculty'},

diff --git a/server/src/api/routes/user.js b/server/src/api/routes/user.js
@@ -8,7 +8,7 @@ import {user, signup, signin} from "../controllers/user.js";
 
 
 router.get("/", user)
-router.post("/signup", signup)
+router.post("/signup", session, signup)
 // router.post("/signin", session, csrfProtect, signin)
 router.post("/signin", session, signin)