From 6436e62ec0df5f99e435d2eeca0d3e73adf59452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 28 Aug 2024 21:10:28 +0200 Subject: [PATCH] set up error page --- client/homebrew/pages/errorPage/errors/errorIndex.js | 11 +++++++++++ server/app.js | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/client/homebrew/pages/errorPage/errors/errorIndex.js b/client/homebrew/pages/errorPage/errors/errorIndex.js index 7bf2caae1..770e8a090 100644 --- a/client/homebrew/pages/errorPage/errors/errorIndex.js +++ b/client/homebrew/pages/errorPage/errors/errorIndex.js @@ -2,6 +2,9 @@ const dedent = require('dedent-tabs').default; const loginUrl = 'https://www.naturalcrit.com/login'; +//001-050 : Brew errors +//050-100 : Other pages errors + const errorIndex = (props)=>{ return { // Default catch all @@ -149,6 +152,14 @@ const errorIndex = (props)=>{ **Brew ID:** ${props.brew.brewId}`, + //account page when account is not defined + '50' : dedent` + ## You are not signed in + + You are trying to access the account page. This page can only be accessed if you are signed in an account. + + Please login or signup at our [login page](https://www.naturalcrit.com/login?redirect=https://homebrewery.naturalcrit.com/account) `, + // Brew locked by Administrators error '100' : dedent` ## This brew has been locked. diff --git a/server/app.js b/server/app.js index cc407a20a..6829d9732 100644 --- a/server/app.js +++ b/server/app.js @@ -358,10 +358,18 @@ app.get('/share/:id', asyncHandler(getBrew('share')), asyncHandler(async (req, r //Account Page app.get('/account', asyncHandler(async (req, res, next)=>{ - if(!req.account) return res.redirect('/'); const data = {}; data.title = 'Account Information Page'; + if(!req.account) { + res.set('WWW-Authenticate', 'Bearer realm="Authorization Required"'); + const error = new Error('No valid account'); + error.status = 401; + error.HBErrorCode = '50'; + error.page = data.title; + return next(error); + }; + let auth; let googleCount = []; if(req.account) {