refresh turnstile

the-hideout · Mar 23, 2024 · 1b32b55 · 1b32b55
1 parent 335c659
commit 1b32b55
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 28 deletions.
diff --git a/src/modules/player-stats.mjs b/src/modules/player-stats.mjs
@@ -1,5 +1,5 @@
-//const apiUrl = 'https://player.tarkov.dev';
-const apiUrl = 'http://localhost:8787';
+const apiUrl = 'https://player.tarkov.dev';
+//const apiUrl = 'http://localhost:8787';
 
 const requestMethod = 'POST';
 

diff --git a/src/pages/player/index.js b/src/pages/player/index.js
@@ -96,36 +96,37 @@ function Player() {
     const { data: achievements } = useAchievementsData();
     const [turnstileToken, setTurnstileToken] = useState()
 
-    useEffect(() => {
-        async function fetchProfile() {
-            if (!accountId) {
-                return;
-            }
-            if (isNaN(accountId)) {
-                try {
-                    const searchResponse = await playerStats.searchPlayers(accountId, turnstileToken);
-                    for (const result of searchResponse) {
-                        if (result.name.toLowerCase() === accountId.toLowerCase()) {
-                            navigate('/player/'+result.aid);
-                            return;
-                        }
+    const fetchProfile = useCallback(async () => {
+        const token = turnstileRef?.current?.getResponse();
+        if (!token) {
+            return;
+        }
+        if (!accountId) {
+            return;
+        }
+        if (isNaN(accountId)) {
+            try {
+                const searchResponse = await playerStats.searchPlayers(accountId, turnstileToken);
+                turnstileRef.current?.reset();
+                for (const result of searchResponse) {
+                    if (result.name.toLowerCase() === accountId.toLowerCase()) {
+                        navigate('/player/'+result.aid);
+                        return;
                     }
-                    setProfileError(`Account ${accountId} not found`);
-                } catch (error) {
-                    setProfileError(`Error searching for profile ${accountId}: ${error.message}`);
                 }
-                return;
-            }
-            try {
-                setPlayerData(await playerStats.getProfile(accountId, turnstileToken));
+                setProfileError(`Account ${accountId} not found`);
             } catch (error) {
-                setProfileError(error.message);
+                setProfileError(`Error searching for profile ${accountId}: ${error.message}`);
             }
+            return;
         }
-        if (turnstileToken) {
-            fetchProfile();
+        try {
+            setPlayerData(await playerStats.getProfile(accountId, turnstileToken));
+            turnstileRef.current?.reset();
+        } catch (error) {
+            setProfileError(error.message);
         }
-    }, [accountId, setPlayerData, setProfileError, navigate, turnstileToken]);
+    }, [accountId, setPlayerData, setProfileError, navigate, turnstileToken, turnstileRef]);
 
     const playerLevel = useMemo(() => {
         if (playerData.info.experience === 0) {
@@ -647,6 +648,16 @@ function Player() {
         ])
     }, [playerData, getItemDisplay, getLoadoutContents, t]);
 
+    useEffect(() => {
+        if (!turnstileToken) {
+            return;
+        }
+        if (String(playerData.aid) === accountId) {
+            return;
+        }
+        fetchProfile();
+    }, [playerData, accountId, turnstileToken, fetchProfile])
+
     const playerSearchDiv = (
         <div>
             <p>

diff --git a/src/pages/players/index.js b/src/pages/players/index.js
@@ -31,7 +31,7 @@ function Players() {
 
     const [isButtonDisabled, setButtonDisabled] = useState(true);
     const [searched, setSearched] = useState(false);
-    const [turnstileToken, setTurnstileToken] = useState()
+    const [turnstileToken, setTurnstileToken] = useState();
 
     const searchForName = useCallback(async () => {
         if (nameFilter.length < 3 || nameFilter.length > 15) {
@@ -48,7 +48,6 @@ function Players() {
             setNameResultsError(error.message);
         }
         turnstileRef.current.reset();
-        setButtonDisabled(false);
     }, [nameFilter, setNameResults, setNameResultsError, turnstileToken, turnstileRef]);
 
     const searchResults = useMemo(() => {