From 70832be810cc1564a6dab662101036bb269e2683 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Sun, 20 Jun 2021 13:53:26 -0400 Subject: [PATCH] Fix brews failing to sanitize on user page --- server.js | 1 - server/homebrew.model.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server.js b/server.js index 1d93e5401..431be41e6 100644 --- a/server.js +++ b/server.js @@ -22,7 +22,6 @@ const getBrewFromId = asyncHandler(async (id, accessType)=>{ brew = await GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, id, accessType); } else { brew = await HomebrewModel.get(accessType == 'edit' ? { editId: id } : { shareId: id }); - brew = brew.toObject(); } brew = sanitizeBrew(brew, accessType === 'edit' ? false : true); diff --git a/server/homebrew.model.js b/server/homebrew.model.js index 2e4112412..5065ae61b 100644 --- a/server/homebrew.model.js +++ b/server/homebrew.model.js @@ -45,7 +45,7 @@ HomebrewSchema.statics.get = function(query){ } if(!brews[0].renderer) brews[0].renderer = 'legacy'; - return resolve(brews[0]); + return resolve(brews[0].toObject()); //Convert Mongo Object to JSObject }); }); }; @@ -56,7 +56,7 @@ HomebrewSchema.statics.getByUser = function(username, allowAccess=false){ if(allowAccess){ delete query.published; } - Homebrew.find(query, (err, brews)=>{ + Homebrew.find(query).lean().exec((err, brews)=>{ //lean() converts results to JSObjects if(err) return reject('Can not find brew'); return resolve(brews); });