Merge pull request #206 from Bux42/fix-calls-to-tm-io

Fix calls to trackmania.io API
Bux42 · Jul 22, 2024 · 5a2b90f · 5a2b90f
2 parents e8caeb3 + 3fb1b83
commit 5a2b90f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/app/pages/maps/[mapUId]/index.tsx b/app/pages/maps/[mapUId]/index.tsx
@@ -48,9 +48,7 @@ const Home = (): JSX.Element => {
         isFetching: isFetchingReplays,
     } = useMapReplays(mapUId);
 
-    const { user } = useContext(AuthContext);
-    const mapInfoQueryKey = user ? mapUId : undefined;
-    const { data: mapInfo } = useMapInfo(mapInfoQueryKey);
+    const { data: mapInfo } = useMapInfo(mapUId);
 
     const selectedReplaysWithValidSectors = useMemo(
         () => filterReplaysWithValidSectorTimes(selectedReplayData, mapReplaysResult?.replays || []),

diff --git a/server/src/routes/maps.ts b/server/src/routes/maps.ts
@@ -54,20 +54,24 @@ router.get('/:mapUID', async (req: Request, res: Response, next: Function) => {
 router.get('/:mapUID/info', async (req: Request, res: Response) => {
     let mapData = {};
 
-    // fetch tm.io data
-    try {
-        const tmxRes = await axios.get(`https://trackmania.io/api/map/${req.params.mapUID}`, {
-            withCredentials: true,
-            headers: { 'User-Agent': 'TMDojo API - https://github.com/Bux42/TMDojo' },
-        });
+    if (!req.user) {
+        // Only call tm.io if user is authenticated
+        res.status(401).send();
+    } else {
+        // fetch tm.io data
+        try {
+            const tmxRes = await axios.get(`https://trackmania.io/api/map/${req.params.mapUID}`, {
+                withCredentials: true,
+                headers: { 'User-Agent': 'TMDojo API - https://github.com/Bux42/TMDojo' },
+            });
 
-        const tmioData = tmxRes.data;
-        mapData = { ...mapData, ...tmioData };
-    } catch (error) {
-        req.log.error(`mapsRouter: tm.io request failed with error ${error.toString()}`);
+            const tmioData = tmxRes.data;
+            mapData = { ...mapData, ...tmioData };
+        } catch (error) {
+            req.log.error(`mapsRouter: tm.io request failed with error ${error.toString()}`);
+        }
+        res.send(mapData);
     }
-
-    res.send(mapData);
 });
 
 /**