remove black list cloud function call

TAMUSHPE · Sep 9, 2024 · 9c0a91a · 9c0a91a
1 parent e684bc1
commit 9c0a91a
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 114 deletions.
diff --git a/functions/src/index.ts b/functions/src/index.ts
@@ -7,6 +7,5 @@ export { zipResume } from "./resume";
 export { updateUserRole } from "./roles";
 export { checkUsernameUniqueness } from "./checkUsername";
 export { eventSignIn, eventSignOut, eventLogDelete, addInstagramPoints } from "./events";
-export { isUserInBlacklist } from "./restriction";
 export { calculateMOTM } from "./points";
 export { scheduledFirestoreExport, httpFirestoreExport, resetPointsWithPassword } from "./backup"
diff --git a/functions/src/restriction.ts b/functions/src/restriction.ts
diff --git a/src/api/firebaseUtils.ts b/src/api/firebaseUtils.ts
@@ -1509,18 +1509,6 @@ export const removeFromBlacklist = async (userToRemove: PublicUserInfo) => {
     await setDoc(doc(db, "restrictions/blacklist"), { list: updatedBlacklist }, { merge: true });
 };
 
-export const isUserInBlacklist = async (uid: string): Promise<boolean> => {
-    const blacklistDocRef = doc(db, "restrictions/blacklist");
-    const docSnap = await getDoc(blacklistDocRef);
-
-    if (docSnap.exists()) {
-        const blacklist = docSnap.data().list;
-        return blacklist.some((user: PublicUserInfo) => user.uid === uid);
-    } else {
-        // Blacklist document does not exist or has no data
-        return false;
-    }
-};
 
 
 export const submitFeedback = async (feedback: string, userInfo: User) => {

diff --git a/src/navigation/index.tsx b/src/navigation/index.tsx
@@ -76,32 +76,6 @@ const RootNavigator = () => {
     //     }
     // }, [userInfo]);
 
-
-    useEffect(() => {
-        const handleBannedUser = async () => {
-            if (!auth.currentUser?.uid) {
-                return;
-            }
-
-            const functions = getFunctions();
-            const isUserInBlacklist = httpsCallable<{ uid: string }, { isInBlacklist: boolean }>(functions, 'isUserInBlacklist');
-            try {
-                const checkBlackListResponse = await isUserInBlacklist({ uid: auth.currentUser?.uid! });
-
-                if (checkBlackListResponse.data.isInBlacklist) {
-                    signOutUser(true);
-                    alert("You have been banned from the app");
-                    return;
-                }
-            } catch (error) {
-                console.error('Error during user authentication:', error);
-            }
-
-        }
-
-        handleBannedUser();
-    }, [auth.currentUser?.uid])
-
     if (userLoading) {
         return <RenderUserLoading />;
     }

diff --git a/src/screens/admin/AdminDashboard.tsx b/src/screens/admin/AdminDashboard.tsx
@@ -207,24 +207,7 @@ const AdminDashboard = ({ navigation }: NativeStackScreenProps<HomeStackParams>)
                             <Text className='text-xl font-semibold text-black text-center'>App Feedback</Text>
                         </TouchableOpacity>
                     </View>
-                    <View className='flex-row justify-between mt-4'>
-                        <TouchableOpacity
-                            className={`bg-secondary-blue-2 items-center justify-center h-20 rounded-lg w-[48%]`}
-                            style={{
-                                shadowColor: "#000",
-                                shadowOffset: {
-                                    width: 0,
-                                    height: 2,
-                                },
-                                shadowOpacity: 0.25,
-                                shadowRadius: 3.84,
-                                elevation: 5,
-                            }}
-                            onPress={() => navigation.navigate('RestrictionsEditor')}
-                        >
-                            <Text className='text-xl font-semibold text-black text-center'>App Restriction</Text>
-                        </TouchableOpacity>
-                    </View>
+
 
                     <Text className={`mt-8 font-bold text-2xl ${darkMode ? "text-white" : "text-black"}`}>Developer Tools</Text>
                     <View>

diff --git a/src/screens/onboarding/LoginGuest.tsx b/src/screens/onboarding/LoginGuest.tsx
@@ -45,21 +45,6 @@ const LoginGuest = ({ navigation }: NativeStackScreenProps<AuthStackParams>) =>
         setLoading(true);
         initializeCurrentUserData()
             .then(async userFromFirebase => {
-                const functions = getFunctions();
-                const isUserInBlacklist = httpsCallable<{ uid: string }, { isInBlacklist: boolean }>(functions, 'isUserInBlacklist');
-
-                try {
-                    const checkBlackListResponse = await isUserInBlacklist({ uid: auth.currentUser?.uid! });
-
-                    if (checkBlackListResponse.data.isInBlacklist) {
-                        signOut(auth);
-                        setError("You have been banned from the app");
-                        return;
-                    }
-                } catch (error) {
-                    console.error('Error during user authentication:', error);
-                }
-
                 AsyncStorage.setItem("@user", JSON.stringify(userFromFirebase))
                     .then(() => {
                         setUserInfo(userFromFirebase);

diff --git a/src/screens/onboarding/LoginStudent.tsx b/src/screens/onboarding/LoginStudent.tsx
@@ -52,21 +52,6 @@ const LoginStudent = ({ navigation }: NativeStackScreenProps<AuthStackParams>) =
         setLoading(true);
         initializeCurrentUserData()
             .then(async (userFromFirebase) => {
-                const functions = getFunctions();
-                const isUserInBlacklist = httpsCallable<{ uid: string }, { isInBlacklist: boolean }>(functions, 'isUserInBlacklist');
-
-                try {
-                    const checkBlackListResponse = await isUserInBlacklist({ uid: auth.currentUser?.uid! });
-
-                    if (checkBlackListResponse.data.isInBlacklist) {
-                        signOut(auth);
-                        setError("You have been banned from the app");
-                        return;
-                    }
-                } catch (error) {
-                    console.error('Error during user authentication:', error);
-                }
-
                 AsyncStorage.setItem("@user", JSON.stringify(userFromFirebase))
                     .then(() => {
                         setUserInfo(userFromFirebase);