feat: added users page

backend/src/app.js

@@ -82,6 +82,5 @@ app.use(async (err, req, res, next) => {
 		console.log(err);
 		return res.status(500).json(errors);
 	}
-	console.log(err);
 	return res.status(500).json({ error: "Internal server error" });
 });

backend/src/controllers/ContactController.js

@@ -8,7 +8,7 @@ const { getIO } = require("../libs/socket");
 const { getWbot } = require("../libs/wbot");
 
 exports.index = async (req, res) => {
-	const { searchParam = "", pageNumber = 1, rowsPerPage = 10 } = req.query;
+	const { searchParam = "", pageNumber = 1 } = req.query;
 
 	const whereCondition = {
 		[Op.or]: [
@@ -23,7 +23,7 @@ exports.index = async (req, res) => {
 		],
 	};
 
-	let limit = +rowsPerPage;
+	let limit = 20;
 	let offset = limit * (pageNumber - 1);
 
 	const { count, rows: contacts } = await Contact.findAndCountAll({
@@ -33,7 +33,9 @@ exports.index = async (req, res) => {
 		order: [["createdAt", "DESC"]],
 	});
 
-	return res.json({ contacts, count });
+	const hasMore = count > offset + contacts.length;
+
+	return res.json({ contacts, count, hasMore });
 };
 
 exports.store = async (req, res) => {

backend/src/controllers/TicketController.js

@@ -16,7 +16,7 @@ exports.index = async (req, res) => {
 		showAll,
 	} = req.query;
 
-	const userId = req.userId;
+	const userId = req.user.id;
 
 	const limit = 20;
 	const offset = limit * (pageNumber - 1);

backend/src/controllers/UserController.js

@@ -1,34 +1,101 @@
-const { validationResult } = require("express-validator");
+const Sequelize = require("sequelize");
+const Yup = require("yup");
+const { Op } = require("sequelize");
 
 const User = require("../models/User");
 
+const { getIO } = require("../libs/socket");
+
 exports.index = async (req, res) => {
-	// const { searchParam = "", pageNumber = 1 } = req.query;
+	const { searchParam = "", pageNumber = 1, rowsPerPage = 10 } = req.query;
 
-	const users = await User.findAll({ attributes: ["name", "id", "email"] });
+	const whereCondition = {
+		[Op.or]: [
+			{
+				name: Sequelize.where(
+					Sequelize.fn("LOWER", Sequelize.col("name")),
+					"LIKE",
+					"%" + searchParam.toLowerCase() + "%"
+				),
+			},
+			{ email: { [Op.like]: `%${searchParam.toLowerCase()}%` } },
+		],
+	};
 
-	return res.status(200).json(users);
+	let limit = +rowsPerPage;
+	let offset = limit * (pageNumber - 1);
+
+	const { count, rows: users } = await User.findAndCountAll({
+		attributes: ["name", "id", "email", "profile"],
+		where: whereCondition,
+		limit,
+		offset,
+		order: [["createdAt", "DESC"]],
+	});
+
+	return res.status(200).json({ users, count });
 };
 
 exports.store = async (req, res, next) => {
-	const errors = validationResult(req);
+	const schema = Yup.object().shape({
+		name: Yup.string().required().min(2),
+		email: Yup.string()
+			.email()
+			.required()
+			.test(
+				"Check-email",
+				"An user with this email already exists",
+				async value => {
+					const userFound = await User.findOne({ where: { email: value } });
+					return !Boolean(userFound);
+				}
+			),
+		password: Yup.string().required().min(5),
+	});
 
-	if (!errors.isEmpty()) {
-		return res
-			.status(400)
-			.json({ error: "Validation failed", data: errors.array() });
-	}
+	await schema.validate(req.body);
 
-	const { name, id, email } = await User.create(req.body);
+	const io = getIO();
 
-	res.status(201).json({ message: "User created!", userId: id });
+	const { name, id, email, profile } = await User.create(req.body);
+
+	io.emit("user", {
+		action: "create",
+		user: { name, id, email, profile },
+	});
+
+	return res.status(201).json({ message: "User created!", userId: id });
+};
+
+exports.show = async (req, res) => {
+	const { userId } = req.params;
+
+	const { id, name, email, profile } = await User.findByPk(userId);
+
+	return res.status(200).json({
+		id,
+		name,
+		email,
+		profile,
+	});
 };
 
 exports.update = async (req, res) => {
+	const schema = Yup.object().shape({
+		name: Yup.string().min(2),
+		email: Yup.string().email(),
+		password: Yup.string(),
+	});
+
+	console.log("cai aqui");
+
+	await schema.validate(req.body);
+
+	const io = getIO();
 	const { userId } = req.params;
 
 	const user = await User.findByPk(userId, {
-		attributes: ["name", "id", "email"],
+		attributes: ["name", "id", "email", "profile"],
 	});
 
 	if (!user) {
@@ -37,12 +104,16 @@ exports.update = async (req, res) => {
 
 	await user.update(req.body);
 
-	//todo, send socket IO to users channel.
+	io.emit("user", {
+		action: "update",
+		user: user,
+	});
 
-	res.status(200).json(user);
+	return res.status(200).json(user);
 };
 
 exports.delete = async (req, res) => {
+	const io = getIO();
 	const { userId } = req.params;
 
 	const user = await User.findByPk(userId);
@@ -53,5 +124,10 @@ exports.delete = async (req, res) => {
 
 	await user.destroy();
 
-	res.status(200).json({ message: "User deleted" });
+	io.emit("user", {
+		action: "delete",
+		userId: userId,
+	});
+
+	return res.status(200).json({ message: "User deleted" });
 };

backend/src/database/migrations/20200901235509-add-profile-column-to-users.js

@@ -0,0 +1,15 @@
+"use strict";
+
+module.exports = {
+	up: (queryInterface, Sequelize) => {
+		return queryInterface.addColumn("Users", "profile", {
+			type: Sequelize.STRING,
+			allowNull: false,
+			defaultValue: "admin",
+		});
+	},
+
+	down: queryInterface => {
+		return queryInterface.removeColumn("Users", "profile");
+	},
+};

backend/src/middleware/is-auth.js

@@ -1,5 +1,7 @@
 const jwt = require("jsonwebtoken");
+const util = require("util");
 
+const User = require("../models/User");
 const authConfig = require("../config/auth");
 
 module.exports = async (req, res, next) => {
@@ -11,12 +13,24 @@ module.exports = async (req, res, next) => {
 
 	const [, token] = authHeader.split(" ");
 
-	jwt.verify(token, authConfig.secret, (error, result) => {
-		if (error) {
-			return res.status(401).json({ error: "Invalid token" });
+	try {
+		const decoded = await util.promisify(jwt.verify)(token, authConfig.secret);
+
+		const user = await User.findByPk(decoded.userId, {
+			attributes: ["id", "name", "profile", "email"],
+		});
+
+		if (!user) {
+			return res
+				.status(401)
+				.json({ error: "The token corresponding user does not exists." });
 		}
-		req.userId = result.userId;
-		// todo >> find user in DB and store in req.user to use latter, or throw an error if user not exists anymore
-		next();
-	});
+
+		req.user = user;
+
+		return next();
+	} catch (err) {
+		console.log(err);
+		return res.status(401).json({ error: "Invalid Token" });
+	}
 };

backend/src/models/User.js

@@ -7,6 +7,7 @@ class User extends Sequelize.Model {
 			{
 				name: { type: Sequelize.STRING },
 				password: { type: Sequelize.VIRTUAL },
+				profile: { type: Sequelize.STRING, defaultValue: "admin" },
 				passwordHash: { type: Sequelize.STRING },
 				email: { type: Sequelize.STRING },
 			},

backend/src/routes/auth.js

@@ -1,9 +1,12 @@
 const express = require("express");
 const SessionController = require("../controllers/SessionController");
+const UserController = require("../controllers/UserController");
 const isAuth = require("../middleware/is-auth");
 
 const routes = express.Router();
 
+routes.post("/signup", UserController.store);
+
 routes.post("/login", SessionController.store);
 
 routes.get("/check", isAuth, (req, res) => {

backend/src/routes/users.js

@@ -1,5 +1,4 @@
 const express = require("express");
-const { body } = require("express-validator");
 const User = require("../models/User");
 
 const isAuth = require("../middleware/is-auth");
@@ -9,28 +8,12 @@ const routes = express.Router();
 
 routes.get("/users", isAuth, UserController.index);
 
-routes.post(
-	"/users",
-	[
-		body("email")
-			.isEmail()
-			.withMessage("Email inválido")
-			.custom((value, { req }) => {
-				return User.findOne({ where: { email: value } }).then(user => {
-					if (user) {
-						return Promise.reject("An user with this email already exists!");
-					}
-				});
-			})
-			.normalizeEmail(),
-		body("password").trim().isLength({ min: 5 }),
-		body("name").trim().not().isEmpty(),
-	],
-	UserController.store
-);
+routes.post("/users", isAuth, UserController.store);
 
 routes.put("/users/:userId", isAuth, UserController.update);
 
+routes.get("/users/:userId", isAuth, UserController.show);
+
 routes.delete("/users/:userId", isAuth, UserController.delete);
 
 module.exports = routes;

backend/src/services/wbotMessageListener.js

@@ -137,7 +137,7 @@ const wbotMessageListener = () => {
 	const io = getIO();
 
 	wbot.on("message_create", async msg => {
-		// console.log(msg);
+		console.log(msg);
 		if (
 			msg.from === "status@broadcast" ||
 			msg.type === "location" ||