Merge branch 'develop' into Fernando-Monitorización

.github/workflows/build.yml

@@ -6,6 +6,7 @@ on:
       - develop
       - LaraFMz
       - Pablo-Arreglos
+      - Jota
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:

gatewayservice/gateway-service.js

@@ -28,14 +28,6 @@ app.get('/health', (_req, res) => {
 });
 
 app.post('/login', async (req, res) => {
-  const isValidUser = validateCredentials(req.body.username, req.body.password);
-
-  if (!isValidUser) {
-    // Si las credenciales son inválidas, devuelve un error 401
-    res.status(401).json({ error: 'Credenciales incorrectas' });
-    return; // Termina la ejecución de la función para evitar ejecutar el código restante
-  }
-
   try {
     // Forward the login request to the authentication service
     const authResponse = await axios.post(authServiceUrl+'/login', req.body);
@@ -45,14 +37,26 @@ app.post('/login', async (req, res) => {
   }
 });
 
+
 function validateCredentials(username, password) {
   // Verifica si la contraseña es erronea
-  const invalidPassword = 'no'; 
+  if (password.length < 8) {
+    return false;
+  }
 
-  return !(password === invalidPassword);
+  return true;
 }
 
 app.post('/adduser', async (req, res) => {
+
+  const isValidUser = validateCredentials(req.body.username, req.body.password);
+
+  if (!isValidUser) {
+    // Si las credenciales son inválidas, devuelve un error 401
+    res.status(401).json({ error: 'Credenciales incorrectas. La contraseña debe contener al menos 8 caracteres' });
+    return; // Termina la ejecución de la función para evitar ejecutar el código restante
+  }
+
   try {
     // Forward the add user request to the user service
     const userResponse = await axios.post(userServiceUrl+'/adduser', req.body);

gatewayservice/gateway-service.test.js

@@ -21,31 +21,15 @@ describe('Gateway Service', () => {
       return Promise.resolve({ data: { userId: 'mockedUserId' } });
     }
   });
-
-  /*
-  // Test /login endpoint
-  it('deberia iniciar sesión correctamente', async () => {
-    const response = await request(app)
-      .post('/login')
-      .send({ username: 'testuser', password: 'testpassword' });
-
-    expect(response.statusCode).toBe(200);
-    expect(response.body.token).toBe('mockedToken');
-  });
-  */
 
-  // Prueba de manejo de errores para el endpoint /login
-  it('deberia devolver error al iniciar sesion', async () => {
-    // Datos de prueba para iniciar sesión (incorrectos)
-    const invalidLoginData = {
-        username: 'userInvalido',
-        password: 'no'
-    };
+  // Prueba de manejo de errores para el endpoint /adduser
+  it('deberia devolver error al registrate', async () => {
 
     // Realizamos una solicitud POST al endpoint /login con datos incorrectos
     const response = await request(app)
-      .post('/login')
-      .send(invalidLoginData);
+      .post('/adduser')
+      .send({ username: 'userInvalido', password: 'no' });
+
 
     // Verificamos que la respuesta tenga un código de estado 401 (Unauthorized)
     expect(response.statusCode).toBe(401);

webapp/Dockerfile

@@ -15,4 +15,4 @@ RUN npm install serve
 
 #Execute npm run prod to run the server
 CMD [ "npm", "run", "prod" ]
-#CMD ["npm", "start"]
+#CMD ["npm", "start"]

webapp/e2e/steps/register-form.steps.js → webapp/e2e/steps/01-register-form.steps.js

@@ -30,18 +30,18 @@ defineFeature(feature, test => {
 
     given('An unregistered user', async () => {
       username = "[email protected]"
-      password = "pabloasw"
+      password = "pabloasw1"
       await expect(page).toClick("button", { text: "REGÍSTRATE" });
     });
 
     when('I fill the data in the form and press submit', async () => {
       await expect(page).toFill('input[name="username"]', username);
       await expect(page).toFill('input[name="password"]', password);
-      await expect(page).toClick('button', { text: 'Add User' })
+      await expect(page).toClick('button', { text: 'Crear' })
     });
 
     then('A confirmation message should be shown in the screen', async () => {
-        await expect(page).toMatchElement("div", { text: "User added successfully" });
+        await expect(page).toMatchElement("div", { text: "Usuario creado correctamente" });
     });
   })
 

webapp/e2e/steps/login.steps.js → webapp/e2e/steps/02-login.steps.js

@@ -30,18 +30,18 @@ defineFeature(feature, test => {
 
     given('A user that is logged in the application', async () => {
       username = "[email protected]"
-      password = "pabloasw"
+      password = "pabloasw1"
       await expect(page).toClick("button", { text: "INICIA SESIÓN" });
     });
 
     when('I enter valid username and password', async () => {
       await expect(page).toFill('input[name="username"]', username);
       await expect(page).toFill('input[name="password"]', password);
-      await expect(page).toClick('button', { text: 'Login' })
+      await expect(page).toClick('button', { text: 'Iniciar Sesión' })
     });
 
     then('A confirmation message should be shown in the screen', async () => {
-        await expect(page).toMatchElement("div", { text: "Hello "+username+"!" });
+        await expect(page).toMatchElement("div", { text: "¡Buenas, "+username+"!" });
     });
   })
 

webapp/e2e/steps/home.steps.js → webapp/e2e/steps/03-home.steps.js

@@ -30,14 +30,14 @@ defineFeature(feature, test => {
 
     given('A user that is logged in the application', async () => {
       username = "[email protected]"
-      password = "pabloasw"
+      password = "pabloasw1"
       await expect(page).toClick("button", { text: "INICIA SESIÓN" });
     });
 
     when('I navigate to the Home page', async () => {
       await expect(page).toFill('input[name="username"]', username);
       await expect(page).toFill('input[name="password"]', password);
-      await expect(page).toClick('button', { text: 'Login' })
+      await expect(page).toClick('button', { text: 'Iniciar Sesión' })
 
       await expect(page).toClick('a[href="/"]', { text: 'WIQ 5A' });
       await page.waitForNavigation();

webapp/src/App.test.js

@@ -0,0 +1,68 @@
+import { render, screen } from '@testing-library/react';
+import App from './App';
+
+/*test('renders learn react link', () => {
+  render(<App />);
+  const linkElement = screen.getByText(/Welcome to the 2024 edition of the Software Architecture course/i);
+  expect(linkElement).toBeInTheDocument();
+});
+*/
+
+describe('App', () => {
+
+  it('renders login page when not logged in', () => {
+    render(
+      <MemoryRouter>
+        <App />
+      </MemoryRouter>
+    );
+
+    expect(screen.getByText(/Login/i)).toBeInTheDocument();
+  });
+
+  it('renders home page when logged in', () => {
+    // Mock local storage to simulate being logged in
+    const mockLocalStorage = {
+      getItem: jest.fn(() => 'true'),
+      setItem: jest.fn(),
+      clear: jest.fn()
+    };
+    global.localStorage = mockLocalStorage;
+
+    render(
+      <MemoryRouter>
+        <App />
+      </MemoryRouter>
+    );
+
+    expect(screen.getByText(/Home/i)).toBeInTheDocument();
+  });
+
+  it('redirects to login when trying to access stats page without logging in', () => {
+    render(
+      <MemoryRouter initialEntries={['/stats']}>
+        <App />
+      </MemoryRouter>
+    );
+
+    expect(screen.getByText(/Login/i)).toBeInTheDocument();
+  });
+
+  it('renders stats page when logged in and trying to access stats page', () => {
+    // Mock local storage to simulate being logged in
+    const mockLocalStorage = {
+      getItem: jest.fn(() => 'true'),
+      setItem: jest.fn(),
+      clear: jest.fn()
+    };
+    global.localStorage = mockLocalStorage;
+
+    render(
+      <MemoryRouter initialEntries={['/stats']}>
+        <App />
+      </MemoryRouter>
+    );
+
+    expect(screen.getByText(/Estadisticas/i)).toBeInTheDocument();
+  });
+});

webapp/src/components/AddUser.js

@@ -27,29 +27,29 @@ const AddUser = () => {
   return (
     <Container component="main" maxWidth="xs" sx={{ marginTop: 4 }}>
       <Typography component="h1" variant="h5">
-        Add User
+        Registrar Usuario
       </Typography>
       <TextField
         name="username"
         margin="normal"
         fullWidth
-        label="Username"
+        label="Usuario"
         value={username}
         onChange={(e) => setUsername(e.target.value)}
       />
       <TextField
         name="password"
         margin="normal"
         fullWidth
-        label="Password"
+        label="Contraseña"
         type="password"
         value={password}
         onChange={(e) => setPassword(e.target.value)}
       />
       <Button variant="contained" color="primary" onClick={addUser}>
-        Add User
+        Crear
       </Button>
-      <Snackbar open={openSnackbar} autoHideDuration={6000} onClose={handleCloseSnackbar} message="User added successfully" />
+      <Snackbar open={openSnackbar} autoHideDuration={6000} onClose={handleCloseSnackbar} message="Usuario creado correctamente" />
       {error && (
         <Snackbar open={!!error} autoHideDuration={6000} onClose={() => setError('')} message={`Error: ${error}`} />
       )}

webapp/src/components/Estilos/home.css

@@ -35,6 +35,6 @@
     font-weight: 400;
     /* Añadimos padding para dar más espacio alrededor del texto del botón */
     padding: 1em 4em; 
-    font-family:'Trebuchet MS, sans-serif';
+    font-family:'Trebuchet MS, Arial, Verdana, Tahoma, sans-serif';
 }
 

webapp/src/components/Estilos/juego.css

@@ -67,6 +67,6 @@
 
   body h2 {
     color: white;
-    font-family: 'Verdana, sans-serif';
+    font-family: 'Verdana, Arial, Verdana, Tahoma, sans-serif';
     text-align: center; /* Centra el texto */
   }

webapp/src/components/Login.js

@@ -47,13 +47,13 @@ const Login = ({isLogged, setIsLogged, username, setUsername}) => {
       ) : (
         <div>
           <Typography component="h1" variant="h5">
-            Login
+            Iniciar Sesión
           </Typography>
           <TextField
             name="username"
             margin="normal"
             fullWidth
-            label="Username"
+            label="Usuario"
             value={username}
 
             onChange={(e) => setUsername(e.target.value)}
@@ -62,15 +62,15 @@ const Login = ({isLogged, setIsLogged, username, setUsername}) => {
             name="password"
             margin="normal"
             fullWidth
-            label="Password"
+            label="Contraseña"
             type="password"
             value={password}
             onChange={(e) => setPassword(e.target.value)}
           />
           <Button variant="contained" color="primary" onClick={loginUser}>
-            Login
+            Iniciar Sesión
           </Button>
-          <Snackbar open={openSnackbar} autoHideDuration={6000} onClose={handleCloseSnackbar} message="Login successful" />
+          <Snackbar open={openSnackbar} autoHideDuration={6000} onClose={handleCloseSnackbar} message="Iniciada sesión exitosamente" />
           {error && (
             <Snackbar open={!!error} autoHideDuration={6000} onClose={() => setError('')} message={`Error: ${error}`} />
           )}

webapp/src/components/Pages/Juego.js

@@ -29,7 +29,7 @@ const Juego = ({isLogged, username, numPreguntas}) => {
   const [numRespuestasIncorrectas, setNumRespuestasIncorrectas] = useState(0)
   const [disableFinish, setDisableFinish] = useState(false)
 
-  //const navigate= useNavigate()
+  const navigate= useNavigate()
 
   //Variables para la obtencion y modificacion de estadisticas del usuario y de preguntas
   const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
@@ -201,7 +201,7 @@ const Juego = ({isLogged, username, numPreguntas}) => {
   const clickFinalizar = () => {
     updateStats();
     setDisableFinish(true)
-    //navigate('/')
+    navigate('/')
   }
 
   const handleRestart = () => {

webapp/src/components/Pages/Layout.js

@@ -3,6 +3,8 @@ import React from 'react';
 import {Container, Nav, Navbar} from 'react-bootstrap';
 import PropTypes from 'prop-types'
 
+const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
+
   const Layout = ({ isLogged, setIsLogged }) => {
 
     function onLogout(){
@@ -22,8 +24,12 @@ import PropTypes from 'prop-types'
                   <Nav.Link href="stats">Estadísticas</Nav.Link>
                 }
               </Nav>
+              <Nav>
+                <Nav.Link href={`${apiEndpoint}/api-doc`} target="_blanck">API</Nav.Link>
+              </Nav>
               <Nav>
                 {isLogged ? (
+
                   <Nav.Link onClick={onLogout}>Cerrar sesión</Nav.Link>
                 ) : (
                   <>