Skip to content

Switched SCEvents token reading to useSCE hook #2140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maernest04 merged 1 commit into from
May 4, 2026
Merged

Switched SCEvents token reading to useSCE hook #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Pages/Events/CreateEventPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -262,7 +262,6 @@ export default function CreateEventPage() {
};

setSubmitting(true);
const token = window.localStorage.getItem('jwtToken');
const result = await createSCEvent(token, payload);
setSubmitting(false);

Expand Down
7 changes: 2 additions & 5 deletions src/Pages/Events/EditEventPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -122,7 +122,7 @@ export default function EditEventPage() {
}

loadEvent();
}, [id, userId]);
}, [id, token, userId]);

function addEventAdmin(admin) {
if (allOrgAdminsCanEdit) return;
Expand All @@ -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) {
Expand Down Expand Up @@ -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);

Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/Pages/Events/Events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 });
Expand All @@ -139,7 +139,7 @@ export default function EventsPage() {
}

fetchEvents();
}, [cursor]);
}, [cursor, token]);

return (
<div className={pageContainerClass}>
Expand Down
8 changes: 3 additions & 5 deletions src/Pages/Events/EventsRegistration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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) {
Expand All @@ -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;
}
Expand All @@ -100,7 +99,7 @@ export default function EventRegistration() {
return () => {
isCurrent = false;
};
}, [id]);
}, [id, token]);

const handleInputChange = (fieldId, value, type) => {
if (type === 'checkbox') {
Expand All @@ -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;
Expand Down
Loading