Merge pull request Human-Connection#57 in HC/hc-api-feathers from feature/NEXT-274 to develop

appinteractive · appinteractive · commit 0997d4038e62 · 2018-02-07T12:18:29.000+01:00
* commit '456c06f9fae5a757edd4844a31c346e5077abae7':
  NEXT-274 - rename APP_SECRET to API_SECRET
  NEXT-274 - try to fix build
  NEXT-274 - try to fix travis build
  NEXT-274 - fixed tests
  NEXT-274 - added status service with maintenance flag and apiSecret
diff --git a/.travis.yml b/.travis.yml
@@ -9,15 +9,16 @@ install:
 #  - yarn
 script:
   - cp ./config/local.example.json ./config/local.json
-  - NODE_ENV=development npm test
+  - npm run clear && NODE_ENV=test mocha test/ --recursive --timeout 10000 --exit
   - rm ./config/local.json
 services:
   - docker
+  - mongodb
 before_install:
   - docker build -t humanconnection/api-feathers:alpha .
 after_success:
   - if [ "$TRAVIS_BRANCH" == "master" ]; then
     docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";
     docker push humanconnection/api-feathers:alpha;
     fi
-#  - yarn run coverage
+#  - yarn run coverage
diff --git a/config/default.json b/config/default.json
@@ -13,6 +13,7 @@
     "url": "",
     "key": ""
   },
+  "apiSecret": "TE9TqAk2xK[9EFJL",
   "sentry": {
     "dns": "SENTRY_DNS",
     "options": {
diff --git a/config/production.json b/config/production.json
@@ -18,6 +18,7 @@
     "url": "THUMBOR_URL",
     "key": "THUMBOR_KEY"
   },
+  "apiSecret": "API_SECRET",
   "authentication": {
     "secret": "AUTH_SECRET",
     "jwt": {
diff --git a/config/test.json b/config/test.json
@@ -0,0 +1,9 @@
+{
+  "port": 3031,
+  "baseURL": "http://localhost:3031",
+  "seeder": {
+    "runOnInit": false,
+    "dropDatabase": false
+  },
+  "mongodb": "mongodb://localhost:27017/hc_api_test"
+}
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "dev-win": "npm run clear && concurrently \"mongod --dbpath data\" \"wait-on tcp:27017&&SET NODE_ENV=development&& nodemon --inspect server/\"",
     "dev-noseed": "concurrently 'mongod --dbpath data' 'wait-on tcp:27017 && NODE_ENV=development nodemon --inspect server/'",
     "dev-win-noseed": "concurrently \"mongod --dbpath data\" \"wait-on tcp:27017 && nodemon --inspect server/\"",
-    "mocha": "mocha test/ --recursive"
+    "mocha": "npm run clear && concurrently --success first --kill-others 'mongod --dbpath data &>/dev/null' 'wait-on tcp:27017 && NODE_ENV=test mocha test/ --recursive --timeout 10000 --exit'"
   },
   "dependencies": {
     "body-parser": "~1.18.2",
diff --git a/server/models/status.model.js b/server/models/status.model.js
@@ -0,0 +1,14 @@
+// status-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 status = new mongooseClient.Schema({
+    maintenance: { type: Boolean, default: false },
+    updatedAt: { type: Date, default: Date.now }
+  });
+
+  return mongooseClient.model('status', status);
+};
diff --git a/server/seeder/development/users-candos.js b/server/seeder/development/users-candos.js
@@ -2,6 +2,7 @@ const seedHelpers = require('../../helper/seed-helpers');
 
 module.exports = (seederstore) => {
   let filter = ({type}) => type === 'cando';
+
   return {
     services: [{
       count: 80,
diff --git a/server/seeder/index.js b/server/seeder/index.js
@@ -19,13 +19,17 @@ const _ = require('lodash');
 let configs = [...baseConfigs, ...developmentConfigs];
 
 // seed service and add results to the seeder store
-const seedAndAssign = async (config, seeder) => {
+const seedAndAssign = async (config, seeder, app) => {
   const key = config.path;
-  const res = await seeder.seed(config);
-  if (_.isEmpty(seederstore[key])) {
-    seederstore[key] = {};
+  try {
+    const res = await seeder.seed(config);
+    if (_.isEmpty(seederstore[key])) {
+      seederstore[key] = {};
+    }
+    _.merge(seederstore[key], _.mapKeys(res, '_id'));
+  } catch (err) {
+    app.error(err);
   }
-  _.merge(seederstore[key], _.mapKeys(res, '_id'));
 };
 
 module.exports = function (app = null, store = null) {
@@ -53,7 +57,7 @@ module.exports = function (app = null, store = null) {
           app.error('config was empty!');
         }
         await asyncForEach(config.services, async (service) => {
-          await seedAndAssign(service, seeder);
+          await seedAndAssign(service, seeder, app);
         });
       });
       app.info('>>>>>> SEEDING COMPLETED <<<<<<');
diff --git a/server/services/admin/admin.filters.js b/server/services/admin/admin.filters.js
@@ -1,6 +1,4 @@
 /* eslint no-console: 1 */
-console.warn('You are using the default filter for the admin service. For more information about event filters see https://docs.feathersjs.com/api/events.html#event-filtering'); // eslint-disable-line no-console
-
 module.exports = function (data, connection, hook) { // eslint-disable-line no-unused-vars
-  return data;
+  return false;
 };
diff --git a/server/services/badges/badges.filters.js b/server/services/badges/badges.filters.js
@@ -1,6 +1,4 @@
 /* eslint no-console: 1 */
-console.warn('You are using the default filter for the badges service. For more information about event filters see https://docs.feathersjs.com/api/events.html#event-filtering'); // eslint-disable-line no-console
-
 module.exports = function (data, connection, hook) { // eslint-disable-line no-unused-vars
-  return data;
+  return false;
 };
diff --git a/server/services/images/images.filters.js b/server/services/images/images.filters.js
@@ -1,6 +1,4 @@
 /* eslint no-console: 1 */
-console.warn('You are using the default filter for the images service. For more information about event filters see https://docs.feathersjs.com/api/events.html#event-filtering'); // eslint-disable-line no-console
-
 module.exports = function (data, connection, hook) { // eslint-disable-line no-unused-vars
-  return data;
+  return false;
 };
diff --git a/server/services/index.js b/server/services/index.js
@@ -6,6 +6,7 @@ const notifications = require('./notifications/notifications.service.js');
 const emails = require('./emails/emails.service.js');
 const categories = require('./categories/categories.service.js');
 const uploads = require('./uploads/uploads.service.js');
+const status = require('./status/status.service.js');
 const images = require('./images/images.service.js');
 const badges = require('./badges/badges.service.js');
 const emotions = require('./emotions/emotions.service.js');
@@ -20,6 +21,7 @@ module.exports = function () {
   const app = this; // eslint-disable-line no-unused-vars
   app.configure(authManagement);
   app.configure(users);
+  app.configure(status);
   app.configure(contributions);
   app.configure(comments);
   app.configure(notifications);
diff --git a/server/services/invites/invites.filters.js b/server/services/invites/invites.filters.js
@@ -1,6 +1,4 @@
 /* eslint no-console: 1 */
-console.warn('You are using the default filter for the invites service. For more information about event filters see https://docs.feathersjs.com/api/events.html#event-filtering'); // eslint-disable-line no-console
-
 module.exports = function (data, connection, hook) { // eslint-disable-line no-unused-vars
-  return data;
+  return false;
 };
diff --git a/server/services/status/status.class.js b/server/services/status/status.class.js
@@ -0,0 +1,70 @@
+/* eslint-disable no-unused-vars */
+
+const { keyBy, isEmpty } = require('lodash');
+const mongoose = require('mongoose');
+const errors = require('feathers-errors');
+
+class Service {
+  constructor (options) {
+    this.options = options || {};
+    if (!options.app) {
+      throw new Error('status services missing option.app');
+    }
+    this.app = options.app;
+    this.seederstore = {};
+    this.status = mongoose.model('status');
+  }
+
+  async find (params) {
+    const res = await this.status.findOne();
+    if (!res) {
+      return { maintenance: false };
+    }
+
+    let output = Object.assign({ maintenance: false }, res._doc);
+    try {
+      delete output['_id'];
+      delete output['__v'];
+    } catch (err) {
+      return output;
+    }
+    return output;
+  }
+
+  get (id, params) {
+    throw new errors.NotImplemented();
+  }
+
+  create (data, params) {
+    throw new errors.NotImplemented();
+  }
+
+  async update (id, data, params) {
+    const secret = !isEmpty(params.headers) ? params.headers.secret || null : params.secret || null;
+
+    if (secret !== this.app.get('apiSecret')) {
+      throw new errors.Forbidden('please provide the correct secret');
+    }
+
+    const res = await this.status.update({}, {
+      $set: Object.assign({ updatedAt: Date.now() }, data)
+    }, {
+      upsert: true
+    });
+    return this.find();
+  }
+
+  patch (id, data, params) {
+    throw new errors.NotImplemented();
+  }
+
+  remove (id, params) {
+    throw new errors.NotImplemented();
+  }
+}
+
+module.exports = function (options) {
+  return new Service(options);
+};
+
+module.exports.Service = Service;
diff --git a/server/services/status/status.filters.js b/server/services/status/status.filters.js
@@ -0,0 +1,4 @@
+/* eslint no-console: 1 */
+module.exports = function (data, connection, hook) { // eslint-disable-line no-unused-vars
+  return false;
+};
diff --git a/server/services/status/status.hooks.js b/server/services/status/status.hooks.js
@@ -0,0 +1,32 @@
+
+module.exports = {
+  before: {
+    all: [],
+    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/status/status.service.js b/server/services/status/status.service.js
@@ -0,0 +1,30 @@
+// Initializes the `status` service on path `/status`
+const createService = require('./status.class.js');
+const createModel = require('../../models/status.model');
+const hooks = require('./status.hooks');
+const filters = require('./status.filters');
+
+module.exports = function () {
+  const app = this;
+  const Model = createModel(app);
+  const paginate = app.get('paginate');
+
+  const options = {
+    app,
+    name: 'status',
+    Model,
+    paginate
+  };
+
+  // Initialize our service with any options it requires
+  app.use('/status', createService(options));
+
+  // Get our initialized service so that we can register hooks and filters
+  const service = app.service('status');
+
+  service.hooks(hooks);
+
+  if (service.filter) {
+    service.filter(filters);
+  }
+};
diff --git a/server/services/users/users.filters.js b/server/services/users/users.filters.js
@@ -1,6 +1,8 @@
 /* eslint no-console: 1 */
-console.warn('You are using the default filter for the users service. For more information about event filters see https://docs.feathersjs.com/api/events.html#event-filtering'); // eslint-disable-line no-console
-
 module.exports = function (data, connection, hook) { // eslint-disable-line no-unused-vars
+  // Users can only listen to their own events
+  if(!connection.user || connection.user._id != data.userId) {
+    return false;
+  }
   return data;
 };
diff --git a/test/services/status.test.js b/test/services/status.test.js
@@ -0,0 +1,34 @@
+const assert = require('assert');
+const app = require('../../server/app');
+
+describe('\'status\' service', () => {
+  const service = app.service('status');
+
+  beforeEach(() => {
+    return service.update({}, {
+      maintenance: false
+    }, { secret: app.get('apiSecret') });
+  });
+
+  it('registered the service', () => {
+    assert.ok(service, 'Registered the service');
+  });
+
+  it('get maintenance mode', async () => {
+    const status = await service.find();
+    assert.equal(status.maintenance, false);
+  });
+
+  it('set maintenance mode to true', async () => {
+    await service.update({}, {
+      maintenance: true
+    }, { secret: app.get('apiSecret') });
+    const status1 = await service.find();
+    assert.equal(status1.maintenance, true);
+
+    const status2 = await service.update({}, {
+      maintenance: false
+    }, { secret: app.get('apiSecret') });
+    assert.equal(status2.maintenance, false);
+  });
+});
