R!! Update client

Gesma94 · Mar 23, 2024 · 0775069 · 0775069
1 parent dbd3ed9
commit 0775069
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/client/src/common/constants.ts b/client/src/common/constants.ts
@@ -1,3 +1,5 @@
+import { PARAM_KEY } from "@shared/constants/SharedConstants";
+
 /** Specifies the base URL for API calls */
 export const BASE_API_URL = import.meta.env.VITE_SERVER_BASE_URL;
 
@@ -12,11 +14,6 @@ export const LOCAL_STORAGE_CONST = {
     USER_USERNAME_KEY: '__word_impostor_user_username__'
 } as const;
 
-/** Object that contains constants related to query parameter keys */
-export const PARAM_KEY = {
-    MASTER_UUID: "master-uuid"
-} as const;
-
 export const ROUTES = {
     ROOM: "/room",
     ERROR: "/error",

diff --git a/client/src/routes/JoinRoom/JoinRoom.tsx b/client/src/routes/JoinRoom/JoinRoom.tsx
@@ -29,13 +29,19 @@ export const JoinRoom = () => {
         try {
             const apiResponse = await fetch(`${apiUrl}/room/${roomId()}/exists`);
             await Utils.delay(1000);
-
-            if (apiResponse.ok) {
-                navigate(`/room/${roomId()}`);
+            
+            if (!apiResponse.ok) {
+                setError(`Error while communicating with the server`);
             }
-            else {
+
+            const apiResult = new Boolean(apiResponse.text());
+
+            if (!apiResult) {
                 setError(`Cannot connect to room '${roomId()}'`);
+                return;
             }
+
+            navigate(`/room/${roomId()}`);
         }
         catch (e) {
             setError(`Error while communicating with the server`);

diff --git a/client/src/routes/Room/Master/RoomMaster.tsx b/client/src/routes/Room/Master/RoomMaster.tsx
@@ -207,6 +207,13 @@ export const RoomMaster = () => {
                 return;
             }
 
+            const apiResult = new Boolean(apiResponse.text());
+
+            if (!apiResult) {
+                navigate('/error');
+                return;
+            }
+
             const wsUrl = import.meta.env.VITE_SERVER_BASE_WS_URL;
 
             webSocket = new WebSocket(wsUrl);