Finish cleaning up backend to use data injection MW
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing

This commit is contained in:
2020-11-12 21:26:36 -06:00
parent 42b7ccad7f
commit c569840618
2 changed files with 59 additions and 60 deletions

View File

@@ -13,13 +13,7 @@ class Page extends Controller {
}
async revert_version(req, res, next) {
const PageId = req.params.PageId
const user = req.user
let page = await PageModel.findOne({UUID: PageId})
if ( !page ) return res.status(404).message('Page not found with that ID.').api({})
if ( !(await page.is_accessible_by(user)) ) return req.security.deny()
const { page } = req.form
const level = await page.access_level_for(req.user)
if ( !req.body.version_num ) {
@@ -46,13 +40,7 @@ class Page extends Controller {
async get_page_versions(req, res, next) {
const User = this.models.get('auth:User')
const PageId = req.params.PageId
const user = req.user
let page = await PageModel.findOne({UUID: PageId})
if ( !page ) return res.status(404).message('Page not found with that ID.').api({})
if ( !(await page.is_accessible_by(user)) ) return req.security.deny()
const { page } = req.form
const versions = page.version_archive.map(version_data => {
return {
@@ -73,13 +61,9 @@ class Page extends Controller {
}
async get_page(req, res) {
const PageId = req.params.PageId
const user = req.user
let { page } = req.form
let page = await PageModel.findOne({UUID: PageId})
if ( !page ) return res.status(404).message('Page not found with that ID.').api({})
if ( !(await page.is_accessible_by(user)) ) return req.security.deny()
const level = await page.access_level_for(req.user)
const version_num = req.body.version || req.query.version
@@ -100,7 +84,9 @@ class Page extends Controller {
const PageId = req.params.PageId
let page;
if ( PageId ) {
if ( req.form.page ) {
page = req.form.page
} else if ( PageId ) {
page = await PageModel.findOne({UUID: PageId})
if ( !page ) return res.status(404).message('Page not found with that ID.').api({})
if ( !(await page.is_accessible_by(req.user, 'update')) ) return res.security.deny()
@@ -154,14 +140,7 @@ class Page extends Controller {
}
async get_nodes(req, res) {
const PageId = req.params.PageId
let page;
if ( PageId ) {
page = await PageModel.findOne({UUID: PageId})
if ( !page ) return res.status(404).message('Page not found with that ID.').api({})
if ( !(await page.is_accessible_by(req.user)) ) return req.security.deny()
}
let { page } = req.form
const version_num = req.body.version || req.query.version
if ( version_num ) {
@@ -184,11 +163,7 @@ class Page extends Controller {
}
async save_node_to_page(req, res) {
const PageId = req.params.PageId
const page = await PageModel.findOne({UUID: PageId})
if ( !page ) return res.status(404).message('Page not found with that ID.').api({})
if ( !(await page.is_accessible_by(req.user, 'update')) ) return res.security.deny()
const { page } = req.form
const nodes = await Node.find({PageId: page.UUID})
const assoc_nodes = {}
@@ -232,14 +207,7 @@ class Page extends Controller {
}
async save_nodes(req, res) {
const PageId = req.params.PageId
let page;
if ( PageId ) {
page = await PageModel.findOne({UUID: PageId})
if ( !page ) return res.status(404).message('Page not found with that ID.').api({})
if ( !(await page.is_accessible_by(req.user, 'update')) ) return req.security.deny()
}
const { page } = req.form
const nodes = await Node.find({PageId: page.UUID})
const assoc_nodes = {}
@@ -402,15 +370,8 @@ class Page extends Controller {
}
async delete_page(req, res) {
const PageId = req.params.PageId
let page;
if ( PageId ) {
page = await PageModel.findOne({UUID: PageId})
if ( !page ) return res.status(404).message('Page not found with that ID.').api({})
if ( !(await page.is_accessible_by(req.user, 'manage')) ) return req.security.deny()
if ( page.ParentId === '0' ) return req.security.kickout()
}
const { page } = req.form
if ( page.ParentId === '0' ) return req.security.kickout()
page.Active = false
page.DeletedAt = new Date