remove client axios usage

howardchung · Dec 25, 2024 · 94dfde2 · 94dfde2
1 parent 325b301
commit 94dfde2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 38 deletions.
diff --git a/dev/testaxios.js b/dev/testaxios.js
diff --git a/dev/testexpress.js b/dev/testexpress.js
diff --git a/src/components/App/App.tsx b/src/components/App/App.tsx
@@ -282,11 +282,12 @@ export default class App extends React.Component<AppProps, AppState> {
     // if a vanity name, resolve the url to a room id
     if (this.props.vanity) {
       try {
-        const response = await axios.get(
+        const response = await fetch(
           serverPath + '/resolveRoom/' + this.props.vanity,
         );
-        if (response.data.roomId) {
-          roomId = response.data.roomId;
+        const data = await response.json();
+        if (data.roomId) {
+          roomId = data.roomId;
         } else {
           this.setState({ overlayMsg: "Couldn't load this room." });
         }
@@ -313,8 +314,8 @@ export default class App extends React.Component<AppProps, AppState> {
     } catch (e) {
       console.warn('[ALERT] Could not parse saved passwords');
     }
-    const response = await axios.get(serverPath + '/resolveShard' + roomId);
-    const shard = Number(response.data) || '';
+    const response = await fetch(serverPath + '/resolveShard' + roomId);
+    const shard = Number(await response.text()) || '';
     const socket = io(serverPath + roomId, {
       transports: ['websocket'],
       query: {

diff --git a/src/components/Settings/SettingsTab.tsx b/src/components/Settings/SettingsTab.tsx
@@ -117,8 +117,8 @@ export const SettingsTab = ({
       }
       setValidVanity(false);
       setValidVanityLoading(true);
-      const response = await axios.get(serverPath + '/resolveRoom/' + input);
-      const data = response.data;
+      const response = await fetch(serverPath + '/resolveRoom/' + input);
+      const data = await response.json();
       setValidVanityLoading(false);
       if (
         data &&

diff --git a/src/components/TopBar/TopBar.tsx b/src/components/TopBar/TopBar.tsx
@@ -190,10 +190,10 @@ export class ListRoomsButton extends React.Component<{}> {
   refreshRooms = async () => {
     if (this.context.user) {
       const token = await this.context.user.getIdToken();
-      const response = await axios.get(
+      const response = await fetch(
         serverPath + `/listRooms?uid=${this.context.user?.uid}&token=${token}`,
       );
-      this.setState({ rooms: response.data });
+      this.setState({ rooms: await response.json() });
     }
   };