Clean up expired JWT handling, client handling

sandboxnu · Nov 9, 2024 · db75f7d · db75f7d
1 parent f4e8d89
commit db75f7d
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 30 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -7,7 +7,7 @@ import MemberClient from "./client/MemberClient";
 import Footer from "./components/Footer";
 import Menu from "./components/Menu";
 import RequireAuth from "./components/RequireAuth";
-import { AuthContext } from "./hooks/useAuth";
+import { AuthContext, useAuth } from "./hooks/useAuth";
 import AttendanceRecordPage from "./pages/AttendanceRecordPage";
 import Error404 from "./pages/Error404";
 import EventDetailsPage from "./pages/EventDetailsPage";
@@ -19,6 +19,7 @@ import { JWTAuthToken } from "./util/Types";
 function App() {
   const { member, loading, setMember, setLoading, setCheckedCookie } =
     useContext(AuthContext);
+  const { logout } = useAuth();
   const [cookies] = useCookies(["token"]);
 
   useEffect(() => {
@@ -33,14 +34,23 @@ function App() {
         if (memberResponse.data) {
           setMember(memberResponse.data);
         } else {
-          console.log("Error fetching member: ", memberResponse.error);
+          console.log("Unable to verify member: ", memberResponse.error);
+          logout();
         }
       }
       setCheckedCookie(true);
       setLoading(false);
     };
     checkLoggedIn();
-  }, [cookies.token, setMember, loading, setLoading, member]);
+  }, [
+    cookies.token,
+    setMember,
+    loading,
+    setLoading,
+    member,
+    setCheckedCookie,
+    logout,
+  ]);
 
   return (
     <div className="flex flex-col min-h-screen justify-between">

diff --git a/src/client/AuthClient.ts b/src/client/AuthClient.ts
@@ -1,4 +1,4 @@
-import axios from "axios";
+import axios, { AxiosError } from "axios";
 import { AuthResponse, Response } from "../util/Types";
 
 class AuthClient {
@@ -7,15 +7,27 @@ class AuthClient {
     lastName: string
   ): Promise<Response<AuthResponse>> {
     // Call the login API
-    const response = await axios.post(`/api/auth`, {
-      nuid,
-      lastName,
-    });
-    return {
-      data: response.data.auth,
-      error: response.data.error,
-      status: response.status,
-    };
+    try {
+      const response = await axios.post(`/api/auth`, {
+        nuid,
+        lastName,
+      });
+      return {
+        data: response.data.auth,
+        error: response?.data.error,
+        status: response.status,
+      };
+    } catch (e) {
+      if (e instanceof AxiosError) {
+        let error: AxiosError<any, any> = e;
+        return {
+          data: undefined,
+          error: error.response?.data.error,
+          status: error.response?.status,
+        };
+      }
+      throw e;
+    }
   }
 }
 

diff --git a/src/client/EventClient.ts b/src/client/EventClient.ts
@@ -1,4 +1,4 @@
-import axios from "axios";
+import axios, { AxiosError } from "axios";
 import { Event, Response } from "../util/Types";
 
 export default class EventClient {
@@ -8,17 +8,21 @@ export default class EventClient {
    * @returns The event if it can be found, or an error
    */
   public static async fetchEvent(id: number): Promise<Response<Event>> {
-    const response = await axios.get(`/api/event/getEvent/?id=${id}`);
-    if (response.status === 200) {
+    try {
+      const response = await axios.get(`/api/event/getEvent/?id=${id}`);
       return {
         data: response.data,
         error: "",
       };
-    } else {
-      return {
-        data: undefined,
-        error: response.data,
-      };
+    } catch (e) {
+      if (e instanceof AxiosError) {
+        let error: AxiosError<any, any> = e;
+        return {
+          data: undefined,
+          error: error.response?.data,
+        };
+      }
+      throw e;
     }
   }
 

diff --git a/src/client/MemberClient.ts b/src/client/MemberClient.ts
@@ -1,4 +1,4 @@
-import axios from "axios";
+import axios, { AxiosError } from "axios";
 import { Member, Response } from "../util/Types";
 
 export default class MemberClient {
@@ -8,17 +8,21 @@ export default class MemberClient {
    * @returns The Member with that nuid or undefined
    */
   public static async fetchMember(id: string): Promise<Response<Member>> {
-    const response = await axios.get(`/api/member/getMember/?id=${id}`);
-    if (response.status === 200) {
+    try {
+      const response = await axios.get(`/api/member/getMember/?id=${id}`);
       return {
         data: response.data,
         error: "",
       };
-    } else {
-      return {
-        data: undefined,
-        error: response.data,
-      };
+    } catch (e) {
+      if (e instanceof AxiosError) {
+        let error: AxiosError<any, any> = e;
+        return {
+          data: undefined,
+          error: error.response?.data,
+        };
+      }
+      throw e;
     }
   }
 }
diff --git a/src/util/styleConfig.ts b/src/util/styleConfig.ts
@@ -17,7 +17,7 @@ export const AttendanceTagToText: Record<AttendanceTag, string> = {
   A: "Absent",
   L: "Late Arrival",
   D: "Early Dismissal",
-  O: "Attendend",
+  O: "Attended",
   N: "Not Required ",
   E: "Excused ",
 };