diff --git a/server/googleActions.js b/server/googleActions.js index bfe1b406f..29d82c15e 100644 --- a/server/googleActions.js +++ b/server/googleActions.js @@ -151,19 +151,21 @@ GoogleActions = { if(await GoogleActions.existsGoogleBrew(auth, brew.googleId) == true) { await drive.files.update({ fileId : brew.googleId, - resource : { name : `${brew.title}.txt`, - description : `${brew.description}`, - properties : { title : brew.title, - published : brew.published, - lastViewed : brew.lastViewed, - views : brew.views, - version : brew.version, - renderer : brew.renderer, - tags : brew.tags, - systems : brew.systems.join() } - }, - media : { mimeType : 'text/plain', - body : brew.text } + resource : { + name : `${brew.title}.txt`, + description : `${brew.description}`, + properties : { + title : brew.title, + published : brew.published, + version : brew.version, + renderer : brew.renderer, + tags : brew.tags, + systems : brew.systems.join() } + }, + media : { + mimeType : 'text/plain', + body : brew.text + } }) .catch((err)=>{ console.log('Error saving to google'); diff --git a/server/homebrew.api.js b/server/homebrew.api.js index 1f988761d..d838575e1 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -61,10 +61,20 @@ const newBrew = (req, res)=>{ }); }; +const cleanBrew = (brew)=>{ + // Remove undesired properties + const undesiredPropertyNames=['views', 'lastViewed']; + for (const undesiredProperty of undesiredPropertyNames) { + delete brew[undesiredProperty]; + }; + return brew; +}; + const updateBrew = (req, res)=>{ HomebrewModel.get({ editId: req.params.id }) .then((brew)=>{ - brew = _.merge(brew, req.body); + const updateBrew = cleanBrew(req.body); + brew = _.merge(brew, updateBrew); brew.text = mergeBrewText(brew.text, brew.style); // Compress brew text to binary before saving @@ -151,7 +161,7 @@ const updateGoogleBrew = async (req, res, next)=>{ try { oAuth2Client = GoogleActions.authCheck(req.account, res); } catch (err) { return res.status(err.status).send(err.message); } - const brew = req.body; + const brew = cleanBrew(req.body); brew.text = mergeBrewText(brew.text, brew.style); const updatedBrew = await GoogleActions.updateGoogleBrew(oAuth2Client, brew);