Leahnaya/website
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/website.git synced 2026-08-23 00:57:21 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

movedIsLoggedIn to render-data middleware

Browse Source
This commit is contained in:
Jonathan Barrow
2022-07-16 09:55:09 -04:00
parent 2575300907
commit 8d4c195ad4
8 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/middleware/render-data.js
View File

@@ -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();
}

1
src/routes/account.js
View File

@@ -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() !== '') {

4
src/routes/aprilfools.js
View File

@@ -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;
}

8
src/routes/blog.js
View File

@@ -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;
}

8
src/routes/docs.js
View File

@@ -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;
}

4
src/routes/home.js
View File

@@ -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;
}

4
src/routes/localization.js
View File

@@ -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;
}

4
src/routes/progress.js
View File

@@ -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;
}