Fix sanitizing brews in user page, hide own G brews on other profiles

changelog.md

@@ -6,9 +6,10 @@ h5 {
 
 # changelog
 
-### Saturday, 10/6/2021 - v2.12.0
+### Thursday, 10/6/2021 - v2.12.0
 
 - New "style" tab to better organize custom CSS in preparation for new themes and sharable styles.
+- Your own Google brews will no longer show up in the list when viewing someone else's profile.
 
 ### Saturday, 02/5/2021 - v2.11.2
 

client/homebrew/homebrew.jsx

@@ -31,7 +31,7 @@ const Homebrew = createClass({
 			}
 		};
 	},
-	componentWillMount : function() {
+	componentDidMount : function() {
 		global.account = this.props.account;
 		global.version = this.props.version;
 		global.enable_v3 = this.props.enable_v3;

server.js

@@ -138,25 +138,25 @@ app.get('/download/:id', asyncHandler(async (req, res)=>{
 
 //User Page
 app.get('/user/:username', async (req, res, next)=>{
-	const fullAccess = req.account && (req.account.username == req.params.username);
+	const ownAccount = req.account && (req.account.username == req.params.username);
 
-	let googleBrews = [];
-
-	if(req.account && req.account.googleId){
-		googleBrews = await GoogleActions.listGoogleBrews(req, res)
-		.catch((err)=>{
-			console.error(err);
-		});
-	}
-
-	const brews = await HomebrewModel.getByUser(req.params.username, fullAccess)
+	let brews = await HomebrewModel.getByUser(req.params.username, ownAccount)
 	.catch((err)=>{
 		console.log(err);
 	});
 
-	if(googleBrews) {
-		req.brews = _.concat(brews, googleBrews);
-	} else {req.brews = brews;}
+	if(ownAccount && req?.account?.googleId){
+		const googleBrews = await GoogleActions.listGoogleBrews(req, res)
+		.catch((err)=>{
+			console.error(err);
+		});
+
+		brews = _.concat(brews, googleBrews);
+	}
+
+	req.brews = _.map(brews, (brew)=>{
+		return sanitizeBrew(brew, !ownAccount);
+	});
 
 	return next();
 });

server/homebrew.model.js

@@ -58,9 +58,7 @@ HomebrewSchema.statics.getByUser = function(username, allowAccess=false){
 		}
 		Homebrew.find(query, (err, brews)=>{
 			if(err) return reject('Can not find brew');
-			return resolve(_.map(brews, (brew)=>{
-				return brew.sanatize(!allowAccess);
-			}));
+			return resolve(brews);
 		});
 	});
 };