From aaedba6fb873c1c6fc2868b316db476d04b78640 Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Mon, 21 Jan 2019 14:06:06 +0100 Subject: [PATCH 1/3] [refactor] reuse publish function --- index.js | 51 ++++++++++++++------------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/index.js b/index.js index 01e1309..2b50df3 100644 --- a/index.js +++ b/index.js @@ -5,44 +5,21 @@ var path = require('path') module.exports = function attachToServer (server, app, opts) { var solidWs = new SolidWs(server, opts) - if (app) { + function publish (req, res, next) { + debug('pub ' + req.originalUrl + ' after edit') + solidWs.publish(req.originalUrl) + var parent = path.dirname(req.originalUrl) + path.sep + if (parent !== req.originalUrl) { + solidWs.publish(parent) + } + next() + } - app.post('/*', function (req, res, next) { - debug('pub ' + req.originalUrl + ' after post') - solidWs.publish(req.originalUrl) - var parent = path.dirname(req.originalUrl) + path.sep - if (parent !== req.originalUrl) { - solidWs.publish(parent) - } - next() - }) - app.patch('/*', function (req, res, next) { - debug('pub ' + req.originalUrl + ' after patch') - solidWs.publish(req.originalUrl) - var parent = path.dirname(req.originalUrl) + path.sep - if (parent !== req.originalUrl) { - solidWs.publish(parent) - } - next() - }) - app.put('/*', function (req, res, next) { - debug('pub ' + req.originalUrl + ' after put') - solidWs.publish(req.originalUrl) - var parent = path.dirname(req.originalUrl) + path.sep - if (parent !== req.originalUrl) { - solidWs.publish(parent) - } - next() - }) - app.delete('/*', function (req, res, next) { - debug('pub ' + req.originalUrl + ' after delete') - solidWs.publish(req.originalUrl) - var parent = path.dirname(req.originalUrl) + path.sep - if (parent !== req.originalUrl) { - solidWs.publish(parent) - } - next() - }) + if (app) { + app.post('/*', publish) + app.patch('/*', publish) + app.put('/*', publish) + app.delete('/*', publish) } return solidWs From a0498ddf99ff21cb6bd30c50b509277eff244e75 Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Mon, 21 Jan 2019 15:20:05 +0100 Subject: [PATCH 2/3] only publish if resource is public --- index.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/index.js b/index.js index 2b50df3..eb53d91 100644 --- a/index.js +++ b/index.js @@ -4,15 +4,20 @@ var path = require('path') module.exports = function attachToServer (server, app, opts) { var solidWs = new SolidWs(server, opts) - function publish (req, res, next) { - debug('pub ' + req.originalUrl + ' after edit') - solidWs.publish(req.originalUrl) - var parent = path.dirname(req.originalUrl) + path.sep - if (parent !== req.originalUrl) { - solidWs.publish(parent) - } - next() + req.acl.can(null, 'Read').then(isPublic => { + if (isPublic) { + debug('pub ' + req.originalUrl + ' after edit') + solidWs.publish(req.originalUrl) + var parent = path.dirname(req.originalUrl) + path.sep + if (parent !== req.originalUrl) { + solidWs.publish(parent) + } + } else { + debug('do not pub ' + req.originalUrl + ' after edit') + } + next() + }) } if (app) { From 2f2217acaa5afb06e246bc164f6ac84d3d1b888b Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Mon, 21 Jan 2019 15:56:38 +0100 Subject: [PATCH 3/3] update NodeJS version on TravisCI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bfab963..8d72f39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ sudo: false language: node_js node_js: - - "0.12" + - "10"