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

Merge pull request #2089 from jeddai/google-transfer-api

Browse Source 
Update app to use a single endpoint for google and non-google stored brews
This commit is contained in:
Trevor Buckner
2022-03-27 00:54:28 -04:00
committed by GitHub
parent a1e7da8d84 67eb7fdbd4
commit 0ec9e8932e
7 changed files with 180 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/homebrew/editor/metadataEditor/metadataEditor.jsx
View File

@@ -59,7 +59,7 @@ const MetadataEditor = createClass({
if(!confirm('Are you REALLY sure? You will lose editor access to this document.')) return; if(!confirm('Are you REALLY sure? You will lose editor access to this document.')) return;
} }
request.delete(`/api/${this.props.metadata.editId}`) request.delete(`/api/${this.props.metadata.googleId}${this.props.metadata.editId}`)
.send() .send()
.end(function(err, res){ .end(function(err, res){
window.location.href = '/'; window.location.href = '/';

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

@@ -31,19 +31,11 @@ const BrewItem = createClass({
if(!confirm('Are you REALLY sure? You will lose editor access to this document.')) return; if(!confirm('Are you REALLY sure? You will lose editor access to this document.')) return;
} }
if(this.props.brew.googleId) { request.delete(`/api/${this.props.brew.googleId}${this.props.brew.editId}`)
request.get(`/api/removeGoogle/${this.props.brew.googleId}${this.props.brew.editId}`) .send()
.send() .end(function(err, res){
.end(function(err, res){ location.reload();
location.reload(); });
});
} else {
request.delete(`/api/${this.props.brew.editId}`)
.send()
.end(function(err, res){
location.reload();
});
}
}, },
renderDeleteBrewLink : function(){ renderDeleteBrewLink : function(){

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

@@ -200,73 +200,18 @@ const EditPage = createClass({
const brew = this.state.brew; const brew = this.state.brew;
brew.pageCount = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1; brew.pageCount = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
if(this.state.saveGoogle) { const params = `${transfer ? `?transfer${this.state.saveGoogle ? 'To' : 'From'}Google=true` : ''}`;
if(transfer) { const res = await request
const res = await request .put(`/api/update/${brew.editId}${params}`)
.post('/api/newGoogle/') .send(brew)
.send(brew) .catch((err)=>{
.catch((err)=>{ console.log('Error Updating Local Brew');
console.log(err.status === 401 this.setState({ errors: err });
? 'Not signed in!' });
: 'Error Transferring to Google!');
this.setState({ errors: err, saveGoogle: false });
});
if(!res) { return; } this.savedBrew = res.body;
if(transfer) {
console.log('Deleting Local Copy'); history.replaceState(null, null, `/edit/${this.savedBrew.googleId ?? ''}${this.savedBrew.editId}`);
await request.delete(`/api/${brew.editId}`)
.send()
.catch((err)=>{
console.log('Error deleting Local Copy');
});
this.savedBrew = res.body;
history.replaceState(null, null, `/edit/${this.savedBrew.googleId}${this.savedBrew.editId}`); //update URL to match doc ID
} else {
const res = await request
.put(`/api/updateGoogle/${brew.editId}`)
.send(brew)
.catch((err)=>{
console.log(err.status === 401
? 'Not signed in!'
: 'Error Saving to Google!');
this.setState({ errors: err });
return;
});
this.savedBrew = res.body;
}
} else {
if(transfer) {
const res = await request.post('/api')
.send(brew)
.catch((err)=>{
console.log('Error creating Local Copy');
this.setState({ errors: err });
return;
});
await request.get(`/api/removeGoogle/${brew.googleId}${brew.editId}`)
.send()
.catch((err)=>{
console.log('Error Deleting Google Brew');
});
this.savedBrew = res.body;
history.replaceState(null, null, `/edit/${this.savedBrew.editId}`); //update URL to match doc ID
} else {
const res = await request
.put(`/api/update/${brew.editId}`)
.send(brew)
.catch((err)=>{
console.log('Error Updating Local Brew');
this.setState({ errors: err });
return;
});
this.savedBrew = res.body;
}
} }
this.setState((prevState)=>({ this.setState((prevState)=>({

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

@@ -157,45 +157,24 @@ const NewPage = createClass({
const index = brew.text.indexOf('```\n\n'); const index = brew.text.indexOf('```\n\n');
brew.style = `${brew.style ? `${brew.style}\n` : ''}${brew.text.slice(7, index - 1)}`; brew.style = `${brew.style ? `${brew.style}\n` : ''}${brew.text.slice(7, index - 1)}`;
brew.text = brew.text.slice(index + 5); brew.text = brew.text.slice(index + 5);
}; }
brew.pageCount=((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1; brew.pageCount=((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
if(this.state.saveGoogle) { const res = await request
const res = await request .post(`/api${this.state.saveGoogle ? '?transferToGoogle=true' : ''}`)
.post('/api/newGoogle/')
.send(brew) .send(brew)
.catch((err)=>{ .catch((err)=>{
console.log(err.status === 401 console.log(err);
? 'Not signed in!'
: 'Error Creating New Google Brew!');
this.setState({ isSaving: false, errors: err }); this.setState({ isSaving: false, errors: err });
return;
}); });
if(!res) return;
brew = res.body; brew = res.body;
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.googleId ?? ''}${brew.editId}`;
} else {
request.post('/api')
.send(brew)
.end((err, res)=>{
if(err){
this.setState({
isSaving : false
});
return;
}
window.onbeforeunload = function(){};
brew = res.body;
localStorage.removeItem(BREWKEY);
localStorage.removeItem(STYLEKEY);
localStorage.removeItem(METAKEY);
window.location = `/edit/${brew.editId}`;
});
}
}, },
renderSaveButton : function(){ renderSaveButton : function(){

2
package-lock.json generated
View File

@@ -23150,4 +23150,4 @@
"integrity": "sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==" "integrity": "sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA=="
} }
} }
} }

4
server/googleActions.js
View File

@@ -180,8 +180,8 @@ const GoogleActions = {
'description' : `${brew.description}`, 'description' : `${brew.description}`,
'parents' : [folderId], 'parents' : [folderId],
'properties' : { //AppProperties is not accessible 'properties' : { //AppProperties is not accessible
'shareId' : nanoid(12), 'shareId' : brew.shareId || nanoid(12),
'editId' : nanoid(12), 'editId' : brew.editId || nanoid(12),
'title' : brew.title, 'title' : brew.title,
'views' : '0', 'views' : '0',
'pageCount' : brew.pageCount, 'pageCount' : brew.pageCount,

259
server/homebrew.api.js
View File

@@ -41,154 +41,195 @@ const excludePropsFromUpdate = (brew)=>{
const propsToExclude = ['views', 'lastViewed']; const propsToExclude = ['views', 'lastViewed'];
for (const prop of propsToExclude) { for (const prop of propsToExclude) {
delete brew[prop]; delete brew[prop];
}; }
return brew; return brew;
}; };
const newBrew = (req, res)=>{ const beforeNewSave = (account, brew)=>{
const brew = req.body;
if(!brew.title) { if(!brew.title) {
brew.title = getGoodBrewTitle(brew.text); brew.title = getGoodBrewTitle(brew.text);
} }
brew.authors = (req.account) ? [req.account.username] : []; brew.authors = (account) ? [account.username] : [];
brew.text = mergeBrewText(brew); brew.text = mergeBrewText(brew);
};
delete brew.editId; const newLocalBrew = async (brew)=>{
delete brew.shareId;
delete brew.googleId;
const newHomebrew = new HomebrewModel(brew); const newHomebrew = new HomebrewModel(brew);
// Compress brew text to binary before saving // Compress brew text to binary before saving
newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text); newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.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
newHomebrew.text = undefined; newHomebrew.text = undefined;
newHomebrew.save((err, obj)=>{ let saved = await newHomebrew.save()
if(err) {
console.error(err, err.toString(), err.stack);
return res.status(500).send(`Error while creating new brew, ${err.toString()}`);
}
obj = obj.toObject();
obj.gDrive = false;
return res.status(200).send(obj);
});
};
const updateBrew = (req, res)=>{
HomebrewModel.get({ editId: req.params.id })
.then((brew)=>{
const updateBrew = excludePropsFromUpdate(req.body);
brew = _.merge(brew, updateBrew);
brew.text = mergeBrewText(brew);
// Compress brew text to binary before saving
brew.textBin = zlib.deflateRawSync(brew.text);
// Delete the non-binary text field since it's not needed anymore
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');
brew.save((err, obj)=>{
if(err) throw err;
return res.status(200).send(obj);
});
})
.catch((err)=>{ .catch((err)=>{
console.error(err); console.error(err, err.toString(), err.stack);
return res.status(500).send('Error while saving'); throw `Error while creating new brew, ${err.toString()}`;
}); });
saved = saved.toObject();
saved.gDrive = false;
return saved;
}; };
const deleteBrew = (req, res)=>{ const newGoogleBrew = async (account, brew, res)=>{
HomebrewModel.find({ editId: req.params.id }, (err, objs)=>{ const oAuth2Client = GoogleActions.authCheck(account, res);
if(!objs.length || err) {
return res.status(404).send('Can not find homebrew with that id');
}
const brew = objs[0]; return await GoogleActions.newGoogleBrew(oAuth2Client, brew);
if(req.account) {
// Remove current user as author
brew.authors = _.pull(brew.authors, req.account.username);
brew.markModified('authors');
}
if(brew.authors.length === 0) {
// Delete brew if there are no authors left
brew.remove((err)=>{
if(err) return res.status(500).send('Error while removing');
return res.status(200).send();
});
} else {
// Otherwise, save the brew with updated author list
brew.save((err, savedBrew)=>{
if(err) throw err;
return res.status(200).send(savedBrew);
});
}
});
}; };
const newGoogleBrew = async (req, res, next)=>{ const newBrew = async (req, res)=>{
let oAuth2Client;
try { oAuth2Client = GoogleActions.authCheck(req.account, res); } catch (err) { return res.status(err.status).send(err.message); }
const brew = req.body; const brew = req.body;
const { transferToGoogle } = req.query;
if(!brew.title) {
brew.title = getGoodBrewTitle(brew.text);
}
brew.authors = (req.account) ? [req.account.username] : [];
brew.text = mergeBrewText(brew);
delete brew.editId; delete brew.editId;
delete brew.shareId; delete brew.shareId;
delete brew.googleId; delete brew.googleId;
req.body = brew; beforeNewSave(req.account, brew);
try { let saved;
const newBrew = await GoogleActions.newGoogleBrew(oAuth2Client, brew); if(transferToGoogle) {
return res.status(200).send(newBrew); saved = await newGoogleBrew(req.account, brew, res)
} catch (err) { .catch((err)=>{
return res.status(err.response.status).send(err); res.status(err.status || err.response.status).send(err.message || err);
});
} else {
saved = await newLocalBrew(brew)
.catch((err)=>{
res.status(500).send(err);
});
}
if(!saved) return;
return res.status(200).send(saved);
};
const updateBrew = async (req, res)=>{
let brew = excludePropsFromUpdate(req.body);
const { transferToGoogle, transferFromGoogle } = req.query;
let saved;
if(brew.googleId && transferFromGoogle) {
beforeNewSave(req.account, brew);
saved = await newLocalBrew(brew)
.catch((err)=>{
console.error(err);
res.status(500).send(err);
});
if(!saved) return;
await deleteGoogleBrew(req.account, `${brew.googleId}${brew.editId}`, res)
.catch((err)=>{
console.error(err);
res.status(err.status || err.response.status).send(err.message || err);
});
} else if(!brew.googleId && transferToGoogle) {
saved = await newGoogleBrew(req.account, brew, res)
.catch((err)=>{
console.error(err);
res.status(err.status || err.response.status).send(err.message || err);
});
if(!saved) return;
await deleteLocalBrew(req.account, brew.editId)
.catch((err)=>{
console.error(err);
res.status(err.status).send(err.message);
});
} else if(brew.googleId) {
brew.text = mergeBrewText(brew);
saved = await GoogleActions.updateGoogleBrew(brew)
.catch((err)=>{
console.error(err);
res.status(err.response?.status || 500).send(err);
});
} 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
brew.textBin = zlib.deflateRawSync(brew.text);
// Delete the non-binary text field since it's not needed anymore
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;
if(!res.headersSent) return res.status(200).send(saved);
};
const deleteBrew = async (req, 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 updateGoogleBrew = async (req, res, next)=>{ const deleteLocalBrew = async (account, id)=>{
const brew = excludePropsFromUpdate(req.body); const brew = await HomebrewModel.findOne({ editId: id });
brew.text = mergeBrewText(brew); if(!brew) {
throw { status: 404, message: 'Can not find homebrew with that id' };
try {
const updatedBrew = await GoogleActions.updateGoogleBrew(brew);
return res.status(200).send(updatedBrew);
} catch (err) {
return res.status(err.response?.status || 500).send(err);
} }
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);
await GoogleActions.deleteGoogleBrew(auth, id);
return true;
}; };
router.post('/api', newBrew); router.post('/api', newBrew);
router.post('/api/newGoogle/', newGoogleBrew);
router.put('/api/:id', updateBrew); router.put('/api/:id', updateBrew);
router.put('/api/update/:id', updateBrew); router.put('/api/update/:id', updateBrew);
router.put('/api/updateGoogle/:id', updateGoogleBrew);
router.delete('/api/:id', deleteBrew); router.delete('/api/:id', deleteBrew);
router.get('/api/remove/:id', deleteBrew); router.get('/api/remove/:id', deleteBrew);
router.get('/api/removeGoogle/:id', async (req, res)=>{
const auth = await GoogleActions.authCheck(req.account, res);
await GoogleActions.deleteGoogleBrew(auth, req.params.id);
return res.status(200).send();
});
module.exports = router; module.exports = router;