Merge pull request #64 from Human-Connection/own-data-managing

Own data managing

Author: appinteractive

server/helper/alter-items.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/hooks/cleanup-related-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/keep-deleted-data-fields.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/patch-deleted-data.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/save-remote-images.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/xss.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']
     },

server/models/comments.model.js

@@ -12,7 +12,7 @@ module.exports = function (app) {
     contentExcerpt: { type: String, required: true },
     upvotes: { type: Array, default: [] },
     upvoteCount: { type: Number, default: 0 },
-    language: { type: String, required: true },
+    deleted: { type: Boolean, default: false },
     createdAt: { type: Date, default: Date.now },
     updatedAt: { type: Date, default: Date.now },
     wasSeeded: { type: Boolean }

server/models/contributions.model.js

@@ -75,6 +75,7 @@ module.exports = function (app) {
         }
       }
     },
+    deleted: { type: Boolean, default: false },
     createdAt: { type: Date, default: Date.now },
     updatedAt: { type: Date, default: Date.now },
     wasSeeded: { type: Boolean }

server/models/usersettings.model.js

@@ -9,6 +9,7 @@ module.exports = function (app) {
     userId: {type: String, required: true, unique: true},
     uiLanguage: {type: String, required: true},
     contentLanguages: {type: Array, default: []},
+    hideUsersWithoutTermsOfUseSigniture: {type: Boolean},
     updatedAt: { type: Date, default: Date.now }
   });
 

server/seeder/base/pages.js

@@ -14,8 +14,7 @@ module.exports = (seederstore) => {
           type: 'termsAndConditions',
           key: 'terms-and-conditions',
           content: '<strong>ADD TERMS AND CONDITIONS!</strong>',
-          language: 'en',
-          wasSeeded: true
+          language: 'en'
         }
       },
       {
@@ -25,30 +24,27 @@ module.exports = (seederstore) => {
           type: 'termsAndConditions',
           key: 'terms-and-conditions',
           content: '<strong>FÜGE AGB`s HINZU!</strong>',
-          language: 'de',
-          wasSeeded: true
+          language: 'de'
         }
       },
       {
         path: 'pages',
         template: {
           title: 'Data Privacy',
           type: 'dataPrivacy',
-          key: 'data-privacy',
+          key: 'privacy',
           content: '<strong>ADD PRIVACY POLICY!</strong>',
-          language: 'en',
-          wasSeeded: true
+          language: 'en'
         }
       },
       {
         path: 'pages',
         template: {
           title: 'Datenschutzerklärung',
           type: 'dataPrivacy',
-          key: 'data-privacy',
+          key: 'privacy',
           content: '<strong>FÜGE DATENSCHUTZRICHTLINIEN HINZU!</strong>',
-          language: 'de',
-          wasSeeded: true
+          language: 'de'
         }
       },
       {
@@ -58,8 +54,7 @@ module.exports = (seederstore) => {
           type: 'imprint',
           key: 'imprint',
           content: '<strong>ADD IMPRINT!</strong>',
-          language: 'en',
-          wasSeeded: true
+          language: 'en'
         }
       },
       {
@@ -69,8 +64,7 @@ module.exports = (seederstore) => {
           type: 'imprint',
           key: 'imprint',
           content: '<strong>FÜGE EIN IMPRESSUM HINZU!</strong>',
-          language: 'de',
-          wasSeeded: true
+          language: 'de'
         }
       }
     ]