bagfix:

- LowerCase
- signup+login

Author: Daemon-L

controllers/auth/index.js

@@ -2,10 +2,12 @@ const signup = require('./signup');
 const login = require('./login');
 const logout = require('./logout');
 const currentUser = require('./currentUser');
+const signupEndLogin = require('./signupEndLogin')
 
 module.exports = {
     signup,
     login,
     logout,
     currentUser,
+    signupEndLogin,
 }

controllers/auth/login.js

@@ -22,8 +22,10 @@ const login = async (req, res) => {
     }
     const token = jwt.sign(peyload, SECRET_KEY, { expiresIn: "24h" });
     await User.findByIdAndUpdate(user._id, { token });
+    
     res.json({
         token,
+        name: user.name,
     });
 };
 

controllers/auth/signup.js

@@ -4,12 +4,14 @@ const { User } = require('../../models/user');
 const { RequestError } = require('../../helpers/index');
 
 const signup = async (req, res) => {
-    const { name, email, password } = req.body;
+    let { name, email, password } = req.body;
+    email = email.toLowerCase();
     const user = await User.findOne({ email });
     if (user) {
         throw RequestError(409, "Email already exist");
     }
     const hashPassword = await bcrypt.hash(password, 10);
+
     const result = await User.create({ name, email, password: hashPassword });
     res.status(201).json({
         name: result.name,

controllers/auth/signupEndLogin.js

@@ -0,0 +1,35 @@
+const bcrypt = require('bcryptjs');
+const jwt = require('jsonwebtoken');
+
+const { User } = require('../../models/user');
+const { RequestError } = require('../../helpers/index');
+const { SECRET_KEY } = process.env;
+
+const signupEndLogin = async (req, res) => { 
+    let { name, email, password } = req.body;
+    // SINGUP *********************************************
+    email = email.toLowerCase();
+    let user = await User.findOne({ email });
+    if (user) {
+        throw RequestError(409, "Email already exist");
+    }
+    const hashPassword = await bcrypt.hash(password, 10);
+    
+    const result = await User.create({ name, email, password: hashPassword });
+
+    //  LOGIN *********************************************
+    user = await User.findOne({ email });
+    const peyload = {
+        id: user._id
+    }
+    const token = jwt.sign(peyload, SECRET_KEY, { expiresIn: "24h" });
+    await User.findByIdAndUpdate(user._id, { token });
+
+    res.status(201).json({
+        name: result.name,
+        email: result.email,
+        token,
+    });
+}
+
+module.exports = signupEndLogin;

models/user.js

@@ -3,8 +3,8 @@ const Joi = require('joi');
 
 const { handleSchemaValidationErrors } = require("../helpers");
 
-const emailRegexp = /^([a-z0-9_-]+\.)*[a-z0-9_-]+@[a-z0-9_-]+(\.[a-z0-9_-]+)*\.[a-z]{2,6}$/;
-// const emailRegexp = /^[\w.]+@[\w]+.[\w]+$/;
+// const emailRegexp = /^([a-z0-9_-]+\.)*[a-z0-9_-]+@[a-z0-9_-]+(\.[a-z0-9_-]+)*\.[a-z]{2,6}$/;
+const emailRegexp = /^[\w.]+@[\w]+.[\w]+$/;
 
 const userShema = new Schema({
   name: {
@@ -34,6 +34,7 @@ userShema.post("save", handleSchemaValidationErrors);
 // ** Joi schemas ***************************************
 const singupSchema = Joi.object({
   name: Joi.string().required(),
+  // email: Joi.string().required(),
   email: Joi.string().pattern(emailRegexp).required(),
   password: Joi.string().min(6).required(), 
   repeat_password: Joi.string().required().valid(Joi.ref('password')),

routes/api/auth.js

@@ -9,7 +9,8 @@ const {googleAuth, googleRedirect} = require('../google/auth_controller');
 
 const router = express.Router()
 
-router.post('/signup', validationBody(schemas.singupSchema) ,ctrlWrapper(controller.signup));
+// router.post('/signup', validationBody(schemas.singupSchema) ,ctrlWrapper(controller.signup));
+router.post('/signup', validationBody(schemas.singupSchema) ,ctrlWrapper(controller.signupEndLogin));
 
 router.post('/login', validationBody(schemas.loginSchema), ctrlWrapper(controller.login));
 

routes/google/auth_controller.js

@@ -68,7 +68,7 @@ const googleRedirect = async (req, res) => {
     //  ***************************************************
 
     //  LOGIN *********************************************
-    user = await User.findOne({ email });;
+    user = await User.findOne({ email });
     const peyload = { id: user._id };
     const token = jwt.sign(peyload, SECRET_KEY, { expiresIn: "24h" });
     await User.findByIdAndUpdate(user._id, { token });