From 86aee010ffa6b21e941fa3d06b01e77b43ebd122 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 31 Aug 2024 17:06:01 -0500 Subject: [PATCH 1/2] fix hasPrivileges to be consistent --- src/components/MOTMCard.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/MOTMCard.tsx b/src/components/MOTMCard.tsx index e33a99ce..c9735e15 100644 --- a/src/components/MOTMCard.tsx +++ b/src/components/MOTMCard.tsx @@ -18,7 +18,8 @@ const MOTMCard: React.FC = ({ navigation }) => { const colorScheme = useColorScheme(); const darkMode = useSystemDefault ? colorScheme === 'dark' : fixDarkMode; - const hasPrivileges = (userInfo?.publicInfo?.roles?.admin?.valueOf() || userInfo?.publicInfo?.roles?.officer?.valueOf() || userInfo?.publicInfo?.roles?.developer?.valueOf()); + const hasPrivileges = (userInfo?.publicInfo?.roles?.admin?.valueOf() || userInfo?.publicInfo?.roles?.officer?.valueOf() || userInfo?.publicInfo?.roles?.developer?.valueOf() || userInfo?.publicInfo?.roles?.lead?.valueOf() || userInfo?.publicInfo?.roles?.representative?.valueOf()); + const [MOTM, setMOTM] = useState(); const [currentUser, setCurrentUser] = useState(auth.currentUser); From f4d0cc446e6b5f159b6ab0612ba034f56f8ca165 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 31 Aug 2024 17:06:11 -0500 Subject: [PATCH 2/2] add resource bypass --- src/screens/resources/Resources.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/screens/resources/Resources.tsx b/src/screens/resources/Resources.tsx index 96f1c09d..7aba0155 100644 --- a/src/screens/resources/Resources.tsx +++ b/src/screens/resources/Resources.tsx @@ -26,6 +26,9 @@ const Resources = ({ navigation }: { navigation: NativeStackNavigationProp([]); @@ -96,11 +99,11 @@ const Resources = ({ navigation }: { navigation: NativeStackNavigationProp { - if (!userInfo?.publicInfo?.isStudent){ + if (!userInfo?.publicInfo?.isStudent) { alert("You must be a student of Texas A&M to access this resource") return; } - if (isMemberVerified(userInfo?.publicInfo?.nationalExpiration, userInfo?.publicInfo?.chapterExpiration) || navigateTo == "PointsLeaderboard") { + if (navigateTo == "PointsLeaderboard" || hasPrivileges || isMemberVerified(userInfo?.publicInfo?.nationalExpiration, userInfo?.publicInfo?.chapterExpiration)) { navigation.navigate(navigateTo); } else { alert("You must be a member of TAMU SHPE to access this resource. Visit the home screen to learn more to become a member!");