Fix confirm email (#6)

Author: Matheus Ishiyama

package.json

@@ -9,7 +9,8 @@
         "test": "jest"
     },
     "jest": {
-        "testEnvironment": "node"
+        "testEnvironment": "node",
+        "slowTestThreshold": 10
     },
     "repository": {
         "type": "git",
@@ -24,7 +25,7 @@
     "homepage": "https://github.com/MatheusIshiyama/chat-app-backend#readme",
     "dependencies": {
         "bcrypt": "^5.0.1",
-        "crypto": "^1.0.1",
+        "cors": "^2.8.5",
         "dotenv": "^8.2.0",
         "email-validator": "^2.0.4",
         "express": "^4.17.1",

src/app.js

@@ -1,7 +1,9 @@
 const express = require("express");
+const cors = require('cors');
 
 //* express setup
 const app = express();
+app.use(cors());
 app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
 

src/controllers/user.js

@@ -2,17 +2,18 @@ const crypto = require("crypto");
 const User = require("../models/user");
 const sendMail = require("../services/sendMail");
 const password = require("../services/password");
+const generateCode = require("../services/generateCode");
 
 const UserController = {
     async register(req, res) {
         const body = req.body;
         const hashPassword = password.hash(body.password);
-        const verifyCode = crypto.randomBytes(128).toString("base64");
+        const code = generateCode();
         const newUser = new User({
             username: body.username.toLowerCase(),
             name: body.name,
             email: body.email,
-            verifyCode,
+            code,
             verified: false,
             password: hashPassword,
             createdAt: Date.now(),
@@ -25,20 +26,20 @@ const UserController = {
             { _id: false, password: false }
         );
 
-        await sendMail(body.email, verifyCode, "Confirm register");
+        await sendMail(body.email, code, "Confirm register");
 
         return res.status(201).json({ user });
     },
 
     async confirm(req, res) {
-        const { verifyCode } = req.params;
+        const { code } = req.body;
 
         await User.findOneAndUpdate(
-            { verifyCode },
-            { verifyCode: "verified", verified: true }
+            { code },
+            { code: "verified", verified: true }
         );
 
-        return res.status(200).json({ error: "User confirmed" });
+        return res.status(200).json({ message: "User confirmed" });
     },
 
     async addPending(req, res) {

src/middlewares/validateCode.js

@@ -1,11 +1,12 @@
 const validateCode = (req, res, next) => {
-    if (!req.params.verifyCode)
-        return res.status(400).json({ error: "No verifyCode provided" });
+    const { code } = req.body;
 
-    if (req.params.verifyCode.length !== 172)
-        return res.status(400).json({ error: "No verifyCode length accept" });
+    if (!code) return res.status(400).json({ error: "No code provided" });
+
+    if (code.length !== 8)
+        return res.status(400).json({ error: "No code length accept" });
 
     next();
 };
 
-module.exports = validateCode;
+module.exports = validateCode;

src/models/user.js

@@ -5,7 +5,7 @@ const User = new database.Schema(
         username: String,
         name: String,
         email: String,
-        verifyCode: String,
+        code: String,
         verified: Boolean,
         password: String,
         createdAt: Date,

src/routes/auth.js

@@ -1,11 +1,11 @@
 const express = require("express");
 const authRoutes = express.Router();
 const authenticate = require("../services/authenticate");
-const validateAuth = require('../middlewares/validateAuth');
+const validateAuth = require("../middlewares/validateAuth");
 
-authRoutes.post("/", validateAuth, (req, res) => {
+authRoutes.post("/", validateAuth, async (req, res) => {
     const { username, password } = req.body;
-    authenticate(username, password, res);
+    await authenticate(username, password, res);
 });
 
 module.exports = authRoutes;

src/routes/user.js

@@ -12,7 +12,7 @@ userRoutes.post("/register", validateRegister, (req, res) => {
     UserController.register(req, res);
 });
 
-userRoutes.get("/confirm/:verifyCode", validateCode, (req, res) => {
+userRoutes.post("/confirm", validateCode, (req, res) => {
     UserController.confirm(req, res);
 });
 

src/services/authenticate.js

@@ -10,6 +10,8 @@ const authenticate = async (username, password, res) => {
     if (!password)
         return res.status(400).json({ error: "No password provided" });
 
+    username = username.toLowerCase();
+
     const userExists = await User.findOne({ username });
 
     if (userExists) {
@@ -29,9 +31,7 @@ const authenticate = async (username, password, res) => {
             return res.status(202).json({ token });
         }
 
-        return res
-            .status(401)
-            .json({ error: "Invalid username or password" });
+        return res.status(401).json({ error: "Invalid username or password" });
     }
     return res.status(401).json({ error: "Invalid username or password" });
 };

src/services/generateCode.js

@@ -0,0 +1,14 @@
+const generateCode = () => {
+    var result = [];
+    const characters =
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    var charactersLength = characters.length;
+    for (var i = 0; i < 8; i++) {
+        result.push(
+            characters.charAt(Math.floor(Math.random() * charactersLength))
+        );
+    }
+    return result.join("");
+};
+
+module.exports = generateCode;

src/services/sendMail.js

@@ -10,9 +10,9 @@ const transporter = nodeMailer.createTransport({
     },
 });
 
-const sendEmail = async (email, verifyCode, subject) => {
+const sendEmail = async (email, code, subject) => {
     if (!email) return "No email provided";
-    if (!verifyCode) return "No verifyCode provided";
+    if (!code) return "No code provided";
     if (!subject) return "No subject provided";
 
     const isValid = validateBody.email(email);
@@ -22,7 +22,7 @@ const sendEmail = async (email, verifyCode, subject) => {
         from: process.env.EMAIL,
         to: email,
         subject,
-        text: `${process.env.CONFIRM_URL}/${verifyCode}`,
+        text: `Verify code is:\n ${code}`,
     };
 
     await transporter.sendMail(mailOptions);