add: added user pages, and last messages to the home page

back/api/auth.js

@@ -31,6 +31,11 @@ router.post('/register', async (req, res) => {
         return res.status(401).send({ error: 'Username already exists' });
     }
 
+    if (!/^[a-zA-Z0-9-_]+$/.test(username)) {
+        connection.end();
+        return res.status(400).send({ error: 'Invalid username' });
+    }
+
     const hash = sha256(password);
     await addUser(connection, username, hash);
     connection.end();

back/api/channels.js

@@ -1,6 +1,6 @@
 const express = require('express');
 const jwt = require('jsonwebtoken');
-const { getConnection, getUser, getChannels, getChannel, addChannel, getMessages, addMessage, deleteMessage } = require('../libs/mysql');
+const { getConnection, getUser, getChannels, getChannel, addChannel, getMessages, addMessage, deleteMessage, getLastMessages } = require('../libs/mysql');
 
 const router = express.Router();
 

back/api/lastmessages.js

@@ -0,0 +1,14 @@
+const express = require('express');
+const jwt = require('jsonwebtoken');
+const { getConnection, getLastMessages } = require('../libs/mysql');
+
+const router = express.Router();
+
+router.get('/', async (req, res) => {
+    const connection = await getConnection();
+    const messages = await getLastMessages(connection);
+    connection.end();
+    res.send(messages);
+});
+
+module.exports = router;

back/api/users.js

@@ -1,19 +1,26 @@
 const express = require('express');
-const sha256 = require("sha256");
-const { getConnection, getUser, addUser } = require('../libs/mysql');
+const { getConnection, getUserByUsername, getUserLastMessages } = require('../libs/mysql');
 
 const router = express.Router();
 
-router.get('/:id', async (req, res) => {
-    const id = req.params.id;
+router.get('/:username', async (req, res) => {
+    const username = req.params.username;
     const connection = await getConnection();
-    const users = await getUser(connection, id);
+    const user = await getUserByUsername(connection, username);
     connection.end();
-    if (users[0]) {
-        res.send({id: users[0].id, username: users[0].username, admin: users[0].admin});
+    if (user[0]) {
+        res.send({id: user[0].id, username: user[0].username, admin: user[0].admin});
     } else {
         res.send('No user found');
     }
 });
 
+router.get('/:username/lastmessages', async (req, res) => {
+    const username = req.params.username;
+    const connection = await getConnection();
+    const messages = await getUserLastMessages(connection, username);
+    connection.end();
+    res.send(messages);
+});
+
 module.exports = router;

back/libs/mysql.js

@@ -51,6 +51,20 @@ function addUser(connection, username, password) {
   });
 }
 
+function getUserLastMessages(connection, username) {
+    return new Promise((resolve, reject) => {
+        connection.query(
+        `SELECT messages.id, user_id, username, content, date, channels.name AS channel_name FROM messages JOIN users ON messages.user_id = users.id JOIN channels ON messages.channel_id = channels.id WHERE username = "${username}" ORDER BY date DESC LIMIT 5`,
+        (error, result) => {
+            if (error) {
+            reject(new Error(error));
+            }
+            resolve(result);
+        }
+        );
+    });
+}
+
 function getChannels(connection) {
   return new Promise((resolve, reject) => {
     connection.query(
@@ -96,7 +110,21 @@ function addChannel(connection, name, description, owner_id) {
 function getMessages(connection, channel_id) {
     return new Promise((resolve, reject) => {
         connection.query(
-        `SELECT messages.id, user_id, username, content, date FROM messages JOIN users ON messages.user_id = users.id WHERE channel_id = ${channel_id} ORDER BY date DESC`,
+        `SELECT messages.id, user_id, username, content, date, channels.name AS channel_name FROM messages JOIN users ON messages.user_id = users.id JOIN channels ON messages.channel_id = channels.id WHERE channel_id = ${channel_id} ORDER BY date DESC`,
+        (error, result) => {
+            if (error) {
+            reject(new Error(error));
+            }
+            resolve(result);
+        }
+        );
+    });
+}
+
+function getLastMessages(connection) {
+    return new Promise((resolve, reject) => {
+        connection.query(
+        `SELECT messages.id, user_id, username, content, date, channels.name AS channel_name FROM messages JOIN users ON messages.user_id = users.id JOIN channels ON messages.channel_id = channels.id ORDER BY date DESC LIMIT 5`,
         (error, result) => {
             if (error) {
             reject(new Error(error));
@@ -140,10 +168,12 @@ module.exports = {
   getUser,
   getUserByUsername,
   addUser,
+  getUserLastMessages,
   getChannels,
   getChannel,
   addChannel,
   getMessages,
+  getLastMessages,
   addMessage,
   deleteMessage
 };