From 3e2ed21d3d93e1223df326252bd59b61085cb9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 12 Sep 2019 10:21:18 -0400 Subject: [PATCH] refactor: move tos parsing to /tos --- src/controllers/index.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/controllers/index.js b/src/controllers/index.js index 90514a6d99..9ba75167dd 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -168,11 +168,7 @@ Controllers.register = async function (req, res, next) { if (registrationType === 'invite-only' || registrationType === 'admin-invite-only') { await user.verifyInvitation(req.query); } - const termsOfUse = await plugins.fireHook('filter:parse.post', { - postData: { - content: meta.config.termsOfUse || '', - }, - }); + const loginStrategies = require('../routes/authentication').getLoginStrategies(); res.render('register', { 'register_window:spansize': loginStrategies.length ? 'col-md-6' : 'col-md-12', @@ -183,7 +179,6 @@ Controllers.register = async function (req, res, next) { maximumUsernameLength: meta.config.maximumUsernameLength, minimumPasswordLength: meta.config.minimumPasswordLength, minimumPasswordStrength: meta.config.minimumPasswordStrength, - termsOfUse: termsOfUse.postData.content, breadcrumbs: helpers.buildBreadcrumbs([{ text: '[[register:register]]', }]), @@ -317,11 +312,16 @@ Controllers.outgoing = function (req, res, next) { }); }; -Controllers.termsOfUse = function (req, res, next) { +Controllers.termsOfUse = async function (req, res, next) { if (!meta.config.termsOfUse) { return next(); } + const termsOfUse = await plugins.fireHook('filter:parse.post', { + postData: { + content: meta.config.termsOfUse || '', + }, + }); res.render('tos', { - termsOfUse: meta.config.termsOfUse, + termsOfUse: termsOfUse.postData.content, }); };