Merge pull request #88 from Human-Connection/invite-dialogue

appinteractive · web-flow · commit fcf5353e35e5 · 2018-07-06T16:38:09.000+02:00
Invite dialogue
diff --git a/package.json b/package.json
@@ -1,29 +1,29 @@
 {
   "name": "human-connection-api",
   "description": "Human-Connection API",
-  "version": "0.1.0",
+  "version": "0.5.0",
   "homepage": "https://human-connection.org",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/Human-Connection/API.git"
   },
-  "main": "server",
-  "keywords": [
-    "human-connection",
-    "social network",
-    "api",
-    "feathersjs"
-  ],
   "author": {
     "name": "Human Connection gGmbH",
     "email": "developer@human-connection.org"
   },
-  "contributors": [],
   "bugs": {
     "url": "https://github.com/Human-Connection/API/issues",
     "email": "bugfix@human-connection.org"
   },
+  "main": "server",
+  "keywords": [
+    "human-connection",
+    "social network",
+    "api",
+    "feathersjs"
+  ],
+  "contributors": [],
   "directories": {
     "lib": "server",
     "test": "test/"
@@ -100,6 +100,7 @@
     "shortid": "~2.2.8",
     "slug": "~0.9.1",
     "trunc-html": "^1.1.2",
+    "uuid": "^3.3.2",
     "valid-url": "^1.0.9",
     "winston": "~3.0.0-rc5"
   },
diff --git a/server/app.hooks.js b/server/app.hooks.js
@@ -8,13 +8,13 @@ module.exports = {
     find: [],
     get: [],
     create: [
-      discard('_id')
+      discard('_id', '__v')
     ],
     update: [
-      discard('_id')
+      discard('_id', '__v')
     ],
     patch: [
-      discard('_id')
+      discard('_id', '__v')
     ],
     remove: []
   },
diff --git a/server/channels.js b/server/channels.js
@@ -47,6 +47,7 @@ module.exports = function (app) {
   // });
 
   app.service('contributions').publish('patched', () => app.channel('authenticated'));
+  app.service('settings').publish('patched', () => app.channel('anonymous', 'authenticated'));
 
   app.service('categories').publish(() => app.channel('anonymous', 'authenticated'));
   app.service('comments').publish(() => app.channel('authenticated'));
diff --git a/server/hooks/save-remote-images.js b/server/hooks/save-remote-images.js
@@ -8,9 +8,9 @@ const { isEmpty } = require('lodash');
 const fs = require('fs');
 const path = require('path');
 const request = require('request');
-const faker = require('faker');
 const mime = require('mime/lite');
 const validUrl = require('valid-url');
+const uuid = require('uuid/v1');
 
 function createUploadDirIfNeeded () {
   const uploadDir = path.resolve('public/uploads');
@@ -60,8 +60,7 @@ module.exports = function (options = []) { // eslint-disable-line no-unused-vars
           loading++;
           imgCount++;
           // TODO: fix that to use the data _id or somethink similar
-          let uuid = faker.fake('{{random.uuid}}');
-          const imgName = `${field}_${uuid}`;
+          const imgName = `${field}_${uuid()}`;
           let imgPath = path.resolve('public', 'uploads/' + imgName);
 
           if (typeof hook.data[field] === 'object') {
diff --git a/server/models/invites.model.js b/server/models/invites.model.js
@@ -1,5 +1,5 @@
 // invites-model.js - A mongoose model
-// 
+//
 // See http://mongoosejs.com/docs/models.html
 // for more of what you can do here.
 module.exports = function (app) {
@@ -12,6 +12,7 @@ module.exports = function (app) {
       enum: ['admin', 'moderator', 'manager', 'editor', 'user'],
       default: 'user'
     },
+    invitedByUserId: { type: String },
     language: { type: String },
     badgeIds: [],
     wasUsed: { type: Boolean },
diff --git a/server/models/settings.model.js b/server/models/settings.model.js
@@ -0,0 +1,22 @@
+// settings-model.js - A mongoose model
+//
+// See http://mongoosejs.com/docs/models.html
+// for more of what you can do here.
+module.exports = function (app) {
+  const mongooseClient = app.get('mongooseClient');
+  const { Schema } = mongooseClient;
+
+  const settings = new Schema({
+    key: {type: String, default: 'system', index: true, unique: true},
+    invites: {
+      userCanInvite: { type: Boolean, required: true, default: false },
+      maxInvitesByUser: { type: Number, required: true, default: 1 },
+      onlyUserWithBadgesCanInvite: { type: Array, default: [] }
+    },
+    maintenance: false
+  }, {
+    timestamps: true
+  });
+
+  return mongooseClient.model('settings', settings);
+};
diff --git a/server/services/admin/admin.class.js b/server/services/admin/admin.class.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
 
 const { asyncForEach, genInviteCode } = require('../../helper/seed-helpers');
-const { keyBy, isEmpty, isString } = require('lodash');
+const { keyBy, isEmpty, isString, difference, merge } = require('lodash');
 
 class Service {
   constructor (options) {
@@ -147,9 +147,31 @@ class Service {
               }
             });
             if (!userWithEmail.total) {
+              // create new user
               const res = await this.app.service('invites').create(query);
               output.push(res);
+            } else if (userWithEmail.total === 1 && difference(query.badgeIds, userWithEmail.data[0].badgeIds).length) {
+              // update badges of existing user
+
+              let user = await this.app.service('users').find({
+                query: {
+                  email: invite.email,
+                  $select: '_id'
+                }
+              });
+              if (!user.total === 1) {
+                return;
+              }
+              user = user.data.pop();
+              let res = await this.app.service('users').patch(user._id, {
+                $set: {
+                  badgeIds: merge(query.badgeIds, userWithEmail.data[0].badgeIds)
+                }
+              });
+              res.wasUpdated = true;
+              output.push(res);
             }
+
           } catch (err) {
             this.app.error(err);
           }
diff --git a/server/services/index.js b/server/services/index.js
@@ -21,6 +21,8 @@ const search = require('./search/search.service.js');
 const usersettings = require('./usersettings/usersettings.service.js');
 const pages = require('./pages/pages.service.js');
 const systemNotifications = require('./system-notifications/system-notifications.service.js');
+const settings = require('./settings/settings.service.js');
+const userInvites = require('./user-invites/user-invites.service.js');
 
 module.exports = function () {
   const app = this; // eslint-disable-line no-unused-vars
@@ -47,4 +49,6 @@ module.exports = function () {
   app.configure(usersettings);
   app.configure(pages);
   app.configure(systemNotifications);
+  app.configure(settings);
+  app.configure(userInvites);
 };
diff --git a/server/services/settings/settings.hooks.js b/server/services/settings/settings.hooks.js
@@ -0,0 +1,46 @@
+const isAdmin = require('../../hooks/is-admin');
+const mapCreateToUpsert = require('../../hooks/map-create-to-upsert');
+
+module.exports = {
+  before: {
+    all: [],
+    find: [],
+    get: [],
+    create: [
+      isAdmin(),
+      mapCreateToUpsert(context => {
+        const { data } = context;
+        return { key: data.key || 'system' };
+      })
+    ],
+    update: [
+      isAdmin()
+    ],
+    patch: [
+      isAdmin()
+    ],
+    remove: [
+      isAdmin()
+    ]
+  },
+
+  after: {
+    all: [],
+    find: [],
+    get: [],
+    create: [],
+    update: [],
+    patch: [],
+    remove: []
+  },
+
+  error: {
+    all: [],
+    find: [],
+    get: [],
+    create: [],
+    update: [],
+    patch: [],
+    remove: []
+  }
+};
diff --git a/server/services/settings/settings.service.js b/server/services/settings/settings.service.js
@@ -0,0 +1,20 @@
+// Initializes the `settings` service on path `/settings`
+const createService = require('feathers-mongoose');
+const createModel = require('../../models/settings.model');
+const hooks = require('./settings.hooks');
+
+module.exports = function (app) {
+  const Model = createModel(app);
+
+  const options = {
+    Model
+  };
+
+  // Initialize our service with any options it requires
+  app.use('/settings', createService(options));
+
+  // Get our initialized service so that we can register hooks
+  const service = app.service('settings');
+
+  service.hooks(hooks);
+};
diff --git a/server/services/user-invites/user-invites.class.js b/server/services/user-invites/user-invites.class.js
@@ -0,0 +1,84 @@
+/* eslint-disable no-unused-vars */
+const errors = require('@feathersjs/errors');
+const uuid = require('uuid/v1');
+const { genInviteCode } = require('../../helper/seed-helpers');
+
+class Service {
+  constructor (options) {
+    this.options = options || {};
+    if (!options.app) {
+      throw new Error('user-invites services missing option.app');
+    }
+    this.app = options.app;
+  }
+
+  async find (params) {
+    if (!params.user._id) {
+      throw new errors.Forbidden('no user id found');
+    }
+    const res = await this.app.service('invites').find(Object.assign(params.query || {}, {
+      query: {
+        $limit: 30,
+        invitedByUserId: params.user._id
+      }
+    }));
+    return res;
+  }
+
+  async get (id, params) {
+    throw new errors.NotImplemented();
+  }
+
+  async create (data, params) {
+    // 1. check user
+    if (!params.user._id) {
+      throw new errors.Forbidden('no used id found');
+    }
+    // 2. get system settings for max invite count
+    let settings = await this.app.service('settings').find({query: {key: 'system'}});
+    settings = settings.pop();
+    // do cancel of the settings prohibit it
+    if (!settings || !settings.invites || !settings.invites.userCanInvite || !settings.invites.maxInvitesByUser) {
+      throw new errors.Forbidden('system settings not valid');
+    }
+    // 3. get user invite count
+    const maxInvitesByUser = settings.invites.maxInvitesByUser;
+    // 4. check if the user has still free invites
+    const myInvites = await this.find(Object.assign(params, {query: { $limit: -1 }}));
+    let remainingInvites = maxInvitesByUser - myInvites.total;
+    if (remainingInvites <= 0) {
+      throw new errors.Forbidden('no invites left');
+    }
+    // 5. generate one remaining free invites
+    let output = [];
+    while (remainingInvites--) {
+      const res = await this.app.service('invites').create({
+        email: uuid(),
+        code: genInviteCode(),
+        invitedByUserId: params.user._id,
+        role: 'user'
+      });
+      output.push(res);
+    }
+
+    return output;
+  }
+
+  async update (id, data, params) {
+    throw new errors.NotImplemented();
+  }
+
+  async patch (id, data, params) {
+    throw new errors.NotImplemented();
+  }
+
+  async remove (id, params) {
+    throw new errors.NotImplemented();
+  }
+}
+
+module.exports = function (options) {
+  return new Service(options);
+};
+
+module.exports.Service = Service;
diff --git a/server/services/user-invites/user-invites.hooks.js b/server/services/user-invites/user-invites.hooks.js
@@ -0,0 +1,35 @@
+const { authenticate } = require('@feathersjs/authentication').hooks;
+
+module.exports = {
+  before: {
+    all: [ authenticate('jwt') ],
+    find: [],
+    get: [],
+    create: [],
+    update: [],
+    patch: [],
+    remove: []
+  },
+
+  after: {
+    all: [
+
+    ],
+    find: [],
+    get: [],
+    create: [],
+    update: [],
+    patch: [],
+    remove: []
+  },
+
+  error: {
+    all: [],
+    find: [],
+    get: [],
+    create: [],
+    update: [],
+    patch: [],
+    remove: []
+  }
+};
diff --git a/server/services/user-invites/user-invites.service.js b/server/services/user-invites/user-invites.service.js
@@ -0,0 +1,21 @@
+// Initializes the `user-invites` service on path `/user-invites`
+const createService = require('./user-invites.class.js');
+const hooks = require('./user-invites.hooks');
+
+module.exports = function (app) {
+
+  const paginate = Object.assign(app.get('paginate'), { default: 30 });
+
+  const options = {
+    paginate,
+    app
+  };
+
+  // Initialize our service with any options it requires
+  app.use('/user-invites', createService(options));
+
+  // Get our initialized service so that we can register hooks
+  const service = app.service('user-invites');
+
+  service.hooks(hooks);
+};
diff --git a/server/services/users/hooks/invite-code.js b/server/services/users/hooks/invite-code.js
diff --git a/test/services/settings.test.js b/test/services/settings.test.js
diff --git a/test/services/user-invites.test.js b/test/services/user-invites.test.js
diff --git a/yarn.lock b/yarn.lock
