Delete DB account first, then best-effort Pterodactyl cleanup

Author: ddrayko

routes/auth.js

@@ -344,13 +344,14 @@ router.post('/change-email', authenticateToken, async (req, res) => {
 router.post('/delete-account', authenticateToken, async (req, res) => {
   try {
     const { password } = req.body;
+    const userId = req.user?.userId;
     const pteroId = req.user?.pteroId;
 
     if (!password) {
       return res.status(400).json({ error: 'Password is required' });
     }
 
-    const users = await query('SELECT * FROM users WHERE ptero_user_id = ?', [pteroId]);
+    const users = await query('SELECT * FROM users WHERE id = ?', [userId]);
     if (users.length === 0) {
       return res.status(404).json({ error: 'User not found' });
     }
@@ -362,30 +363,31 @@ router.post('/delete-account', authenticateToken, async (req, res) => {
       return res.status(401).json({ error: 'Password is incorrect' });
     }
 
-    // Delete all Pterodactyl servers first
-    try {
-      const servers = await getServersByUser(pteroId);
-      for (const server of servers) {
-        try {
-          await deletePteroServer(server.id);
-        } catch (err) {
-          console.error(`Failed to delete server ${server.id}:`, err.message);
+    // Delete from local DB first (cascades to user_ips)
+    await query('DELETE FROM users WHERE id = ?', [user.id]);
+
+    // Then try to clean up Pterodactyl (best effort)
+    if (pteroId) {
+      try {
+        const servers = await getServersByUser(pteroId);
+        for (const server of servers) {
+          try {
+            await deletePteroServer(server.id);
+          } catch (err) {
+            console.error(`Failed to delete server ${server.id}:`, err.message);
+          }
         }
+      } catch (err) {
+        console.error('Failed to fetch servers for deletion:', err.message);
       }
-    } catch (err) {
-      console.error('Failed to fetch servers for deletion:', err.message);
-    }
 
-    // Delete Pterodactyl user
-    try {
-      await deletePteroUser(pteroId);
-    } catch (err) {
-      console.error('Failed to delete Pterodactyl user:', err.message);
+      try {
+        await deletePteroUser(pteroId);
+      } catch (err) {
+        console.error('Failed to delete Pterodactyl user:', err.message);
+      }
     }
 
-    // Delete from local DB (cascades to user_ips)
-    await query('DELETE FROM users WHERE id = ?', [user.id]);
-
     res.json({ message: 'Account deleted successfully' });
   } catch (err) {
     console.error('Delete account error:', err.message);