f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-06 16:32:40 +00:00
Code Wiki Activity

fixes as asked

Browse Source
This commit is contained in:
Víctor Losada Hernández
2024-12-14 23:34:12 +01:00
parent afc92c4545
commit 99f2972079
3 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/app.js
View File

@@ -280,7 +280,6 @@ app.get('/css/:id', asyncHandler(getBrew('share')), (req, res)=>{getCSS(req, res
//User Page //User Page
app.get('/user/:username', async (req, res, next)=>{ app.get('/user/:username', async (req, res, next)=>{
const ownAccount = req.account && (req.account.username == req.params.username); const ownAccount = req.account && (req.account.username == req.params.username);
console.log(req.account);
req.ogMeta = { ...defaultMetaTags, req.ogMeta = { ...defaultMetaTags,
title : `${req.params.username}'s Collection`, title : `${req.params.username}'s Collection`,
@@ -352,7 +351,6 @@ app.get('/user/:username', async (req, res, next)=>{
//Change author name on brews //Change author name on brews
app.put('/api/user/rename', async (req, res)=>{ app.put('/api/user/rename', async (req, res)=>{
console.log(req.account);
const { username, newUsername } = req.body; const { username, newUsername } = req.body;
console.log(`is user ${req.account.username} equal to ${username}? ${req.account.username === username} ${req.account.username === username && 'then add the damn auth for renaming!'}`); console.log(`is user ${req.account.username} equal to ${username}? ${req.account.username === username} ${req.account.username === username && 'then add the damn auth for renaming!'}`);
console.log('renaming'); console.log('renaming');

11
server/homebrew.api.js
View File

@@ -467,12 +467,11 @@ const api = {
} }
}; };
router.use('/api', checkClientVersion); router.post('/api', checkClientVersion, asyncHandler(api.newBrew));
router.post('/api', asyncHandler(api.newBrew)); router.put('/api/:id', checkClientVersion, asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew));
router.put('/api/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew)); router.put('/api/update/:id', checkClientVersion, asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew));
router.put('/api/update/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew)); router.delete('/api/:id', checkClientVersion, asyncHandler(api.deleteBrew));
router.delete('/api/:id', asyncHandler(api.deleteBrew)); router.get('/api/remove/:id', checkClientVersion, asyncHandler(api.deleteBrew));
router.get('/api/remove/:id', asyncHandler(api.deleteBrew));
router.get('/api/theme/:renderer/:id', asyncHandler(api.getThemeBundle)); router.get('/api/theme/:renderer/:id', asyncHandler(api.getThemeBundle));
export default api; export default api;

27
server/middleware/check-client-version.js
View File

@@ -1,22 +1,15 @@
import packageJSON from '../../package.json' with { type: "json" }; import packageJSON from '../../package.json' with { type: 'json' };
export default (req, res, next) => { export default (req, res, next)=>{
const origin = req.get('Origin'); const userVersion = req.get('Homebrewery-Version');
const sameSite = req.get('Host'); const version = packageJSON.version;
if (origin && origin !== `http://${sameSite}` && origin !== `https://${sameSite}`) { if(userVersion !== version) {
return next(); // Skip version check if the request is from another site, like naturalcrit.com return res.status(412).send({
} message : `Client version ${userVersion} is out of date. Please save your changes elsewhere and refresh to pick up client version ${version}.`
});
}
const userVersion = req.get('Homebrewery-Version'); next();
const version = packageJSON.version;
if (userVersion !== version) {
return res.status(412).send({
message: `Client version ${userVersion} is out of date. Please save your changes elsewhere and refresh to pick up client version ${version}.`
});
}
next();
}; };