Merge branch 'develop' of git.digitaltelepresence.com:digital-telepresence/dtp-sites into develop

master
rob 2 years ago
commit 457a7f50a2

@ -260,7 +260,8 @@ class PostController extends SiteController {
async getView (req, res, next) { async getView (req, res, next) {
const { comment: commentService, resource: resourceService } = this.dtp.services; const { comment: commentService, resource: resourceService } = this.dtp.services;
try { try {
if ((res.locals.post.status !== 'published') && if ((res.locals.post.status !== 'published') &&
req.user &&
!res.locals.post.author._id.equals(req.user._id) && !res.locals.post.author._id.equals(req.user._id) &&
!req.user.hasAuthorDashboard) { !req.user.hasAuthorDashboard) {
throw new SiteError(403, 'The post is not published'); throw new SiteError(403, 'The post is not published');

@ -39,6 +39,7 @@ class WelcomeController extends SiteController {
} }
async getWelcomeCoreMember (req, res) { async getWelcomeCoreMember (req, res) {
await this.checkForUser(req, res);
res.render('welcome/core-member'); res.render('welcome/core-member');
} }
@ -58,23 +59,33 @@ class WelcomeController extends SiteController {
} }
async getSignupView (req, res) { async getSignupView (req, res) {
await this.checkForUser(req, res);
req.session.captcha = req.session.captcha || { }; req.session.captcha = req.session.captcha || { };
req.session.captcha.signup = captcha.randomText(4 + Math.floor(Math.random()*4)); req.session.captcha.signup = captcha.randomText(4 + Math.floor(Math.random()*4));
res.render('welcome/signup'); res.render('welcome/signup');
} }
async getLoginView (req, res) { async getLoginView (req, res) {
await this.checkForUser(req, res);
res.locals.loginResult = req.session.loginResult; res.locals.loginResult = req.session.loginResult;
res.render('welcome/login'); res.render('welcome/login');
} }
async getHomeView (req, res, next) { async getHomeView (req, res, next) {
try { try {
await this.checkForUser(req, res);
res.render('welcome/index'); res.render('welcome/index');
} catch (error) { } catch (error) {
return next(error); return next(error);
} }
} }
async checkForUser (req, res) {
if (req.user) {
res.redirect(301, '/');
}
}
} }
module.exports = { module.exports = {

Loading…
Cancel
Save