Merge branch 'webapp_interface' of https://github.com/Arquisoft/wiq_es6c

into webapp_interface
Arquisoft · Apr 29, 2024 · 4fe11ff · 4fe11ff
2 parents 43ce04f + b10c335
commit 4fe11ff
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/webapp/src/components/AddUser.js b/webapp/src/components/AddUser.js
@@ -24,30 +24,20 @@ const AddUser = () => {
       setError('Las contraseñas no coinciden.');
     } else {
       try {
-        const isAvailable = await checkUsernameAvailability(username, password);
-        if (isAvailable != false) {
+        try {
+          await axios.post(`${apiEndpoint}/login`, { username, password });
           setError('Usuario ya registrado.');
-          return; 
+          setOpenSnackbar(false);
+        } catch (error) {
+          await axios.post(`${apiEndpoint}/adduser`, { username, password });
+          setOpenSnackbar(true);
         }
-
-        await axios.post(`${apiEndpoint}/adduser`, { username, password });
-        setOpenSnackbar(true);
       } catch (error) {
         setError(error.response.data.error);
       }
     }
   };
 
-  const checkUsernameAvailability = async (username, password) => {
-    try {
-      const response = await axios.post(`${apiEndpoint}/check-username`, { username });
-      return response.data; 
-    } catch (error) {
-      console.error("Error al comprobar la disponibilidad del nombre de usuario:", error);
-      return false; 
-    }
-  }
-
   const handleCloseSnackbar = () => {
     setOpenSnackbar(false);
   };

diff --git a/webapp/src/components/AddUser.test.js b/webapp/src/components/AddUser.test.js
@@ -19,7 +19,7 @@ describe('AddUser component', () => {
     const usernameInput = screen.getByLabelText(/Usuario/i);
     const passwordInput = screen.getAllByLabelText(/Contraseña/i)[0];
     const confirmPasswordInput = screen.getByLabelText(/Repetir contraseña/i);
-    const addUserButton = document.getElementsByClassName('inner')[0]
+    const addUserButton = document.getElementsByClassName('inner')[0];
 
     // Mock the axios.post request to simulate a successful response
     mockAxios.onPost('http://localhost:8000/adduser').reply(200);
@@ -38,6 +38,14 @@ describe('AddUser component', () => {
     await waitFor(() => {
       expect(screen.getByText(/Usuario añadido correctamente/i)).toBeInTheDocument();
     });
+
+    /*
+    fireEvent.click(addUserButton);
+    // Wait for the Snackbar to be open
+    await waitFor(() => {
+      expect(screen.getByText(/Usuario ya registrado./i)).toBeInTheDocument();
+    });
+    */
   });
 
   it('try to add user but not introduce name', async () => {

diff --git a/webapp/src/components/game/GameConfiguration.js b/webapp/src/components/game/GameConfiguration.js
@@ -58,14 +58,12 @@ const GameConfiguration = () => {
     console.log(numPreguntas);
     console.log(numRes);
 
-    await generateGameId();  
+    gameId = await generateGameId();  
     await getQuestions();
     //isApiCalledRef = true//ASK - is this necessary?
     navigation("/firstGame", {state: {questions, gameId}})
   }
 
-  gameId = generateGameId();
-
   function formatearTopics() {
     let topicsFormated = '';