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

Don't redirect/use cookies. Just render page.

Browse Source
This commit is contained in:
Trevor Buckner
2023-06-23 17:24:31 -04:00
parent 2fa1b2bb8b
commit 37c88b83f1
1 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
server/app.js
View File

@@ -397,16 +397,6 @@ app.get('/account', asyncHandler(async (req, res, next)=>{
return next(); return next();
})); }));
app.get('/error', (req, res, next)=>{
const errorCookie = JSON.parse(req.cookies['HOMEBREWERY_Error']);
if(errorCookie){ res.cookie('HOMEBREWERY_Error', '', { maxAge: 0 }); }
req.ogMeta = errorCookie.ogMeta;
req.brew = errorCookie.error;
return next();
});
const nodeEnv = config.get('node_env'); const nodeEnv = config.get('node_env');
const isLocalEnvironment = config.get('local_environments').includes(nodeEnv); const isLocalEnvironment = config.get('local_environments').includes(nodeEnv);
// Local only // Local only
@@ -432,7 +422,7 @@ const renderPage = async (req, res) => {
}; };
const props = { const props = {
version : require('./../package.json').version, version : require('./../package.json').version,
url : req.originalUrl, url : req.customUrl || req.originalUrl,
brew : req.brew, brew : req.brew,
brews : req.brews, brews : req.brews,
googleBrews : req.googleBrews, googleBrews : req.googleBrews,
@@ -446,11 +436,11 @@ const renderPage = async (req, res) => {
const page = await templateFn('homebrew', title, props) const page = await templateFn('homebrew', title, props)
.catch((err)=>{ .catch((err)=>{
console.log(err); console.log(err);
return res.sendStatus(500);
}); });
return page; return page;
}; };
//Send rendered page
app.use(asyncHandler(async (req, res, next)=>{ app.use(asyncHandler(async (req, res, next)=>{
const page = await renderPage(req, res); const page = await renderPage(req, res);
if(!page) return; if(!page) return;
@@ -458,8 +448,8 @@ app.use(asyncHandler(async (req, res, next)=>{
})); }));
//v=====----- Error-Handling Middleware -----=====v// //v=====----- Error-Handling Middleware -----=====v//
//Format Errors so all fields will be sent //Format Errors as plain objects so all fields will appear in the string sent
const replaceErrors = (key, value)=>{ const formatErrors = (key, value)=>{
if(value instanceof Error) { if(value instanceof Error) {
const error = {}; const error = {};
Object.getOwnPropertyNames(value).forEach(function (key) { Object.getOwnPropertyNames(value).forEach(function (key) {
@@ -471,28 +461,27 @@ const replaceErrors = (key, value)=>{
}; };
const getPureError = (error)=>{ const getPureError = (error)=>{
return JSON.parse(JSON.stringify(error, replaceErrors)); return JSON.parse(JSON.stringify(error, formatErrors));
}; };
app.use((err, req, res, next)=>{ app.use(async (err, req, res, next)=>{
console.log(err);
const status = err.status || err.code || 500; const status = err.status || err.code || 500;
console.error(err);
const errorData = { req.ogMeta = {...defaultMetaTags,
error : { title : 'Error Page',
title : 'Error - Something went wrong!', description : 'Something went wrong!'
text : err.errors?.map((error)=>{return error.message;}).join('\n\n') || err.message || 'Unknown error!',
status : status
},
ogMeta : { ...defaultMetaTags,
title : 'Error Page',
description : 'Something went wrong!'
}
}; };
res.cookie('HOMEBREWERY_Error', JSON.stringify(errorData), { maxAge: 300 * 1000 }); req.brew = {
title : 'Error - Something went wrong!',
text : err.errors?.map((error)=>{return error.message;}).join('\n\n') || err.message || 'Unknown error!',
status : status
};
req.customUrl= '/error';
// res.status(status).send(getPureError(err)); const page = await renderPage(req, res);
res.redirect('/error'); if(!page) return;
res.send(page);
}); });
app.use((req, res)=>{ app.use((req, res)=>{