f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-09 13:42:38 +00:00
Code Wiki Activity

update API and frontend for google drive document stubs

Browse Source
This commit is contained in:
Charlie Humphreys
2022-03-30 23:23:45 -05:00
parent 562ba42b1b
commit fa8d47400f
7 changed files with 266 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
View File

@@ -16,8 +16,8 @@ const BrewItem = createClass({
brew : { brew : {
title : '', title : '',
description : '', description : '',
authors : [],
authors : [] stubbed : true
} }
}; };
}, },
@@ -50,7 +50,7 @@ const BrewItem = createClass({
if(!this.props.brew.editId) return; if(!this.props.brew.editId) return;
let editLink = this.props.brew.editId; let editLink = this.props.brew.editId;
if(this.props.brew.googleId) { if(this.props.brew.googleId && !this.props.brew.stubbed) {
editLink = this.props.brew.googleId + editLink; editLink = this.props.brew.googleId + editLink;
} }
@@ -63,7 +63,7 @@ const BrewItem = createClass({
if(!this.props.brew.shareId) return; if(!this.props.brew.shareId) return;
let shareLink = this.props.brew.shareId; let shareLink = this.props.brew.shareId;
if(this.props.brew.googleId) { if(this.props.brew.googleId && !this.props.brew.stubbed) {
shareLink = this.props.brew.googleId + shareLink; shareLink = this.props.brew.googleId + shareLink;
} }
@@ -86,7 +86,7 @@ const BrewItem = createClass({
}, },
renderGoogleDriveIcon : function(){ renderGoogleDriveIcon : function(){
if(!this.props.brew.gDrive) return; if(!this.props.brew.googleId) return;
return <span> return <span>
<img className='googleDriveIcon' src={googleDriveIcon} alt='googleDriveIcon' /> <img className='googleDriveIcon' src={googleDriveIcon} alt='googleDriveIcon' />
@@ -104,8 +104,8 @@ const BrewItem = createClass({
</div> </div>
<hr /> <hr />
<div className='info'> <div className='info'>
<span title={`Authors:\n${brew.authors.join('\n')}`}> <span title={`Authors:\n${brew.authors?.join('\n')}`}>
<i className='fas fa-user'/> {brew.authors.join(', ')} <i className='fas fa-user'/> {brew.authors?.join(', ')}
</span> </span>
<br /> <br />
<span title={`Last viewed: ${moment(brew.lastViewed).local().format(dateFormatString)}`}> <span title={`Last viewed: ${moment(brew.lastViewed).local().format(dateFormatString)}`}>

2
client/homebrew/pages/editPage/editPage.jsx
View File

@@ -211,7 +211,7 @@ const EditPage = createClass({
this.savedBrew = res.body; this.savedBrew = res.body;
if(transfer) { if(transfer) {
history.replaceState(null, null, `/edit/${this.savedBrew.googleId ?? ''}${this.savedBrew.editId}`); history.replaceState(null, null, `/edit/${this.savedBrew.editId}`);
} }
this.setState((prevState)=>({ this.setState((prevState)=>({

2
client/homebrew/pages/newPage/newPage.jsx
View File

@@ -174,7 +174,7 @@ const NewPage = createClass({
localStorage.removeItem(BREWKEY); localStorage.removeItem(BREWKEY);
localStorage.removeItem(STYLEKEY); localStorage.removeItem(STYLEKEY);
localStorage.removeItem(METAKEY); localStorage.removeItem(METAKEY);
window.location = `/edit/${brew.googleId ?? ''}${brew.editId}`; window.location = `/edit/${brew.editId}`;
}, },
renderSaveButton : function(){ renderSaveButton : function(){

134
server/app.js
View File

@@ -9,48 +9,14 @@ const yaml = require('js-yaml');
const app = express(); const app = express();
const config = require('./config.js'); const config = require('./config.js');
const homebrewApi = require('./homebrew.api.js'); const { homebrewApi, getBrew } = require('./homebrew.api.js');
const GoogleActions = require('./googleActions.js'); const GoogleActions = require('./googleActions.js');
const serveCompressedStaticAssets = require('./static-assets.mv.js'); const serveCompressedStaticAssets = require('./static-assets.mv.js');
const sanitizeFilename = require('sanitize-filename'); const sanitizeFilename = require('sanitize-filename');
const asyncHandler = require('express-async-handler'); const asyncHandler = require('express-async-handler');
const brewAccessTypes = ['edit', 'share', 'raw']; const splitTextStyleAndMetadata = (req, res, next)=>{
const { brew } = req;
//Get the brew object from the HB database or Google Drive
const getBrewFromId = asyncHandler(async (id, accessType)=>{
if(!brewAccessTypes.includes(accessType))
throw ('Invalid Access Type when getting brew');
let brew;
if(id.length > 12) {
const googleId = id.slice(0, -12);
id = id.slice(-12);
brew = await GoogleActions.getGoogleBrew(googleId, id, accessType);
} else {
brew = await HomebrewModel.get(accessType == 'edit' ? { editId: id } : { shareId: id });
brew = brew.toObject(); // Convert MongoDB object to standard Javascript Object
}
brew = sanitizeBrew(brew, accessType === 'edit' ? false : true);
//Split brew.text into text and style
//unless the Access Type is RAW, in which case return immediately
if(accessType == 'raw') {
return brew;
}
splitTextStyleAndMetadata(brew);
return brew;
});
const sanitizeBrew = (brew, full=false)=>{
delete brew._id;
delete brew.__v;
if(full){
delete brew.editId;
}
return brew;
};
const splitTextStyleAndMetadata = (brew)=>{
brew.text = brew.text.replaceAll('\r\n', '\n'); brew.text = brew.text.replaceAll('\r\n', '\n');
if(brew.text.startsWith('```metadata')) { if(brew.text.startsWith('```metadata')) {
const index = brew.text.indexOf('```\n\n'); const index = brew.text.indexOf('```\n\n');
@@ -64,6 +30,24 @@ const splitTextStyleAndMetadata = (brew)=>{
brew.style = brew.text.slice(7, index - 1); brew.style = brew.text.slice(7, index - 1);
brew.text = brew.text.slice(index + 5); brew.text = brew.text.slice(index + 5);
} }
req.brew = brew;
return next();
};
const sanitizeBrew = (brew, full = false)=>{
delete brew._id;
delete brew.__v;
if(full){
delete brew.editId;
}
return brew;
};
const sanitizeMiddleware = (accessType)=>{
return (req, res, next)=>{
req.brew = sanitizeBrew(req.brew, accessType !== 'edit');
return next();
};
}; };
app.use('/', serveCompressedStaticAssets(`build`)); app.use('/', serveCompressedStaticAssets(`build`));
@@ -108,63 +92,54 @@ app.get('/robots.txt', (req, res)=>{
}); });
//Home page //Home page
app.get('/', async (req, res, next)=>{ app.get('/', (req, res, next)=>{
const brew = { req.brew = {
text : welcomeText text : welcomeText
}; };
req.brew = brew;
return next(); return next();
}); });
//Home page v3 //Home page v3
app.get('/v3_preview', async (req, res, next)=>{ app.get('/v3_preview', (req, res, next)=>{
const brew = { req.brew = {
text : welcomeTextV3, text : welcomeTextV3,
renderer : 'V3' renderer : 'V3'
}; };
splitTextStyleAndMetadata(brew);
req.brew = brew;
return next(); return next();
}); }, splitTextStyleAndMetadata);
//Legacy/Other Document -> v3 Migration Guide //Legacy/Other Document -> v3 Migration Guide
app.get('/migrate', async (req, res, next)=>{ app.get('/migrate', (req, res, next)=>{
const brew = { req.brew = {
text : migrateText, text : migrateText,
renderer : 'V3' renderer : 'V3'
}; };
splitTextStyleAndMetadata(brew);
req.brew = brew;
return next(); return next();
}); }, splitTextStyleAndMetadata);
//Changelog page //Changelog page
app.get('/changelog', async (req, res, next)=>{ app.get('/changelog', async (req, res, next)=>{
const brew = { req.brew = {
title : 'Changelog', title : 'Changelog',
text : changelogText, text : changelogText,
renderer : 'V3' renderer : 'V3'
}; };
splitTextStyleAndMetadata(brew);
req.brew = brew;
return next(); return next();
}); }, splitTextStyleAndMetadata);
//FAQ page //FAQ page
app.get('/faq', async (req, res, next)=>{ app.get('/faq', async (req, res, next)=>{
const brew = { req.brew = {
title : 'FAQ', title : 'FAQ',
text : faqText, text : faqText,
renderer : 'V3' renderer : 'V3'
}; };
splitTextStyleAndMetadata(brew);
req.brew = brew;
return next(); return next();
}); }, splitTextStyleAndMetadata);
//Source page //Source page
app.get('/source/:id', asyncHandler(async (req, res)=>{ app.get('/source/:id', asyncHandler(getBrew('share')), (req, res)=>{
const brew = await getBrewFromId(req.params.id, 'raw'); const { brew } = req;
const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' }; const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
let text = brew.text; let text = brew.text;
@@ -173,11 +148,11 @@ app.get('/source/:id', asyncHandler(async (req, res)=>{
} }
text = `<code><pre style="white-space: pre-wrap;">${text}</pre></code>`; text = `<code><pre style="white-space: pre-wrap;">${text}</pre></code>`;
res.status(200).send(text); res.status(200).send(text);
})); });
//Download brew source page //Download brew source page
app.get('/download/:id', asyncHandler(async (req, res)=>{ app.get('/download/:id', asyncHandler(getBrew('share')), sanitizeMiddleware('share'), (req, res)=>{
const brew = await getBrewFromId(req.params.id, 'raw'); const { brew } = req;
const prefix = 'HB - '; const prefix = 'HB - ';
let fileName = sanitizeFilename(`${prefix}${brew.title}`).replaceAll(' ', ''); let fileName = sanitizeFilename(`${prefix}${brew.title}`).replaceAll(' ', '');
@@ -188,7 +163,7 @@ app.get('/download/:id', asyncHandler(async (req, res)=>{
'Content-Disposition' : `attachment; filename="${fileName}.txt"` 'Content-Disposition' : `attachment; filename="${fileName}.txt"`
}); });
res.status(200).send(brew.text); res.status(200).send(brew.text);
})); });
//User Page //User Page
app.get('/user/:username', async (req, res, next)=>{ app.get('/user/:username', async (req, res, next)=>{
@@ -220,44 +195,35 @@ app.get('/user/:username', async (req, res, next)=>{
}); });
//Edit Page //Edit Page
app.get('/edit/:id', asyncHandler(async (req, res, next)=>{ app.get('/edit/:id', asyncHandler(getBrew('edit')), sanitizeMiddleware('edit'), splitTextStyleAndMetadata, (req, res, next)=>{
res.header('Cache-Control', 'no-cache, no-store'); //reload the latest saved brew when pressing back button, not the cached version before save. res.header('Cache-Control', 'no-cache, no-store'); //reload the latest saved brew when pressing back button, not the cached version before save.
const brew = await getBrewFromId(req.params.id, 'edit');
req.brew = brew;
return next(); return next();
})); });
//New Page //New Page
app.get('/new/:id', asyncHandler(async (req, res, next)=>{ app.get('/new/:id', asyncHandler(getBrew('share')), sanitizeMiddleware('share'), splitTextStyleAndMetadata, (req, res, next)=>{
const brew = await getBrewFromId(req.params.id, 'share'); req.brew.title = `CLONE - ${brew.title}`;
brew.title = `CLONE - ${brew.title}`;
req.brew = brew;
return next(); return next();
})); });
//Share Page //Share Page
app.get('/share/:id', asyncHandler(async (req, res, next)=>{ app.get('/share/:id', asyncHandler(getBrew('share')), asyncHandler(async (req, res, next)=>{
const brew = await getBrewFromId(req.params.id, 'share'); const { brew } = req;
if(req.params.id.length > 12) { if(req.params.id.length > 12 && !brew._id) {
const googleId = req.params.id.slice(0, -12); const googleId = req.params.id.slice(0, -12);
const shareId = req.params.id.slice(-12); const shareId = req.params.id.slice(-12);
await GoogleActions.increaseView(googleId, shareId, 'share', brew) await GoogleActions.increaseView(googleId, shareId, 'share', brew)
.catch((err)=>{next(err);}); .catch((err)=>{next(err);});
} else { } else {
await HomebrewModel.increaseView({ shareId: brew.shareId }); await HomebrewModel.increaseView({ shareId: brew.shareId });
} }
req.brew = brew;
return next(); return next();
})); }), sanitizeMiddleware('share'), splitTextStyleAndMetadata);
//Print Page //Print Page
app.get('/print/:id', asyncHandler(async (req, res, next)=>{ app.get('/print/:id', asyncHandler(getBrew('share')), sanitizeMiddleware('share'), splitTextStyleAndMetadata);
const brew = await getBrewFromId(req.params.id, 'share');
req.brew = brew;
return next();
}));
//Render the page //Render the page
const templateFn = require('./../client/template.js'); const templateFn = require('./../client/template.js');

60
server/googleActions.js
View File

@@ -141,13 +141,7 @@ const GoogleActions = {
name : `${brew.title}.txt`, name : `${brew.title}.txt`,
description : `${brew.description}`, description : `${brew.description}`,
properties : { properties : {
title : brew.title, title : brew.title
published : brew.published,
version : brew.version,
renderer : brew.renderer,
tags : brew.tags,
pageCount : brew.pageCount,
systems : brew.systems.join()
} }
}, },
media : { media : {
@@ -159,10 +153,9 @@ const GoogleActions = {
console.log('Error saving to google'); console.log('Error saving to google');
console.error(err); console.error(err);
throw (err); throw (err);
//return res.status(500).send('Error while saving');
}); });
return (brew); return true;
}, },
newGoogleBrew : async (auth, brew)=>{ newGoogleBrew : async (auth, brew)=>{
@@ -180,12 +173,9 @@ const GoogleActions = {
'description' : `${brew.description}`, 'description' : `${brew.description}`,
'parents' : [folderId], 'parents' : [folderId],
'properties' : { //AppProperties is not accessible 'properties' : { //AppProperties is not accessible
'shareId' : brew.shareId || nanoid(12), 'shareId' : brew.shareId || nanoid(12),
'editId' : brew.editId || nanoid(12), 'editId' : brew.editId || nanoid(12),
'title' : brew.title, 'title' : brew.title
'views' : '0',
'pageCount' : brew.pageCount,
'renderer' : brew.renderer || 'legacy'
} }
}; };
@@ -212,26 +202,7 @@ const GoogleActions = {
console.error(err); console.error(err);
}); });
const newHomebrew = { return obj.data.id;
text : brew.text,
shareId : fileMetadata.properties.shareId,
editId : fileMetadata.properties.editId,
createdAt : new Date(),
updatedAt : new Date(),
gDrive : true,
googleId : obj.data.id,
pageCount : fileMetadata.properties.pageCount,
title : brew.title,
description : brew.description,
tags : '',
published : brew.published,
renderer : brew.renderer,
authors : [],
systems : []
};
return newHomebrew;
}, },
getGoogleBrew : async (id, accessId, accessType)=>{ getGoogleBrew : async (id, accessId, accessType)=>{
@@ -244,7 +215,6 @@ const GoogleActions = {
.catch((err)=>{ .catch((err)=>{
console.log('Error loading from Google'); console.log('Error loading from Google');
throw (err); throw (err);
return;
}); });
if(obj) { if(obj) {
@@ -254,9 +224,7 @@ const GoogleActions = {
throw ('Share ID does not match'); throw ('Share ID does not match');
} }
const serviceDrive = google.drive({ version: 'v3' }); const file = await drive.files.get({
const file = await serviceDrive.files.get({
fileId : id, fileId : id,
fields : 'description, properties', fields : 'description, properties',
alt : 'media' alt : 'media'
@@ -273,7 +241,7 @@ const GoogleActions = {
text : file.data, text : file.data,
description : obj.data.description, description : obj.data.description,
tags : obj.data.properties.tags ? obj.data.properties.tags : '', tags : obj.data.properties.tags ? obj.data.properties.tags : '',
systems : obj.data.properties.systems ? obj.data.properties.systems.split(',') : [], systems : obj.data.properties.systems ? obj.data.properties.systems.split(',') : [],
authors : [], authors : [],
published : obj.data.properties.published ? obj.data.properties.published == 'true' : false, published : obj.data.properties.published ? obj.data.properties.published == 'true' : false,
@@ -287,7 +255,6 @@ const GoogleActions = {
version : parseInt(obj.data.properties.version) || 0, version : parseInt(obj.data.properties.version) || 0,
renderer : obj.data.properties.renderer ? obj.data.properties.renderer : 'legacy', renderer : obj.data.properties.renderer ? obj.data.properties.renderer : 'legacy',
gDrive : true,
googleId : id googleId : id
}; };
@@ -295,14 +262,11 @@ const GoogleActions = {
} }
}, },
deleteGoogleBrew : async (auth, id)=>{ deleteGoogleBrew : async (auth, id, accessId)=>{
const drive = google.drive({ version: 'v3', auth }); const drive = google.drive({ version: 'v3', auth });
const googleId = id.slice(0, -12);
const accessId = id.slice(-12);
const obj = await drive.files.get({ const obj = await drive.files.get({
fileId : googleId, fileId : id,
fields : 'properties' fields : 'properties'
}) })
.catch((err)=>{ .catch((err)=>{
@@ -311,11 +275,11 @@ const GoogleActions = {
}); });
if(obj && obj.data.properties.editId != accessId) { if(obj && obj.data.properties.editId != accessId) {
throw ('Not authorized to delete this Google brew'); throw { status: 403, message: 'Not authorized to delete this Google brew' };
} }
await drive.files.update({ await drive.files.update({
fileId : googleId, fileId : id,
resource : { trashed: true } resource : { trashed: true }
}) })
.catch((err)=>{ .catch((err)=>{

319
server/homebrew.api.js
View File

@@ -5,6 +5,8 @@ const zlib = require('zlib');
const GoogleActions = require('./googleActions.js'); const GoogleActions = require('./googleActions.js');
const Markdown = require('../shared/naturalcrit/markdown.js'); const Markdown = require('../shared/naturalcrit/markdown.js');
const yaml = require('js-yaml'); const yaml = require('js-yaml');
const asyncHandler = require('express-async-handler');
const { nanoid } = require('nanoid');
// const getTopBrews = (cb) => { // const getTopBrews = (cb) => {
// HomebrewModel.find().sort({ views: -1 }).limit(5).exec(function(err, brews) { // HomebrewModel.find().sort({ views: -1 }).limit(5).exec(function(err, brews) {
@@ -12,6 +14,51 @@ const yaml = require('js-yaml');
// }); // });
// }; // };
const findBrew = async (brewId, accessType, googleObjectId)=>{
let id = brewId;
let googleId = googleObjectId;
if(id.length > 12) {
googleId = id.slice(0, -12);
id = id.slice(-12);
}
let brew = await HomebrewModel.get(accessType === 'edit' ? { editId: id } : { shareId: id })
.catch((err)=>{
if(googleId) {
console.warn(`Unable to find document stub for ${accessType}Id ${id}`);
} else {
console.warn(err);
}
});
let googleBrew;
if(googleId || brew?.googleId) {
googleBrew = await GoogleActions.getGoogleBrew(googleId || brew?.googleId, id, accessType)
.catch((err)=>{
console.warn(err);
});
if(!brew && !googleBrew) throw 'Brew not found in database or Google Drive';
brew = brew ? _.merge(brew, googleBrew) : googleBrew;
} else if(!brew) {
throw 'Brew not found in database';
}
return brew;
};
const getBrew = (accessType)=>{
return async (req, res, next)=>{
const { brew } = req;
if(!brew) {
const id = req.params.id, googleId = req.body?.googleId;
const found = await findBrew(id, accessType, googleId);
req.brew = accessType !== 'edit' && found.toObject ? found.toObject() : found;
}
!!next ? next() : undefined;
};
};
const mergeBrewText = (brew)=>{ const mergeBrewText = (brew)=>{
let text = brew.text; let text = brew.text;
if(brew.style !== undefined) { if(brew.style !== undefined) {
@@ -32,13 +79,21 @@ const MAX_TITLE_LENGTH = 100;
const getGoodBrewTitle = (text)=>{ const getGoodBrewTitle = (text)=>{
const tokens = Markdown.marked.lexer(text); const tokens = Markdown.marked.lexer(text);
return (tokens.find((token)=>token.type == 'heading' || token.type == 'paragraph')?.text || 'No Title') return (tokens.find((token)=>token.type === 'heading' || token.type === 'paragraph')?.text || 'No Title')
.slice(0, MAX_TITLE_LENGTH); .slice(0, MAX_TITLE_LENGTH);
}; };
const excludePropsFromUpdate = (brew)=>{ const excludePropsFromUpdate = (brew)=>{
// Remove undesired properties // Remove undesired properties
const propsToExclude = ['views', 'lastViewed']; const propsToExclude = ['views', 'lastViewed', 'editId', 'shareId', 'googleId'];
for (const prop of propsToExclude) {
delete brew[prop];
}
return brew;
};
const excludeGoogleProps = (brew)=>{
const propsToExclude = ['views', 'lastViewed', 'pageCount', 'renderer', 'tags', 'systems', 'published', 'version', 'authors'];
for (const prop of propsToExclude) { for (const prop of propsToExclude) {
delete brew[prop]; delete brew[prop];
} }
@@ -54,28 +109,12 @@ const beforeNewSave = (account, brew)=>{
brew.text = mergeBrewText(brew); brew.text = mergeBrewText(brew);
}; };
const newLocalBrew = async (brew)=>{
const newHomebrew = new HomebrewModel(brew);
// Compress brew text to binary before saving
newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text);
// Delete the non-binary text field since it's not needed anymore
newHomebrew.text = undefined;
let saved = await newHomebrew.save()
.catch((err)=>{
console.error(err, err.toString(), err.stack);
throw `Error while creating new brew, ${err.toString()}`;
});
saved = saved.toObject();
saved.gDrive = false;
return saved;
};
const newGoogleBrew = async (account, brew, res)=>{ const newGoogleBrew = async (account, brew, res)=>{
const oAuth2Client = GoogleActions.authCheck(account, res); const oAuth2Client = GoogleActions.authCheck(account, res);
return await GoogleActions.newGoogleBrew(oAuth2Client, brew); const newBrew = excludeGoogleProps(_.clone(brew));
return await GoogleActions.newGoogleBrew(oAuth2Client, newBrew);
}; };
const newBrew = async (req, res)=>{ const newBrew = async (req, res)=>{
@@ -88,148 +127,178 @@ const newBrew = async (req, res)=>{
beforeNewSave(req.account, brew); beforeNewSave(req.account, brew);
let saved; const newHomebrew = new HomebrewModel(brew);
newHomebrew.editId = nanoid(12);
newHomebrew.shareId = nanoid(12);
let googleId, saved;
if(transferToGoogle) { if(transferToGoogle) {
saved = await newGoogleBrew(req.account, brew, res) googleId = await newGoogleBrew(req.account, newHomebrew, res)
.catch((err)=>{ .catch((err)=>{
res.status(err.status || err.response.status).send(err.message || err); res.status(err?.status || err?.response?.status || 500).send(err?.message || err);
}); });
newHomebrew.textBin = undefined;
newHomebrew.text = undefined;
} else { } else {
saved = await newLocalBrew(brew) // Compress brew text to binary before saving
.catch((err)=>{ newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text);
res.status(500).send(err); // Delete the non-binary text field since it's not needed anymore
}); newHomebrew.text = undefined;
} }
if(transferToGoogle && !googleId) {
if(!res.headersSent) {
res.status(500).send('Unable to save document to Google Drive');
}
return;
} else if(transferToGoogle) {
newHomebrew.googleId = googleId;
}
saved = await newHomebrew.save()
.catch((err)=>{
console.error(err, err.toString(), err.stack);
throw `Error while creating new brew, ${err.toString()}`;
});
if(!saved) return; if(!saved) return;
saved = saved.toObject();
return res.status(200).send(saved); return res.status(200).send(saved);
}; };
const updateBrew = async (req, res)=>{ const updateBrew = async (req, res)=>{
let brew = excludePropsFromUpdate(req.body); let brew = Object.assign(req.brew, excludePropsFromUpdate(req.body));
brew.text = mergeBrewText(brew);
const { transferToGoogle, transferFromGoogle } = req.query; const { transferToGoogle, transferFromGoogle } = req.query;
let saved;
if(brew.googleId && transferFromGoogle) { if(brew.googleId && transferFromGoogle) {
beforeNewSave(req.account, brew); const deleted = await deleteGoogleBrew(req.account, brew.googleId, brew.editId, res)
saved = await newLocalBrew(brew)
.catch((err)=>{ .catch((err)=>{
console.error(err); console.error(err);
res.status(500).send(err); res.status(err?.status || err?.response?.status || 500).send(err.message || err);
}); });
if(!saved) return; if(!deleted) {
if(res.headersSent) {
res.status(500).send('Unable to delete brew from Google');
}
return;
}
await deleteGoogleBrew(req.account, `${brew.googleId}${brew.editId}`, res) delete brew.googleId;
.catch((err)=>{
console.error(err);
res.status(err.status || err.response.status).send(err.message || err);
});
} else if(!brew.googleId && transferToGoogle) { } else if(!brew.googleId && transferToGoogle) {
saved = await newGoogleBrew(req.account, brew, res) brew.googleId = await newGoogleBrew(req.account, excludeGoogleProps(_.clone(brew)), res)
.catch((err)=>{ .catch((err)=>{
console.error(err); console.error(err);
res.status(err.status || err.response.status).send(err.message || err); res.status(err.status || err.response.status).send(err.message || err);
}); });
if(!saved) return; if(!brew.googleId) {
if(res.headersSent) {
await deleteLocalBrew(req.account, brew.editId) res.status(500).send('Unable to save brew to Google');
.catch((err)=>{ }
console.error(err); return;
res.status(err.status).send(err.message); }
});
} else if(brew.googleId) { } else if(brew.googleId) {
brew.text = mergeBrewText(brew); const updated = await GoogleActions.updateGoogleBrew(excludeGoogleProps(_.clone(brew)))
saved = await GoogleActions.updateGoogleBrew(brew)
.catch((err)=>{ .catch((err)=>{
console.error(err); console.error(err);
res.status(err.response?.status || 500).send(err); res.status(err?.response?.status || 500).send(err);
}); });
if(!updated) {
if(res.headersSent) {
res.status(500).send('Unable to save brew to Google');
}
return;
}
}
if(brew.googleId) {
brew.textBin = undefined;
brew.text = undefined;
} else { } else {
const dbBrew = await HomebrewModel.get({ editId: req.params.id })
.catch((err)=>{
console.error(err);
return res.status(500).send('Error while saving');
});
brew = _.merge(dbBrew, brew);
brew.text = mergeBrewText(brew);
// Compress brew text to binary before saving // Compress brew text to binary before saving
brew.textBin = zlib.deflateRawSync(brew.text); brew.textBin = zlib.deflateRawSync(brew.text);
// Delete the non-binary text field since it's not needed anymore // Delete the non-binary text field since it's not needed anymore
brew.text = undefined; brew.text = undefined;
brew.updatedAt = new Date();
if(req.account) {
brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
}
brew.markModified('authors');
brew.markModified('systems');
saved = await brew.save();
} }
if(!saved) return; brew.updatedAt = new Date();
if(req.account) {
brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
}
if(!brew.markModified) {
brew = new HomebrewModel(brew);
}
brew.markModified('authors');
brew.markModified('systems');
const saved = await brew.save()
.catch((err)=>{
res.status(err.status || 500).send(err.message || 'Unable to save brew to Homebrewery database');
});
if(!saved) {
if(!res.headersSent) {
res.status(500).send('Unable to save brew to Homebrewery database');
}
}
if(!res.headersSent) return res.status(200).send(saved); if(!res.headersSent) return res.status(200).send(saved);
}; };
const deleteBrew = async (req, res)=>{ const deleteGoogleBrew = async (account, id, editId, res)=>{
if(req.params.id.length > 12) {
const deleted = await deleteGoogleBrew(req.account, req.params.id, res)
.catch((err)=>{
res.status(500).send(err);
});
if(deleted) return res.status(200).send();
} else {
const deleted = await deleteLocalBrew(req.account, req.params.id)
.catch((err)=>{
res.status(err.status).send(err.message);
});
if(deleted) return res.status(200).send(deleted);
return res.status(200).send();
}
};
const deleteLocalBrew = async (account, id)=>{
const brew = await HomebrewModel.findOne({ editId: id });
if(!brew) {
throw { status: 404, message: 'Can not find homebrew with that id' };
}
if(account) {
// Remove current user as author
brew.authors = _.pull(brew.authors, account.username);
brew.markModified('authors');
}
if(brew.authors.length === 0) {
// Delete brew if there are no authors left
await brew.remove()
.catch((err)=>{
console.error(err);
throw { status: 500, message: 'Error while removing' };
});
} else {
// Otherwise, save the brew with updated author list
return await brew.save()
.catch((err)=>{
throw { status: 500, message: err };
});
}
};
const deleteGoogleBrew = async (account, id, res)=>{
const auth = await GoogleActions.authCheck(account, res); const auth = await GoogleActions.authCheck(account, res);
await GoogleActions.deleteGoogleBrew(auth, id); await GoogleActions.deleteGoogleBrew(auth, id, editId);
return true; return true;
}; };
router.post('/api', newBrew); const deleteBrew = async (req, res)=>{
router.put('/api/:id', updateBrew); const { brew, account } = req;
router.put('/api/update/:id', updateBrew); if(brew.googleId) {
router.delete('/api/:id', deleteBrew); const googleDeleted = await deleteGoogleBrew(account, brew.googleId, brew.editId, res)
router.get('/api/remove/:id', deleteBrew); .catch((err)=>{
res.status(500).send(err);
});
if(!googleDeleted) {
if(!res.headersSent) {
res.status(500).send('Unable to delete brew from Google');
}
return;
}
}
module.exports = router; if(brew._id) {
if(account) {
// Remove current user as author
brew.authors = _.pull(brew.authors, account.username);
brew.markModified('authors');
}
if(brew.authors.length === 0) {
// Delete brew if there are no authors left
await brew.remove()
.catch((err)=>{
console.error(err);
throw { status: 500, message: 'Error while removing' };
});
} else {
// Otherwise, save the brew with updated author list
await brew.save()
.catch((err)=>{
throw { status: 500, message: err };
});
}
}
return res.status(204).send();
};
router.post('/api', asyncHandler(newBrew));
router.put('/api/:id', asyncHandler(getBrew('edit')), asyncHandler(updateBrew));
router.put('/api/update/:id', asyncHandler(getBrew('edit')), asyncHandler(updateBrew));
router.delete('/api/:id', asyncHandler(getBrew('edit')), asyncHandler(deleteBrew));
router.get('/api/remove/:id', asyncHandler(getBrew('edit')), asyncHandler(deleteBrew));
module.exports = {
homebrewApi : router,
getBrew
};

1
server/homebrew.model.js
View File

@@ -6,6 +6,7 @@ const zlib = require('zlib');
const HomebrewSchema = mongoose.Schema({ const HomebrewSchema = mongoose.Schema({
shareId : { type: String, default: ()=>{return nanoid(12);}, index: { unique: true } }, shareId : { type: String, default: ()=>{return nanoid(12);}, index: { unique: true } },
editId : { type: String, default: ()=>{return nanoid(12);}, index: { unique: true } }, editId : { type: String, default: ()=>{return nanoid(12);}, index: { unique: true } },
googleId : { type: String },
title : { type: String, default: '' }, title : { type: String, default: '' },
text : { type: String, default: '' }, text : { type: String, default: '' },
textBin : { type: Buffer }, textBin : { type: Buffer },