admin change

Author: JustinhSE

src/App.tsx

@@ -1,9 +1,8 @@
-
 import { Toaster } from "@/components/ui/toaster";
 import { Toaster as Sonner } from "@/components/ui/sonner";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom";
+import { BrowserRouter, Routes, Route } from "react-router-dom";
 import { AuthProvider } from "./utils/auth";
 import AuthWrapper from "./components/AuthWrapper";
 
@@ -41,74 +40,74 @@ const App = () => (
                 <Route path="/register" element={<Register />} />
 
                 {/* Protected member routes */}
-                <Route 
-                  path="/dashboard" 
+                <Route
+                  path="/dashboard"
                   element={
                     <AuthWrapper requireAuth>
                       <Dashboard />
                     </AuthWrapper>
-                  } 
+                  }
                 />
-                <Route 
-                  path="/profile" 
+                <Route
+                  path="/profile"
                   element={
                     <AuthWrapper requireAuth>
                       <Profile />
                     </AuthWrapper>
-                  } 
+                  }
                 />
-                <Route 
-                  path="/community" 
+                <Route
+                  path="/community"
                   element={
                     <AuthWrapper requireAuth>
                       <Community />
                     </AuthWrapper>
-                  } 
+                  }
                 />
-                <Route 
-                  path="/meditations" 
+                <Route
+                  path="/meditations"
                   element={
                     <AuthWrapper requireAuth>
                       <Meditations />
                     </AuthWrapper>
-                  } 
+                  }
                 />
-                <Route 
-                  path="/analytics" 
+                <Route
+                  path="/analytics"
                   element={
                     <AuthWrapper requireAuth>
                       <Analytics />
                     </AuthWrapper>
-                  } 
+                  }
                 />
-                <Route 
-                  path="/map" 
+                <Route
+                  path="/map"
                   element={
                     <AuthWrapper requireAuth>
                       <Map />
                     </AuthWrapper>
-                  } 
+                  }
                 />
 
                 {/* Admin routes */}
-                <Route 
-                  path="/admin" 
+                <Route
+                  path="/admin"
                   element={
                     <AuthWrapper requireAuth requireAdmin>
                       <Admin />
                     </AuthWrapper>
-                  } 
+                  }
                 />
 
-<Route 
-                  path="/goodbye" 
+                <Route
+                  path="/goodbye"
                   element={
                     <AuthWrapper requireAuth>
                       <Goodbye />
                     </AuthWrapper>
-                  } 
+                  }
                 />
-                
+
                 {/* Catch-all route */}
                 <Route path="*" element={<NotFound />} />
               </Routes>
@@ -120,4 +119,4 @@ const App = () => (
   </QueryClientProvider>
 );
 
-export default App;
+export default App;

src/utils/firebase.ts

@@ -63,62 +63,25 @@ export { app, auth, db };
 // Secure way to check for admin permissions
 // This function uses a hash comparison approach to avoid exposing the email directly
 export const isUserAdmin = async (email: string): Promise<boolean> => {
-  if (!db) return false;
-  
+  if (!db) {
+    console.error("Firebase db not initialized");
+    return false;
+  }
+
   try {
-    // First approach: Check if user has admin role in their profile
+    // Query the Firestore users collection to check if the user with the given email has the role "admin"
     const usersRef = collection(db, 'users');
     const q = query(usersRef, where('email', '==', email), where('role', '==', 'admin'));
     const querySnapshot = await getDocs(q);
-    
-    if (!querySnapshot.empty) {
-      return true;
-    }
-    
-    // Second approach: Check against admins collection
-    const adminsRef = collection(db, 'admins');
-    const adminDoc = await getDoc(doc(adminsRef, 'authorized_emails'));
-    
-    if (adminDoc.exists() && adminDoc.data().emails) {
-      return adminDoc.data().emails.includes(email);
-    }
-    
-    // Fallback to hardcoded verification (using a hashed comparison for security)
-    // This allows initial admin setup even if collections don't exist yet
-    const adminHash = 'b42a70c370ad4562dbd5166f1275324fa254299f'; // SHA1 hash of "[email protected]"
-    const emailHash = await sha1(email.trim().toLowerCase());
-    
-    return emailHash === adminHash;
+
+    // If the query returns any documents, the user is an admin
+    return !querySnapshot.empty;
   } catch (error) {
     console.error('Error checking admin status:', error);
     return false;
   }
 };
 
-// Utility function to create SHA-1 hash for email comparison
-// This prevents exposing the actual admin email in the code
-async function sha1(str: string): Promise<string> {
-  const buffer = new TextEncoder().encode(str);
-  const hashBuffer = await crypto.subtle.digest('SHA-1', buffer);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-  return hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
-}
-
-// Admin setup function (should be called once to set up the admin in Firestore)
-export const setupAdminUser = async () => {
-  if (!db) return;
-  
-  try {
-    const adminsRef = collection(db, 'admins');
-    await setDoc(doc(adminsRef, 'authorized_emails'), {
-      emails: ['[email protected]']
-    });
-    
-    console.log('Admin setup complete');
-  } catch (error) {
-    console.error('Error setting up admin:', error);
-  }
-};
 
 // Auth functions with conditional checks to prevent errors
 export const login = async (email: string, password: string) => {