Merge pull request #65 from Human-Connection/develop

Update master

Author: appinteractive

package-lock.json

@@ -41,7 +41,7 @@
     "dev:debug": "npm run clear && concurrently '$npm_package_config_mongoDev' 'wait-on tcp:27017 && NODE_ENV=development nodemon --inspect server/'",
     "dev": "npm run clear && concurrently '$npm_package_config_mongoDev' 'wait-on tcp:27017 && NODE_ENV=development DEBUG=feathers nodemon server/'",
     "dev:noseed": "concurrently 'mongod --dbpath data' 'wait-on tcp:27017 && NODE_ENV=development DEBUG=feathers nodemon server/'",
-    "dev:win": "npm run clear && concurrently \"mongod --dbpath /data/db\" \"wait-on tcp:27017&& cross-env NODE_ENV=development&& cross-env DEBUG=feathers&& nodemon --inspect server/\"",
+    "dev:win": "npm run clear && concurrently \"mongod --dbpath /data/db\" \"wait-on tcp:27017&&cross-env NODE_ENV=development&&cross-env DEBUG=feathers&& nodemon --inspect server/\"",
     "mocha": "npm run clear && $npm_package_config_concurrently '$npm_package_config_mongoDev &>/dev/null' 'wait-on tcp:27017 && NODE_ENV=test $npm_package_config_mocha'",
     "coverage": "npm run clear && $npm_package_config_concurrently '$npm_package_config_mongoDev &>/dev/null' 'wait-on tcp:27017 && NODE_ENV=test istanbul cover $npm_package_config_mochaCoverage'"
   },
@@ -52,11 +52,10 @@
     "concurrently": "concurrently --kill-others --success first"
   },
   "dependencies": {
-    "body-parser": "~1.18.2",
+    "body-parser": "~1.18.3",
     "cheerio": "^1.0.0-rc.2",
-    "compression": "~1.7.1",
+    "compression": "~1.7.2",
     "cors": "~2.8.4",
-    "cross-env": "^5.1.4",
     "crypto": "~1.0.1",
     "crypto-js": "^3.1.9-1",
     "dauria": "~2.0.0",
@@ -72,7 +71,7 @@
     "feathers-errors": "~2.9.2",
     "feathers-hooks": "~2.1.2",
     "feathers-hooks-common": "~3.10.0",
-    "feathers-logger": "~0.2.3",
+    "feathers-logger": "0.2.3",
     "feathers-mailer": "~2.0.0",
     "feathers-memory": "~1.3.1",
     "feathers-mongodb": "~3.0.0",
@@ -85,31 +84,32 @@
     "fs-extra": "~4.0.2",
     "handlebars": "~4.0.11",
     "handlebars-layouts": "~3.1.4",
-    "helmet": "~3.10.0",
+    "helmet": "~3.12.0",
     "html-excerpt": "~0.1.0",
-    "mime": "^2.2.0",
+    "mime": "^2.3.1",
     "mongoose": "~4.13.2",
     "multer": "~1.3.0",
     "node-sass": "~4.7.2",
-    "quill-url-embeds": "^1.2.0",
-    "raven": "~2.4.0",
-    "request": "~2.83.0",
+    "quill-url-embeds": "^1.2.5",
+    "raven": "~2.6.1",
+    "request": "~2.86.0",
     "request-promise": "~4.2.2",
     "sanitize-html": "^1.18.2",
-    "serve-favicon": "~2.4.5",
+    "serve-favicon": "~2.5.0",
     "shortid": "~2.2.8",
     "slug": "~0.9.1",
     "trunc-html": "^1.1.2",
     "valid-url": "^1.0.9",
-    "winston": "~3.0.0-rc1"
+    "winston": "~3.0.0-rc5"
   },
   "devDependencies": {
-    "babel-eslint": "~8.2.1",
+    "babel-eslint": "~8.2.3",
     "concurrently": "~3.5.1",
-    "eslint": "~4.16.0",
+    "cross-env": "^5.1.5",
+    "eslint": "~4.19.1",
     "istanbul": "1.1.0-alpha.1",
-    "mocha": "~5.0.4",
-    "nodemon": "~1.14.11",
+    "mocha": "~5.2.0",
+    "nodemon": "~1.17.4",
     "shx": "^0.2.2",
     "wait-on": "~2.1.0"
   }

package.json

@@ -27,7 +27,7 @@ app.configure(require('feathers-logger')(logger));
 // Load app configuration
 app.configure(configuration(path.join(__dirname, '..')));
 
-if (app.get('sentry').dns !== undefined && app.get('sentry').dns !== 'SENTRY_DNS') {
+if (app.get('sentry') && app.get('sentry').dns !== undefined && app.get('sentry').dns !== 'SENTRY_DNS') {
   // LOGGING IS ENABLED
   app.info('SENTRY LOGGING IS ENABLED');
 

server/app.js

@@ -0,0 +1,23 @@
+const { getItems, replaceItems } = require('feathers-hooks-common');
+
+/**
+ * Alter items in hook.data or hook.result
+ *
+ * Example usage in hook module:
+ * module.exports = (options = defaults) => alterItems(handleItem(options));
+ *
+ * handleItem() is the function in which changes are made
+ */
+module.exports = func => hook => {
+  if (!func || typeof func !== 'function') {
+    return hook;
+  }
+  let items = getItems(hook);
+  if (Array.isArray(items)) {
+    items.map(item => func(item, hook));
+  } else if (items) {
+    items = func(items, hook);
+  }
+  replaceItems(hook, items);
+  return hook;
+};

server/helper/alter-items.js

@@ -0,0 +1,32 @@
+// Cleanup all related items by deleting them
+const alterItems = require('../helper/alter-items');
+
+const defaults = {
+  connections: []
+};
+
+module.exports = (options = defaults) => alterItems(handleItem(options));
+
+const handleItem = options => (item, hook) => {
+  options.connections.forEach(connection => {
+    deleteItem(item, connection, hook);
+  });
+  return item;
+};
+
+const deleteItem = async (item, connection, hook) => {
+  if (!item || !connection || !connection.childField || !connection.service) {
+    return;
+  }
+  const parentField = connection.parentField || '_id';
+  let query = connection.query || {};
+  query[connection.childField] = item[parentField];
+  try {
+    await hook.app.service(connection.service)
+      .remove(null, { query });
+  } catch (err) {
+    hook.app.error(`issue while deleting related item '${connection.service}'`);
+    hook.app.error(query);
+    hook.app.error(err);
+  }
+};

server/hooks/cleanup-related-items.js

@@ -3,7 +3,7 @@ const slug = require('slug');
 const getUniqueSlug = require('../helper/get-unique-slug');
 const { isEmpty } = require('lodash');
 
-module.exports = function (options = { field: null, overwrite: false }) {
+module.exports = function (options = { field: null, overwrite: false, unique: true }) {
   return function (hook) {
     if (!options.field || !hook.data[options.field]) return hook;
 
@@ -16,11 +16,16 @@ module.exports = function (options = { field: null, overwrite: false }) {
       const titleSlug = slug(hook.data[options.field], {
         lower: true
       });
-      getUniqueSlug(hook.service, titleSlug, null, hook.id)
-        .then((uniqueSlug) => {
-          hook.data.slug = uniqueSlug;
-          resolve(hook);
-        });
+      if (options.unique) {
+        getUniqueSlug(hook.service, titleSlug, null, hook.id)
+          .then((uniqueSlug) => {
+            hook.data.slug = uniqueSlug;
+            resolve(hook);
+          });
+      } else {
+        hook.data.slug = titleSlug;
+        resolve(hook);
+      }
     });
   };
 };

server/hooks/create-slug.js

@@ -0,0 +1,24 @@
+// Remove data from deleted items
+const alterItems = require('../helper/alter-items');
+
+const defaults = {
+  fields: [
+    '_id',
+    'deleted',
+    'createdAt',
+    'updatedAt'
+  ]
+};
+
+module.exports = (options = defaults) => alterItems(handleItem(options));
+
+const handleItem = options => item => {
+  if (item.deleted) {
+    Object.keys(item).forEach(key => {
+      if (!options.fields.includes(key)) {
+        delete item[key];
+      }
+    });
+  }
+  return item;
+};

server/hooks/keep-deleted-data-fields.js

@@ -0,0 +1,17 @@
+// Patch deleted records with given data
+const alterItems = require('../helper/alter-items');
+
+const defaults = {
+  data: {
+    content: 'DELETED'
+  }
+};
+
+module.exports = (options = defaults) => alterItems(handleItem(options));
+
+const handleItem = options => item => {
+  if (item.deleted) {
+    item = {...item, ...options.data};
+  }
+  return item;
+};

server/hooks/patch-deleted-data.js

@@ -111,10 +111,8 @@ module.exports = function (options = []) { // eslint-disable-line no-unused-vars
 
         if (imgCount > 0 && loading <= 0) {
           hook.app.debug('Download(s) finished', urls);
-          resolve(hook);
-        } else if (!imgCount) {
-          resolve(hook);
         }
+        resolve(hook);
       } catch (err) {
         // reject(err);
         if (imgCount) {

server/hooks/save-remote-images.js

@@ -25,7 +25,7 @@ function clean (dirty) {
     allowedTags: ['iframe', 'img', 'p', 'br', 'b', 'i', 'em', 'strong', 'a', 'pre', 'ul', 'li', 'ol', 's', 'strike', 'span', 'blockquote'],
     allowedAttributes: {
       a: ['href', 'class', 'target', 'data-*' , 'contenteditable'],
-      span: ['contenteditable'],
+      span: ['contenteditable', 'class', 'data-*'],
       img: ['src'],
       iframe: ['src', 'class', 'frameborder', 'allowfullscreen']
     },