From 7c100e608dff52e203599aae07f1624554e6df0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?=
 <losada.hernandez.victor@gmail.com>
Date: Sat, 19 Apr 2025 20:30:47 +0200
Subject: [PATCH] testing

---
 server/app.js | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/server/app.js b/server/app.js
index d2e31127a..032cf0852 100644
--- a/server/app.js
+++ b/server/app.js
@@ -36,7 +36,6 @@ import bodyParser         from 'body-parser';
 import cookieParser       from 'cookie-parser';
 import forceSSL           from './forcessl.mw.js';
 
-
 const sanitizeBrew = (brew, accessType)=>{
 	brew._id = undefined;
 	brew.__v = undefined;
@@ -142,6 +141,7 @@ app.get('/', (req, res, next)=>{
 		title       : 'Homepage',
 		description : 'Homepage'
 	};
+	console.log(req.account);
 
 	splitTextStyleAndMetadata(req.brew);
 	return next();
@@ -374,44 +374,38 @@ app.put('/api/user/rename', async (req, res)=>{
 });
 
 //Delete brews based on author
-app.delete('/api/user/delete', async (req, res) => {
+app.delete('/api/user/delete', async (req, res)=>{
 	const { username } = req.body;
-	console.log(username);
-	const ownAccount = req.account && (req.account.username == username);
-	
-	// if(!ownAccount) return res.status(403).json({ error: 'Must be logged in to change your username' });
+	console.log('username: ', username);
+
+	if(!username) return res.status(400).json({ error: 'Username is required.' });
+
+	//const ownAccount = req.account && (req.account.username == username);
+	//if(!ownAccount) return res.status(403).json({ error: 'Must be logged in to change your username' });
 
 	try {
-		const brews = await HomebrewModel.getByUser(username, true, ['authors']);
-		//get the relevant fields, not just author you moron!
-		console.log(brews);
-		
-		for (let brew of brews) {
-			//attaching the brew to the request for the deleteBrew method to work
+		const brews = await HomebrewModel.getByUser(username, true, ['_id', 'googleId', 'editId', 'authors']);
+		console.log('brews: ', brews);
+
+		const deletePromises = brews.map((brew)=>{
 			req.brew = brew;
-
-			await new Promise((resolve, reject) => {
-				api.deleteBrew(req, res, (err) => {
-					if (err) {
-						reject(err);
-					} else {
-						resolve();
-					}
-				});
+			return new Promise((resolve, reject)=>{
+				api.deleteBrew(req, res, (err)=>err ? reject(err) : resolve());
 			});
-		}
-		console.log('all brews should be deleted');
-		return res.json({ success: true, message: `All brews for ${username} have been deleted.` });
+		});
 
+		console.log('delete promises: ', deletePromises);
+		await Promise.all(deletePromises);
+
+		return res.json({ success: true, message: `All brews for ${username} have been deleted.` });
 	} catch (error) {
 		console.error('Error deleting brews:', error);
-		if (!res.headersSent) {
+		if(!res.headersSent) {
 			return res.status(500).json({ error: 'Failed to delete the brews.' });
 		}
 	}
 });
 
-
 //Edit Page
 app.get('/edit/:id', asyncHandler(getBrew('edit')), asyncHandler(async(req, res, next)=>{
 	req.brew = req.brew.toObject ? req.brew.toObject() : req.brew;