current-user

docker-compose.yml

@@ -32,6 +32,10 @@ services:
     image: ghcr.io/arquisoft/wiq_7/userservice:latest
     profiles: ['dev', 'prod']
     build: ./users/userservice
+    volumes:
+      - ./errors:/usr/src/userservice/errors
+      - ./middleware:/usr/src/userservice/middleware
+      - ./utils:/usr/src/userservice/utils
     depends_on:
       - mongodb
     ports:

gatewayservice/gateway-service.js

@@ -65,7 +65,7 @@ app.post('/login', async (req, res) => {
 app.get('/logout', async (req, res) => {
   try {
     // Forward the login request to the authentication service
-    const authResponse = await axios.get(authServiceUrl + '/logout', req.body);
+    const authResponse = await axios.get(authServiceUrl + '/logout');
     res.json(authResponse.data);
   } catch (error) {
     res
@@ -90,10 +90,25 @@ app.post('/adduser', async (req, res) => {
 });
 
 app.get('/users', async (req, res) => {
-  console.log(req);
   try {
     // Forward the get users request to the user service
-    const userResponse = await axios.get(userServiceUrl + '/users', req.body);
+    const userResponse = await axios.get(userServiceUrl + '/users');
+    res.json(userResponse.data);
+  } catch (error) {
+    res
+      .status(error.response.status)
+      .json({ error: error.response.data.error });
+  }
+});
+
+app.get('/current-user', async (req, res) => {
+  try {
+    // Forward the get users request to the user service
+    const userResponse = await axios.get(userServiceUrl + '/current-user', {
+      headers: {
+        Authorization: req.headers.authorization,
+      },
+    });
     res.json(userResponse.data);
   } catch (error) {
     res
@@ -126,8 +141,7 @@ app.get('/questions', async (req, res) => {
   try {
     // Forward the get question request to the question asking service
     const getQuestionResponse = await axios.get(
-      questionServiceUrl + '/questions',
-      req.body
+      questionServiceUrl + '/questions'
     );
     res.json(getQuestionResponse.data);
   } catch (error) {
@@ -179,10 +193,7 @@ app.post('/addstat', async (req, res) => {
 app.get('/stats', async (req, res) => {
   try {
     // Forward the get stats request to the stat service
-    const getStatsResponse = await axios.get(
-      statServiceUrl + '/stats',
-      req.body
-    );
+    const getStatsResponse = await axios.get(statServiceUrl + '/stats');
     res.json(getStatsResponse.data);
   } catch (error) {
     res

middleware/auth-middleware.js

@@ -12,6 +12,10 @@ export const authenticateUser = (req, res, next) => {
 
     const { userId, role } = verifyJWT(token);
     req.user = { userId, role };
+
+    console.log('auth mw req.user');
+    console.log(req.user);
+
     next();
   } catch (error) {
     throw new UnauthenticatedError('Authentication invalid');

users/userservice/package.json

@@ -25,6 +25,8 @@
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
     "express": "^4.18.2",
+    "http-status-codes": "^2.3.0",
+    "jsonwebtoken": "^9.0.2",
     "mongoose": "^8.0.4"
   },
   "devDependencies": {

users/userservice/user-controller.js

@@ -46,9 +46,9 @@ export const getUsersController = async (req, res) => {
 
 export const getCurrentUserController = async (req, res) => {
   try {
+    console.log(req.user.userId);
     const user = await User.findOne({ _id: req.user.userId }); // Fetch current user
-    const userWithoutPassword = user.toJSON;
-    res.json(userWithoutPassword);
+    res.json({ user: user });
   } catch (error) {
     res.status(500).json({ error: error.message });
   }

users/userservice/user-router.js

@@ -1,11 +1,17 @@
 // userRouter.js
 import express from 'express';
-import { addUserController, getUsersController } from './user-controller.js';
+import {
+  addUserController,
+  getUsersController,
+  getCurrentUserController,
+} from './user-controller.js';
+import { authenticateUser } from './middleware/auth-middleware.js';
 
 const userRouter = express.Router();
 
 // Define la ruta para el login y asocia el controlador
 userRouter.post('/adduser', addUserController);
 userRouter.get('/users', getUsersController);
+userRouter.get('/current-user', authenticateUser, getCurrentUserController);
 
 export default userRouter;

utils/tokenUtils.js

@@ -9,8 +9,6 @@ export const createJWT = (payload) => {
 };
 
 export const verifyJWT = (token) => {
-  console.log('verjwt');
-  console.log(token);
   const decoded = jwt.verify(token, 'your-secret-key'); // process.env.JWT_SECRET);
   return decoded;
 };

webapp/src/App.jsx

@@ -13,6 +13,9 @@ import {
   Admin,
 } from './pages';
 
+import { loader as dashboardLoader } from './pages/DashboardLayout';
+import { loader as adminLoader } from './pages/Admin';
+
 export const checkDefaultTheme = () => {
   const isDarkTheme = localStorage.getItem('darkTheme') === 'true';
   document.body.classList.toggle('dark-theme', isDarkTheme);
@@ -42,6 +45,7 @@ const router = createBrowserRouter([
       {
         path: 'dashboard',
         element: <DashboardLayout />,
+        loader: dashboardLoader,
         children: [
           {
             index: true,
@@ -62,6 +66,7 @@ const router = createBrowserRouter([
           {
             path: 'admin',
             element: <Admin />,
+            loader: adminLoader,
           },
         ],
       },

webapp/src/assets/wrappers/AddQuestionContainer.js

@@ -1,8 +1,16 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.section`
+  background: var(--background-secondary-color);
+  border-radius: var(--border-radius);
   display: grid;
+  grid-template-rows: 1fr auto;
+  grid-template-columns: repeat(3, 1fr);
   row-gap: 2rem;
+  column-gap: 2rem;
+
+  margin: 0.5rem auto;
+  padding: 1rem;
   @media (min-width: 768px) {
     grid-template-columns: 1fr 1fr;
     column-gap: 1rem;

webapp/src/components/LogoutContainer.jsx

@@ -15,7 +15,7 @@ const LogoutContainer = () => {
         onClick={() => setShowLogout(!showLogout)}
       >
         <FaUserCircle />
-        {user?.name}
+        {user?.username}
         <FaCaretDown />
       </button>
       <div className={showLogout ? 'dropdown show-dropdown' : 'dropdown'}>

webapp/src/pages/AddUser.jsx

@@ -31,7 +31,7 @@ const AddUser = () => {
       // Añadir un retardo antes de navegar
       setTimeout(() => {
         navigate('/login');
-      }, 2000); // 2000 ms = 2 segundos
+      }, 1000); // 1000 ms = 1 segundos
     } catch (error) {
       setError(error.response?.data?.error || 'An error occurred');
     }

webapp/src/pages/Admin.jsx

@@ -1,6 +1,30 @@
+import { useLoaderData, redirect } from 'react-router-dom';
+import axios from 'axios';
+import Wrapper from '../assets/wrappers/StatsContainer';
 import { AddQuestionContainer } from '../components';
 
+const apiEndpoint =
+  process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
+
+export const loader = async () => {
+  try {
+    const token = localStorage.getItem('token');
+    const response = await axios.get(`${apiEndpoint}/current-user`, {
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+    });
+
+    return response.data;
+  } catch (error) {
+    console.log('You are not authorized to view this page');
+    return redirect('/dashboard');
+  }
+};
+
 const Admin = () => {
+  const { user } = useLoaderData();
+
   return <AddQuestionContainer />;
 };