bagfix:google_redirect

Author: Daemon-L

controllers/auth/login.js

@@ -7,7 +7,8 @@ const { User } = require('../../models/user');
 const { SECRET_KEY } = process.env;
 
 const login = async (req, res) => {
-    const { email, password, } = req.body;
+    let { email, password, } = req.body;
+    email = email.toLowerCase();
     const user = await User.findOne({ email });
     if (!user) {
         throw RequestError(401, "Email not found");

models/user.js

@@ -13,6 +13,8 @@ const userShema = new Schema({
   },
   email: {
     type: String,
+    minlength: 6,
+    maxLength: 63,
     required: [true, 'Email is required'],
     match: emailRegexp,
     unique: true,
@@ -34,14 +36,13 @@ 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(), 
+  email: Joi.string().pattern(emailRegexp).min(6).required(),
+  password: Joi.string().min(6).max(6).required(), 
   repeat_password: Joi.string().required().valid(Joi.ref('password')),
 })
 
 const loginSchema = Joi.object({
-  email: Joi.string().pattern(emailRegexp).required(),
+  email: Joi.string().min(6).max(6).pattern(emailRegexp).required(),
   password: Joi.string().min(6).required(),
 })
 

routes/google/auth_controller.js

@@ -58,27 +58,29 @@ const googleRedirect = async (req, res) => {
     const name = userData.data.name;
     let user = await User.findOne({ email });
     if (!user) {
-        // console.log(`user not found!`)
+        console.log(`user not found!`)
         // const password = "111111";
         const password = v4();
         const hashPassword = await bcrypt.hash(password, 10);
-        await User.create({ name, email, password: hashPassword });
+        user = await User.create({ name, email, password: hashPassword });
         console.log(`User was created`)
     }
     //  ***************************************************
 
     //  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 });
     res.json({
         token,
+        name: user.name,
     });
     console.log('Login is successful');
     //  ***************************************************
     // return res.redirect(
-    //     `${process.env.FRONTEND_URL}?email=${userData.data.email}`
+    //     `http://localhost:3001?email=${userData.data.email}`
+    //     // `http://localhost:3001/api/users/current/?token=${token}`
     //     // `${process.env.FRONTEND_URL}?token=${token}`
     // )
 }