diff --git a/src/middleware/render-data.js b/src/middleware/render-data.js index 8e2a384..8673377 100644 --- a/src/middleware/render-data.js +++ b/src/middleware/render-data.js @@ -15,6 +15,8 @@ async function renderDataMiddleware(request, response, next) { // Reset message cookies response.clearCookie('success_message', { domain: '.pretendo.network' }); response.clearCookie('error_message', { domain: '.pretendo.network' }); + + response.locals.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token; return next(); } diff --git a/src/routes/account.js b/src/routes/account.js index db6f432..771b712 100644 --- a/src/routes/account.js +++ b/src/routes/account.js @@ -47,7 +47,6 @@ router.get('/', pnidMiddleware, async (request, response) => { renderData.tierLevel = pnid.get('connections.stripe.tier_level'); renderData.account = account; renderData.isTester = account.access_level > 0; - renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token; // Check if a Discord account is linked to the PNID if (account.connections.discord.id && account.connections.discord.id.trim() !== '') { diff --git a/src/routes/aprilfools.js b/src/routes/aprilfools.js index 1b69014..74d7454 100644 --- a/src/routes/aprilfools.js +++ b/src/routes/aprilfools.js @@ -6,9 +6,7 @@ router.get('/', async (request, response) => { const renderData = {}; - renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token; - - if (renderData.isLoggedIn) { + if (response.locals.isLoggedIn) { const account = await util.getAccount(request, response); renderData.account = account; } diff --git a/src/routes/blog.js b/src/routes/blog.js index 749c314..2b27e23 100644 --- a/src/routes/blog.js +++ b/src/routes/blog.js @@ -40,9 +40,7 @@ router.get('/', async (request, response) => { postList }; - renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token; - - if (renderData.isLoggedIn) { + if (response.locals.isLoggedIn) { const account = await util.getAccount(request, response); renderData.account = account; } @@ -74,9 +72,7 @@ router.get('/:slug', async (request, response, next) => { postList, }; - renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token; - - if (renderData.isLoggedIn) { + if (response.locals.isLoggedIn) { const account = await util.getAccount(request, response); renderData.account = account; } diff --git a/src/routes/docs.js b/src/routes/docs.js index 913c27f..5f6697a 100644 --- a/src/routes/docs.js +++ b/src/routes/docs.js @@ -15,9 +15,7 @@ router.get('/search', async (request, response) => { currentPage: request.params.slug }; - renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token; - - if (renderData.isLoggedIn) { + if (response.locals.isLoggedIn) { const account = await util.getAccount(request, response); renderData.account = account; } @@ -30,9 +28,7 @@ router.get('/:slug', async (request, response, next) => { currentPage: request.params.slug }; - renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token; - - if (renderData.isLoggedIn) { + if (response.locals.isLoggedIn) { const account = await util.getAccount(request, response); renderData.account = account; } diff --git a/src/routes/home.js b/src/routes/home.js index d0a94c5..fc21522 100644 --- a/src/routes/home.js +++ b/src/routes/home.js @@ -11,9 +11,7 @@ router.get('/', async (request, response) => { boards }; - renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token; - - if (renderData.isLoggedIn) { + if (response.locals.isLoggedIn) { const account = await util.getAccount(request, response); renderData.account = account; } diff --git a/src/routes/localization.js b/src/routes/localization.js index 72819c0..7e4dec3 100644 --- a/src/routes/localization.js +++ b/src/routes/localization.js @@ -5,9 +5,7 @@ const router = new Router(); router.get('/', async (request, response) => { const renderData = {}; - renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token; - - if (renderData.isLoggedIn) { + if (response.locals.isLoggedIn) { const account = await util.getAccount(request, response); renderData.account = account; } diff --git a/src/routes/progress.js b/src/routes/progress.js index eacd849..6a70d3e 100644 --- a/src/routes/progress.js +++ b/src/routes/progress.js @@ -10,9 +10,7 @@ router.get('/', async (request, response) => { boards }; - renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token; - - if (renderData.isLoggedIn) { + if (response.locals.isLoggedIn) { const account = await util.getAccount(request, response); renderData.account = account; }