Refactored tests (#4)

Author: Matheus Ishiyama

src/controllers/user.js

@@ -27,7 +27,7 @@ const UserController = {
 
         await sendMail(body.email, verifyCode, "Confirm register");
 
-        return res.status(201).json({ message: user });
+        return res.status(201).json({ user });
     },
 
     async confirm(req, res) {
@@ -38,7 +38,7 @@ const UserController = {
             { verifyCode: "verified", verified: true }
         );
 
-        return res.status(200).json({ message: "User confirmed" });
+        return res.status(200).json({ error: "User confirmed" });
     },
 
     async addPending(req, res) {
@@ -57,7 +57,7 @@ const UserController = {
             { $push: { requests: userId } }
         );
 
-        return res.status(200).json({ message: "Pending added" });
+        return res.status(200).json({ error: "Pending added" });
     },
 
     async removePending(req, res) {
@@ -76,7 +76,7 @@ const UserController = {
             { $pull: { requests: userId } }
         );
 
-        return res.status(200).json({ message: "Pending removed" });
+        return res.status(200).json({ error: "Pending removed" });
     },
 
     async addFriend(req, res) {
@@ -101,7 +101,7 @@ const UserController = {
             }
         );
 
-        return res.status(200).json({ message: "Friend added" });
+        return res.status(200).json({ error: "Friend added" });
     },
 
     async removeFriend(req, res) {
@@ -120,7 +120,7 @@ const UserController = {
             { $pull: { friendList: userId } }
         );
 
-        return res.status(200).json({ message: "Friend removed" });
+        return res.status(200).json({ error: "Friend removed" });
     },
 };
 

src/middlewares/authenticate.js

@@ -4,20 +4,20 @@ require("dotenv").config();
 const authenticate = (req, res, next) => {
     const authHeader = req.headers.authorization;
     if (!authHeader)
-        return res.status(401).json({ message: "No token provided" });
+        return res.status(401).json({ error: "No token provided" });
 
     const parts = authHeader.split(" ");
 
     if (!(parts.length === 2))
-        return res.status(401).json({ message: "Token error" });
+        return res.status(401).json({ error: "Token error" });
 
     const [scheme, token] = parts;
 
     if (!/^Bearer$/i.test(scheme))
-        return res.status(401).json({ message: "Token malformatted" });
+        return res.status(401).json({ error: "Token malformatted" });
 
     jwt.verify(token, process.env.JWT_SECRET, (err, decoded) => {
-        if (err) return res.status(401).json({ message: "Invalid token" });
+        if (err) return res.status(401).json({ error: "Invalid token" });
 
         req.userId = decoded.id;
         next();

src/middlewares/validateAuth.js

@@ -1,8 +1,8 @@
 const validateAuth = (req, res, next) => {
     if (!req.body.username)
-        return res.status(400).json({ message: "No username provided" });
+        return res.status(400).json({ error: "No username provided" });
     if (!req.body.password)
-        return res.status(400).json({ message: "No password provided" });
+        return res.status(400).json({ error: "No password provided" });
 
     next();
 };

src/middlewares/validateCode.js

@@ -1,9 +1,9 @@
 const validateCode = (req, res, next) => {
     if (!req.params.verifyCode)
-        return res.status(400).json({ message: "No verifyCode provided" });
+        return res.status(400).json({ error: "No verifyCode provided" });
 
     if (req.params.verifyCode.length !== 172)
-        return res.status(400).json({ message: "No verifyCode length accept" });
+        return res.status(400).json({ error: "No verifyCode length accept" });
 
     next();
 };

src/middlewares/validateFriend.js

@@ -4,18 +4,18 @@ const validateFriend = async (req, res, next) => {
     const { friendId } = req.body;
 
     if (!friendId)
-        return res.status(400).json({ message: "No friendId provided" });
+        return res.status(400).json({ error: "No friendId provided" });
 
     try {
         const isValid = await User.findOne({ _id: friendId });
 
         if (!isValid)
-            return res.status(404).json({ message: "User not found" });
+            return res.status(404).json({ error: "User not found" });
 
         if (!isValid.verified)
-            return res.status(404).json({ message: "User not found" });
+            return res.status(404).json({ error: "User unverified" });
     } catch (error) {
-        return res.status(404).json({ message: "User not found" });
+        return res.status(404).json({ error: "User not found" });
     }
 
     next();

src/middlewares/validateRegister.js

@@ -9,37 +9,37 @@ const validateRegister = async (req, res, next) => {
     if (!validateBody.username(username)) {
         return res
             .status(400)
-            .json({ message: "No username provided or no length accept" });
+            .json({ error: "No username provided or no length accept" });
     }
 
     if (!validateBody.name(name))
         return res
             .status(400)
-            .json({ message: "No name provided or no length accept" });
+            .json({ error: "No name provided or no length accept" });
 
     if (!EmailValidator.validate(email))
         return res
             .status(400)
-            .json({ message: "No email provided or invalid format" });
+            .json({ error: "No email provided or invalid format" });
 
     if (!validateBody.password(password))
         return res
             .status(400)
-            .json({ message: "No password provided or doesn't match params" });
+            .json({ error: "No password provided or doesn't match params" });
 
     if (!validateBody.checkPassword(password, checkPassword))
         return res.status(400).json({
-            message: "No checkPassword provided or passwords doesn't match",
+            error: "No checkPassword provided or passwords doesn't match",
         });
 
     //* verify if user exists
-    const userExists = await User.findOne({ username });
+    const userExists = await User.findOne({ username: username.toLowerCase() });
     const emailExists = await User.findOne({ email });
 
     if (userExists || emailExists)
         return res
             .status(400)
-            .json({ message: "Username or Email already exists" });
+            .json({ error: "Username or Email already exists" });
 
     next();
 };

src/services/authenticate.js

@@ -5,10 +5,10 @@ require("dotenv").config();
 
 const authenticate = async (username, password, res) => {
     if (!username)
-        return res.status(400).json({ message: "No username provided" });
+        return res.status(400).json({ error: "No username provided" });
 
     if (!password)
-        return res.status(400).json({ message: "No password provided" });
+        return res.status(400).json({ error: "No password provided" });
 
     const userExists = await User.findOne({ username });
 
@@ -19,7 +19,7 @@ const authenticate = async (username, password, res) => {
             userExists.password = undefined;
 
             if (!userExists.verified)
-                return res.status(401).json({ message: "User unverified" });
+                return res.status(401).json({ error: "User unverified" });
 
             const token = jwt.sign(
                 { id: userExists._id },
@@ -31,9 +31,9 @@ const authenticate = async (username, password, res) => {
 
         return res
             .status(401)
-            .json({ message: "Invalid username or password" });
+            .json({ error: "Invalid username or password" });
     }
-    return res.status(401).json({ message: "Invalid username or password" });
+    return res.status(401).json({ error: "Invalid username or password" });
 };
 
 module.exports = authenticate;

src/services/sendMail.js

@@ -11,12 +11,12 @@ const transporter = nodeMailer.createTransport({
 });
 
 const sendEmail = async (email, verifyCode, subject) => {
-    if (!email) return "no email provided";
-    if (!verifyCode) return "no verifyCode provided";
-    if (!subject) return "no subject provided";
+    if (!email) return "No email provided";
+    if (!verifyCode) return "No verifyCode provided";
+    if (!subject) return "No subject provided";
 
     const isValid = validateBody.email(email);
-    if (!isValid) return "invalid email type";
+    if (!isValid) return "Invalid email format";
 
     const mailOptions = {
         from: process.env.EMAIL,
@@ -27,7 +27,7 @@ const sendEmail = async (email, verifyCode, subject) => {
 
     await transporter.sendMail(mailOptions);
 
-    return "email sent";
+    return "Email sent";
 };
 
 module.exports = sendEmail;