From 0b543d3ac9cf2faf820f206107e23fcf1f8f4990 Mon Sep 17 00:00:00 2001
From: maernest04 <maernest04@gmail.com>
Date: Sun, 3 May 2026 10:56:58 -0700
Subject: [PATCH] Switched reading of user token from reading local storage to
 useSCE hook

---
 src/Pages/Events/CreateEventPage.js    | 3 +--
 src/Pages/Events/EditEventPage.js      | 7 ++-----
 src/Pages/Events/Events.js             | 4 ++--
 src/Pages/Events/EventsRegistration.js | 8 +++-----
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/Pages/Events/CreateEventPage.js b/src/Pages/Events/CreateEventPage.js
index d21fb093b..aa2da1a9d 100644
--- a/src/Pages/Events/CreateEventPage.js
+++ b/src/Pages/Events/CreateEventPage.js
@@ -45,6 +45,7 @@ function userDisplayName(admin) {
 
 export default function CreateEventPage() {
   const { user } = useSCE();
+  const token = user?.token;
   const history = useHistory();
 
   const [eventId] = useState(() => crypto.randomUUID());
@@ -136,7 +137,6 @@ export default function CreateEventPage() {
 
   async function performAdminSearch(query) {
     setAdminSearching(true);
-    const token = window.localStorage.getItem('jwtToken');
     const result = await getAllUsers({ token, query, minRole: membershipState.OFFICER });
     setAdminSearching(false);
     if (result.error) {
@@ -262,7 +262,6 @@ export default function CreateEventPage() {
     };
 
     setSubmitting(true);
-    const token = window.localStorage.getItem('jwtToken');
     const result = await createSCEvent(token, payload);
     setSubmitting(false);
 
diff --git a/src/Pages/Events/EditEventPage.js b/src/Pages/Events/EditEventPage.js
index b0f7287d6..c73f4a59f 100644
--- a/src/Pages/Events/EditEventPage.js
+++ b/src/Pages/Events/EditEventPage.js
@@ -20,6 +20,7 @@ function userDisplayName(admin) {
 export default function EditEventPage() {
   const { id } = useParams();
   const { user } = useSCE();
+  const token = user?.token;
   const history = useHistory();
 
   const [isLoading, setIsLoading] = useState(true);
@@ -79,7 +80,6 @@ export default function EditEventPage() {
     async function loadEvent() {
       setIsLoading(true);
 
-      const token = window.localStorage.getItem('jwtToken');
       const result = await getEventByID(id, token);
 
       setIsLoading(false);
@@ -122,7 +122,7 @@ export default function EditEventPage() {
     }
 
     loadEvent();
-  }, [id, userId]);
+  }, [id, token, userId]);
 
   function addEventAdmin(admin) {
     if (allOrgAdminsCanEdit) return;
@@ -148,7 +148,6 @@ export default function EditEventPage() {
 
   async function performAdminSearch(query) {
     setAdminSearching(true);
-    const token = window.localStorage.getItem('jwtToken');
     const result = await getAllUsers({ token, query, minRole: membershipState.OFFICER });
     setAdminSearching(false);
     if (result.error) {
@@ -278,7 +277,6 @@ export default function EditEventPage() {
     };
 
     setSubmitting(true);
-    const token = window.localStorage.getItem('jwtToken');
     const result = await updateSCEvent(id, token, payload);
     setSubmitting(false);
 
@@ -296,7 +294,6 @@ export default function EditEventPage() {
   async function handleConfirmDelete() {
     setDeleteError('');
     setDeleteSubmitting(true);
-    const token = window.localStorage.getItem('jwtToken');
     const result = await deleteSCEvent(id, token);
     setDeleteSubmitting(false);
     if (result.error) {
diff --git a/src/Pages/Events/Events.js b/src/Pages/Events/Events.js
index 7ba383ddd..05a25ac3d 100644
--- a/src/Pages/Events/Events.js
+++ b/src/Pages/Events/Events.js
@@ -42,6 +42,7 @@ function canUserSeeEvent(event, user) {
 
 export default function EventsPage() {
   const { user } = useSCE();
+  const token = user?.token;
   const [events, setEvents] = useState([]);
   const [isLoading, setIsLoading] = useState(true);
   const [hasError, setHasError] = useState(false);
@@ -124,7 +125,6 @@ export default function EventsPage() {
       setIsLoading(true);
       setHasError(false);
 
-      const token = window.localStorage.getItem('jwtToken');
       const startDate = toDateKey(new Date(cursor.getFullYear(), cursor.getMonth(), 1));
       const endDate = toDateKey(new Date(cursor.getFullYear(), cursor.getMonth() + 1, 0));
       const response = await getAllSCEvents(token, { startDate, endDate });
@@ -139,7 +139,7 @@ export default function EventsPage() {
     }
 
     fetchEvents();
-  }, [cursor]);
+  }, [cursor, token]);
 
   return (
     <div className={pageContainerClass}>
diff --git a/src/Pages/Events/EventsRegistration.js b/src/Pages/Events/EventsRegistration.js
index 41d346758..bd5d20499 100644
--- a/src/Pages/Events/EventsRegistration.js
+++ b/src/Pages/Events/EventsRegistration.js
@@ -37,6 +37,7 @@ function StatusPanel({ title, message, borderClass, textClass, onBack }) {
 
 export default function EventRegistration() {
   const { user } = useSCE();
+  const token = user?.token;
   const { id } = useParams();
   const history = useHistory();
   const [event, setEvent] = useState(null);
@@ -56,7 +57,6 @@ export default function EventRegistration() {
       setIsLoading(true);
       setHasError(false);
 
-      const token = window.localStorage.getItem('jwtToken');
       const response = await getEventByID(id, token);
 
       if (!response.error && response.responseData) {
@@ -72,14 +72,13 @@ export default function EventRegistration() {
       setIsLoading(false);
     }
     fetchEvent();
-  }, [id]);
+  }, [id, token]);
 
   useEffect(() => {
     if (!id) {
       return;
     }
     let isCurrent = true;
-    const token = window.localStorage.getItem('jwtToken');
     if (!token) {
       return;
     }
@@ -100,7 +99,7 @@ export default function EventRegistration() {
     return () => {
       isCurrent = false;
     };
-  }, [id]);
+  }, [id, token]);
 
   const handleInputChange = (fieldId, value, type) => {
     if (type === 'checkbox') {
@@ -120,7 +119,6 @@ export default function EventRegistration() {
     setSubmitError('');
     setSubmitSuccess('');
 
-    const token = window.localStorage.getItem('jwtToken');
     if (!token) {
       setSubmitError('You must be logged in to register for an event.');
       return;