diff --git a/README.md b/README.md index dc3a7bf..7c46f7d 100644 --- a/README.md +++ b/README.md @@ -42,3 +42,9 @@ $ yarn lint ``` $ yarn test ``` + +### Authentication + +To manage pages you need to authorize (available on `/auth`). + +To generate password use `yarn generatePassword [password]` command. diff --git a/src/routes/middlewares/pages.js b/src/routes/middlewares/pages.js index b0d8165..21386bb 100644 --- a/src/routes/middlewares/pages.js +++ b/src/routes/middlewares/pages.js @@ -55,7 +55,7 @@ function createMenuTree(parentPageId, pages, pagesOrder, level = 1, currentLevel * @param res * @param next */ -module.exports = asyncMiddleware(async function (req, res, next) { +module.exports = asyncMiddleware(async (req, res, next) => { /** * Pages without parent * @type {string} diff --git a/src/routes/middlewares/token.js b/src/routes/middlewares/token.js index 6305ebf..220a972 100644 --- a/src/routes/middlewares/token.js +++ b/src/routes/middlewares/token.js @@ -13,10 +13,13 @@ module.exports = async function verifyToken(req, res, next) { let token = req.cookies.authToken; const userDoc = await Users.get(); - if (userDoc) { - jwt.verify(token, userDoc.passHash + config.secret, (err, decodedToken) => { - res.locals.isAuthorized = !(err || !decodedToken); - next(); - }); + if (!userDoc) { + res.locals.isAuthorized = false; + next(); } + + jwt.verify(token, userDoc.passHash + config.secret, (err, decodedToken) => { + res.locals.isAuthorized = !(err || !decodedToken); + next(); + }); }; diff --git a/src/routes/pages.js b/src/routes/pages.js index 27e3680..d91fa7c 100644 --- a/src/routes/pages.js +++ b/src/routes/pages.js @@ -26,7 +26,7 @@ router.get('/page/edit/:id', verifyToken, allowEdit, async (req, res, next) => { try { const page = await Pages.get(pageId); - const pagesAvailable = await Pages.getAllExceptChildrens(pageId); + const pagesAvailable = await Pages.getAllExceptChildren(pageId); const parentsChildrenOrdered = await PagesOrder.getOrderedChildren(pagesAvailable, pageId, page._parent, true); res.render('pages/form', { diff --git a/src/views/components/header.twig b/src/views/components/header.twig index b138ff6..6507977 100644 --- a/src/views/components/header.twig +++ b/src/views/components/header.twig @@ -2,19 +2,19 @@ {{ config.title }} -