From f2ae45838e02ea1a5284063fe9640b19a99e74b2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 20 Jan 2023 16:05:31 -0500 Subject: [PATCH] feat: buildAccountData middleware automatically added ot all account routes --- src/middleware/user.js | 6 ++++++ src/routes/user.js | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/middleware/user.js b/src/middleware/user.js index c3871bd023..d610ccef0d 100644 --- a/src/middleware/user.js +++ b/src/middleware/user.js @@ -12,6 +12,7 @@ const plugins = require('../plugins'); const helpers = require('./helpers'); const auth = require('../routes/authentication'); const writeRouter = require('../routes/write'); +const accountHelpers = require('../controllers/accounts/helpers'); const controllers = { helpers: require('../controllers/helpers'), @@ -223,6 +224,11 @@ module.exports = function (middleware) { res.status(403).render('403', { title: '[[global:403.title]]' }); }; + middleware.buildAccountData = async (req, res, next) => { + res.locals.templateValues = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query); + next(); + }; + middleware.registrationComplete = async function registrationComplete(req, res, next) { // If the user's session contains registration data, redirect the user to complete registration if (!req.session.hasOwnProperty('registration')) { diff --git a/src/routes/user.js b/src/routes/user.js index b6fd28d21d..6254dcdf5d 100644 --- a/src/routes/user.js +++ b/src/routes/user.js @@ -5,11 +5,10 @@ const helpers = require('./helpers'); const { setupPageRoute } = helpers; module.exports = function (app, name, middleware, controllers) { - const middlewares = [middleware.exposeUid, middleware.canViewUsers]; + const middlewares = [middleware.exposeUid, middleware.canViewUsers, middleware.buildAccountData]; const accountMiddlewares = [ - middleware.exposeUid, + ...middlewares, middleware.ensureLoggedIn, - middleware.canViewUsers, middleware.checkAccountPermissions, ];