diff --git a/backend/src/index.ts b/backend/src/index.ts index 9511f28..e9de8b4 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -66,6 +66,7 @@ app.get('/api/scores/:chartId', requireAuth, scoreRoutes.handleGetScoresByChartI app.get('/api/allScores', requireAuth, scoreRoutes.handleGetAllGameScores); app.post('/api/admin/createGame', requireAuth, adminRoutes.handleCreateGame); +app.delete('/api/admin/user/:userId', requireAuth, adminRoutes.handleDeleteUser); app.listen(port, () => { console.log(`Server listening on port ${port}`); diff --git a/backend/src/routes/admin.ts b/backend/src/routes/admin.ts index 63d6ccf..0fe35bd 100644 --- a/backend/src/routes/admin.ts +++ b/backend/src/routes/admin.ts @@ -48,3 +48,63 @@ export const handleCreateGame = async (req: express.Request, res: express.Respon res.status(500).json({ error: 'Internal server error' }); } } + +export const handleDeleteUser = async (req: express.Request, res: express.Response) => { + try { + if (!req.session.userId) { + return res.status(401).json({ error: 'Authentication required' }); + } + + const user = await prisma.user.findUnique({ + where: { id: req.session.userId }, + select: { id: true, username: true, isAdmin: true } + }); + + if (!user) { + req.session.destroy((err) => { + if (err) console.error('Session destroy error:', err); + }); + return res.status(401).json({ error: 'Invalid session' }); + } + + if (user.id !== 1 && !user.isAdmin) { + return res.status(403).json({ error: 'Unauthorized. You are not an admin of this instance' }); + } + + const { userId } = req.params; + if (!userId) { + return res.status(400).json({ error: 'User ID is required' }); + } + + const targetUserId = parseInt(userId); + if (isNaN(targetUserId) || targetUserId <= 0) { + return res.status(400).json({ error: 'Invalid user ID' }); + } + if (targetUserId === user.id) { + return res.status(400).json({ error: 'Cannot delete your own account' }); + } + const targetUser = await prisma.user.findUnique({ + where: { id: targetUserId }, + select: { id: true, username: true, isAdmin: true } + }); + + if (!targetUser) { + return res.status(404).json({ error: 'User not found' }); + } + await prisma.user.delete({ + where: { id: targetUserId } + }); + + return res.status(200).json({ + message: 'User deleted successfully', + deletedUser: { + id: targetUser.id, + username: targetUser.username + } + }); + + } catch (error) { + console.error('User deletion error:', error); + res.status(500).json({ error: 'Internal server error' }); + } +} diff --git a/frontend/src/components/CollapsibleSection.tsx b/frontend/src/components/admin/CollapsibleSection.tsx similarity index 93% rename from frontend/src/components/CollapsibleSection.tsx rename to frontend/src/components/admin/CollapsibleSection.tsx index 08df24f..ab72cc8 100644 --- a/frontend/src/components/CollapsibleSection.tsx +++ b/frontend/src/components/admin/CollapsibleSection.tsx @@ -1,4 +1,4 @@ -import { ReactNode } from 'react'; +import type {ReactNode} from 'react'; interface CollapsibleSectionProps { title: string; @@ -37,4 +37,4 @@ const CollapsibleSection = ({ title, isOpen, onToggle, children }: CollapsibleSe ); }; -export default CollapsibleSection; \ No newline at end of file +export default CollapsibleSection; diff --git a/frontend/src/components/GameManager.tsx b/frontend/src/components/admin/GameManager.tsx similarity index 100% rename from frontend/src/components/GameManager.tsx rename to frontend/src/components/admin/GameManager.tsx diff --git a/frontend/src/components/InviteCodeManager.tsx b/frontend/src/components/admin/InviteCodeManager.tsx similarity index 100% rename from frontend/src/components/InviteCodeManager.tsx rename to frontend/src/components/admin/InviteCodeManager.tsx diff --git a/frontend/src/components/admin/UserDeletion.tsx b/frontend/src/components/admin/UserDeletion.tsx new file mode 100644 index 0000000..2de7b50 --- /dev/null +++ b/frontend/src/components/admin/UserDeletion.tsx @@ -0,0 +1,218 @@ +import { useState } from 'react'; + +interface User { + id: number; + username: string; + isAdmin: boolean; +} + +interface UserDeletionProps { + onUserDeleted?: () => void; +} + +const UserDeletion = ({ onUserDeleted }: UserDeletionProps) => { + const [userId, setUserId] = useState(''); + const [userToDelete, setUserToDelete] = useState(null); + const [isSearching, setIsSearching] = useState(false); + const [isDeleting, setIsDeleting] = useState(false); + const [showConfirmation, setShowConfirmation] = useState(false); + const [error, setError] = useState(null); + + const handleSearchUser = async () => { + if (!userId.trim()) { + setError('Please enter a user ID'); + return; + } + + const id = parseInt(userId); + if (isNaN(id) || id <= 0) { + setError('Please enter a valid user ID'); + return; + } + + setIsSearching(true); + setError(null); + setUserToDelete(null); + + try { + const response = await fetch(`${import.meta.env.VITE_API_URL}/me?userId=${id}`, { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + }, + credentials: 'include', + }); + + if (!response.ok) { + if (response.status === 404) { + throw new Error('User not found'); + } + const error = await response.json(); + throw new Error(error.error || 'Failed to find user'); + } + + const data = await response.json(); + setUserToDelete(data.user); + } catch (error) { + console.error('Failed to search user:', error); + setError(error instanceof Error ? error.message : 'Failed to search user'); + } finally { + setIsSearching(false); + } + }; + + const handleDeleteUser = async () => { + if (!userToDelete) return; + + setIsDeleting(true); + setError(null); + + try { + const response = await fetch(`${import.meta.env.VITE_API_URL}/admin/user/${userToDelete.id}`, { + method: 'DELETE', + headers: { + 'Content-Type': 'application/json', + }, + credentials: 'include', + }); + + if (!response.ok) { + const error = await response.json(); + throw new Error(error.error || 'Failed to delete user'); + } + + alert(`User "${userToDelete.username}" has been successfully deleted.`); + + // Reset form + setUserId(''); + setUserToDelete(null); + setShowConfirmation(false); + + // Call callback if provided + onUserDeleted?.(); + + } catch (error) { + console.error('Failed to delete user:', error); + setError(error instanceof Error ? error.message : 'Failed to delete user'); + } finally { + setIsDeleting(false); + } + }; + + const resetForm = () => { + setUserId(''); + setUserToDelete(null); + setShowConfirmation(false); + setError(null); + }; + + return ( + <> +

+ Warning: This action is irreversible. Deleting a user will permanently remove their account and all associated data including scores and statistics. +

+ + {error && ( +
+

{error}

+
+ )} + +
+ {/* Search User Section */} +
+
+ +
+ setUserId(e.target.value)} + className="flex-1 px-3 py-2 bg-slate-800 border border-slate-600 rounded-md text-white placeholder-slate-400 focus:outline-none focus:ring-2 focus:ring-violet-500 focus:border-transparent" + placeholder="Enter user ID to search" + min="1" + disabled={isSearching} + /> + +
+
+
+ + {/* User Details Section */} + {userToDelete && !showConfirmation && ( +
+

User Found

+
+

+ ID: {userToDelete.id} +

+

+ Username: {userToDelete.username} +

+

+ Admin Status:{' '} + + {userToDelete.isAdmin ? 'Admin' : 'Regular User'} + +

+
+
+ + +
+
+ )} + + {/* Confirmation Section */} + {showConfirmation && userToDelete && ( +
+

Confirm Deletion

+

+ Are you absolutely sure you want to delete the user "{userToDelete.username}"? +

+

+ This action cannot be undone. All user data, scores, and statistics will be permanently deleted. +

+
+ + +
+
+ )} +
+ + ); +}; + +export default UserDeletion; diff --git a/frontend/src/pages/Admin.tsx b/frontend/src/pages/Admin.tsx index d4cbcb3..776f78e 100644 --- a/frontend/src/pages/Admin.tsx +++ b/frontend/src/pages/Admin.tsx @@ -3,9 +3,10 @@ import { NavBar } from "../components/NavBar"; import { useAuth } from "../contexts/AuthContext"; import SessionExpiredPopup from "../components/SessionExpiredPopup"; import UnauthorizedAccess from "../components/UnauthorizedAccess"; -import CollapsibleSection from "../components/CollapsibleSection"; -import InviteCodeManager from "../components/InviteCodeManager"; -import GameManager from "../components/GameManager"; +import CollapsibleSection from "../components/admin/CollapsibleSection"; +import InviteCodeManager from "../components/admin/InviteCodeManager"; +import GameManager from "../components/admin/GameManager"; +import UserDeletion from "../components/admin/UserDeletion"; import { useState } from "react"; interface GameFormData { @@ -23,6 +24,7 @@ const Admin = () => { const { user, isLoading, logout } = useAuth(); const [showAddGame, setShowAddGame] = useState(false); const [showCreateInvite, setShowCreateInvite] = useState(false); + const [showUserDeletion, setShowUserDeletion] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false); const [isCreatingInvite, setIsCreatingInvite] = useState(false); const [createdInviteCode, setCreatedInviteCode] = useState(null); @@ -107,6 +109,11 @@ const Admin = () => { } }; + const handleUserDeleted = () => { + // Optional: Add any additional logic after user deletion + console.log('User deleted successfully'); + }; + if (isLoading) { return
@@ -161,6 +168,17 @@ const Admin = () => { isSubmitting={isSubmitting} /> + + {/* User Deletion Section */} + setShowUserDeletion(!showUserDeletion)} + > + +
);