updated usersettings

Author: appinteractive

server/helper/seed-helpers.js

@@ -78,7 +78,7 @@ module.exports = {
     }
     return 'https://source.unsplash.com/daily?' + unsplashTopicsTmp.pop() + ',' + unsplashTopicsTmp.pop();
   },
-  randomCategories: (seederstore, allowEmpty = true) => {
+  randomCategories: (seederstore, allowEmpty = false) => {
     let count = Math.round(Math.random() * 3);
     if (allowEmpty === false && count === 0) {
       count = 1;

server/models/usersettings.model.js

@@ -8,7 +8,7 @@ module.exports = function (app) {
   const usersettings = new mongooseClient.Schema({
     userId: {type: String, required: true, unique: true},
     uiLanguage: {type: String, required: true, default: 'de'},
-    contributionLanguages: {type: Array, default: ['de']},
+    contentLanguages: {type: Array, default: ['de']},
     updatedAt: { type: Date, default: Date.now }
   });
 

server/seeder/development/usersettings.js

@@ -15,7 +15,7 @@ module.exports = (seederstore) => {
           return userKeys.pop();
         },
         uiLanguage: 'de',
-        contributionLanguages: ['German']
+        contentLanguages: ['de']
       }
     }]
   };

server/services/users/hooks/is-own-entry.js

@@ -0,0 +1,4 @@
+module.exports = (belongs = true) => hook => {
+  const itemBelongsToAuthenticatedUser = Boolean(hook.params.user && hook.result && hook.params.user._id.toString() === hook.result._id.toString());
+  return itemBelongsToAuthenticatedUser === belongs;
+};

server/services/users/users.hooks.js

@@ -10,6 +10,7 @@ const createSlug = require('../../hooks/create-slug');
 const thumbnails = require('../../hooks/thumbnails');
 const inviteCode = require('./hooks/invite-code')();
 const search = require('feathers-mongodb-fuzzy-search');
+const isOwnEntry = require('./hooks/is-own-entry');
 
 const { hashPassword } = require('feathers-authentication-local').hooks;
 
@@ -20,6 +21,7 @@ const cleanupPersonalData = when(isProvider('external'),
   discard('email', 'verifyToken', 'verifyShortToken', 'doiToken')
 );
 
+
 const restrict = [
   authenticate('jwt'),
   restrictToOwner({
@@ -48,6 +50,16 @@ const candosSchema = {
   }
 };
 
+const userSettingsSchema = {
+  include: {
+    service: 'usersettings',
+    nameAs: 'usersettings',
+    parentField: '_id',
+    childField: 'userId',
+    asArray: false
+  }
+};
+
 const saveRemoteImages = require('../../hooks/save-remote-images');
 
 const thumbnailOptions = {
@@ -105,7 +117,7 @@ module.exports = {
     ],
     patch: [
       ...restrict,
-      hashPassword(),
+      // hashPassword(),
       disableMultiItemChange(),
       // Only set slug once
       when(
@@ -137,17 +149,13 @@ module.exports = {
 
       // remove personal data if its not the current authenticated user
       iff(isProvider('external'),
-        when(hook => {
-          const itemBelongsToAuthenticatedUser = hook.params.user && hook.result && hook.params.user._id.toString() === hook.result._id.toString();
-          // console.log('hook.params', hook.params);
-          // console.log('currentId', hook.params.user ? hook.params.user._id : null);
-          // console.log('foundId', hook.result ? hook.result._id : null);
-          // console.log('identical', (hook.params.user && hook.result ) ? hook.params.user._id.toString() === hook.result._id.toString() : null);
-          return itemBelongsToAuthenticatedUser !== true;
-          // return (!hook.params.user || !hook.result.data || hook.params.user._id !== hook.result.data._id);
-        }, discard('email', 'verifyToken', 'verifyShortToken', 'doiToken'))
+        when(isOwnEntry(false), [
+          cleanupPersonalData
+        ])
+      ),
+      iff(isOwnEntry(),
+        populate({ schema: userSettingsSchema })
       )
-
     ],
     create: [
       when(isProvider('external'),