Merge branch 'develop' into cucumber-js

Author: roschaefer

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,20 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Authenticate '...'
+2. Post following data to endpoint '...'
+3. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -12,6 +12,7 @@ lib-cov
 
 # Coverage directory used by tools like istanbul
 coverage
+.nyc_output
 
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
@@ -121,3 +122,4 @@ lib/
 rethinkdb_data
 .env
 /config/local.json
+package-lock.json

.travis.yml

@@ -18,20 +18,21 @@ jobs:
       script: true
     - stage: Build and Test
       script:
-      - docker build -t humanconnection/api-feathers:alpha .
+      - docker build -t humanconnection/api-feathers .
     - script:
-      - cp ./config/local.example.json ./config/local.json
       - yarn install --frozen-lockfile --non-interactive
       - yarn add codacy-coverage
-      - rm -Rf tmp
-      - yarn eslint
       - yarn test
-      - NODE_ENV=test istanbul cover ./node_modules/mocha/bin/_mocha -- test/ --timeout=10000 --exit
       - cat ./coverage/lcov.info | codacy-coverage
-      - rm ./config/local.json
 
 after_success:
   - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then
     docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";
+    docker tag humanconnection/api-feathers humanconnection/api-feathers:alpha;
     docker push humanconnection/api-feathers:alpha;
     fi
+  - if [ $TRAVIS_BRANCH == "develop" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then
+    docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";
+    docker tag humanconnection/api-feathers humanconnection/api-feathers:edge;
+    docker push humanconnection/api-feathers:edge;
+    fi

Dockerfile

@@ -18,7 +18,7 @@ ENV API_PORT=3030
 # start the application in a autohealing cluster
 # NOTE: quick fix for server issues, restart api when reaching max of 300 MB Memory Usage (happens in conjunction with 100% CPU Usage)
 # TODO: find better way of dealing with that issue
-CMD NODE_ENV=production pm2 start server/index.js -n api --attach --max-memory-restart 300M
+CMD NODE_ENV=production pm2 start server/index.js -n api --attach --max-memory-restart 1024M
 # CMD NODE_ENV=production pm2 start server/index.js -n api -i 2 --attach
 # as we have issues with pm2 currently in conjunction with nuxt, we use the standard approach here
 # CMD NODE_ENV=production node server/index.js

README.md

@@ -6,6 +6,7 @@
 <p align="center">
   <a href="https://travis-ci.org/Human-Connection/API"><img src="https://img.shields.io/travis/Human-Connection/API/master.svg" alt="Build Status"></a>
   <a href="https://github.com/Human-Connection/WebApp/blob/develop/LICENSE.md"><img src="https://img.shields.io/badge/license-MIT-green.svg" "MIT" /></a>
+  <a href="https://app.fossa.io/projects/git%2Bgithub.com%2FHuman-Connection%2FAPI?ref=badge_shield" alt="FOSSA Status"><img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2FHuman-Connection%2FAPI.svg?type=shield"/></a>
 </p>
 
 # Human-Connection API
@@ -61,16 +62,18 @@ Getting up and running is as easy as 1, 2, 3, 4 ... 5.
    # start mongodb, feathers and seed database
    $ yarn dev
    $ yarn dev:win if you're on windows
+
    # start mongodb, feathers without seeding the database
    $ yarn dev:noseed
+   
    # start mongodb, feathers for production
    $ yarn start
    ```
 
    > ##### IMPORTANT for WIN users: 
    > - make sure you have mongo bin directory added to your PATH
    > - if you picked another data directory during mongodb setup make sure 
-   > to change package.json scripts section for key "dev-win" so it points to
+   > to change package.json scripts section for key "dev:win" so it points to
    > the proper path. Otherwise you will get missing data path errors from mongodb.
    
    If you did it right it will seed some fake data for you and downloads some images and avatar for faster development.
@@ -105,9 +108,6 @@ The seeder configuration has two properties:
 
 Simply run `yarn test` and all your tests in the `test/` directory will be run.
 
-> **Note:** 
-> *At the moment there are some issues with linting while testing, but you can run the tests also with mocha run*
-
 ## Scaffolding
 
 Feathers has a powerful command line interface. Here are a few things it can do:
@@ -129,4 +129,6 @@ The HC platform is documented in our [gitbook](https://www.gitbook.com/book/huma
 
 ## License 
 
-[MIT](https://github.com/Human-Connection/WebApp/blob/develop/LICENSE.md)
+Copyright (c) 2018 [Human-Connection.org](https://human-connection.org)
+
+Licensed under the [MIT](https://github.com/Human-Connection/WebApp/blob/develop/LICENSE.md) license.

config/local.example.json

@@ -14,7 +14,7 @@
   },
   "seeder": {
     "runOnInit": true,
-    "dropDatabase": true
+    "dropDatabase": false
   },
   "defaultEmail": "[email protected]"
 }

config/test.json

@@ -5,5 +5,10 @@
     "runOnInit": false,
     "dropDatabase": false
   },
+  "smtpConfig": {
+    "host": "0.0.0.0",
+    "port": 1025,
+    "ignoreTLS": true
+  },
   "mongodb": "mongodb://localhost:27017/hc_api_test"
 }

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": "CC-BY-NC-SA-4.0",
+  "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": "[email protected]"
   },
-  "contributors": [],
   "bugs": {
     "url": "https://github.com/Human-Connection/API/issues",
     "email": "[email protected]"
   },
+  "main": "server",
+  "keywords": [
+    "human-connection",
+    "social network",
+    "api",
+    "feathersjs"
+  ],
+  "contributors": [],
   "directories": {
     "lib": "server",
     "test": "test/"
@@ -34,26 +34,33 @@
   },
   "scripts": {
     "clear": "rm -Rf tmp",
-    "test": "npm run eslint && npm run mocha && npm run cucumber",
+    "test": "npm run eslint && cross-env NODE_ENV=test && nyc --reporter=lcovonly --reporter=text-summary npm run mocha && npm run cucumber",
+    "test:mongo": "npm run eslint && cross-env NODE_ENV=test && nyc --reporter=lcovonly --reporter=text-summary npm run mocha:mongo",
     "eslint": "eslint server/. test/. --config .eslintrc.json",
-    "start": "concurrently 'mongod' 'wait-on tcp:27017 && NODE_ENV=production node server/'",
-    "start:win": "concurrently \"mongod\" \"wait-on tcp:27017 &&SET NODE_ENV=production&& node server/\"",
-    "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 nodemon server/'",
+    "start": "concurrently 'mongod' 'wait-on tcp:27017 && cross-env NODE_ENV=production node server/'",
+    "dev:debug": "npm run clear && concurrently '$npm_package_config_mongoDev &>/dev/null' 'wait-on tcp:27017 && cross-env DEBUG=feathers && cross-env NODE_ENV=development nodemon --inspect server/'",
+    "dev": "npm run clear && concurrently '$npm_package_config_mongoDev &>/dev/null' 'wait-on tcp:27017 && cross-env DEBUG=feathers && cross-env NODE_ENV=development nodemon server/'",
     "dev:local": "sh scripts/run-local.sh",
     "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/\"",
-    "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'",
-    "cucumber": "npm run clear && $npm_package_config_concurrently '$npm_package_config_mongoDev &>/dev/null' 'wait-on tcp:27017 && cucumber-js'"
+    "mocha": "npm run clear && $npm_package_config_mocha",
+    "mocha:mongo": "$npm_package_config_concurrently '$npm_package_config_mongoDev &>/dev/null' 'wait-on tcp:27017 && npm run mocha'",
+    "cucumber": "cucumber-js"
   },
   "config": {
     "mongoDev": "mongod --dbpath data --quiet",
-    "mocha": "node_modules/mocha/bin/_mocha test/ --recursive --timeout 10000 --exit",
-    "mochaCoverage": "node_modules/mocha/bin/_mocha -- test/ --recursive --timeout 10000 --exit",
+    "mocha": "cross-env NODE_ENV=test node_modules/mocha/bin/_mocha test/ --recursive --timeout 10000 --exit",
     "concurrently": "concurrently --kill-others --success first"
   },
   "dependencies": {
+    "@feathersjs/authentication": "^2.1.7",
+    "@feathersjs/authentication-jwt": "^2.0.1",
+    "@feathersjs/authentication-local": "^1.2.1",
+    "@feathersjs/configuration": "^1.0.2",
+    "@feathersjs/errors": "^3.3.0",
+    "@feathersjs/express": "^1.2.3",
+    "@feathersjs/feathers": "^3.1.7",
+    "@feathersjs/socketio": "^3.2.2",
     "body-parser": "~1.18.3",
     "cheerio": "^1.0.0-rc.2",
     "compression": "~1.7.2",
@@ -62,27 +69,18 @@
     "crypto-js": "^3.1.9-1",
     "dauria": "~2.0.0",
     "email-templates": "2.6.0",
-    "feathers": "~2.2.4",
-    "feathers-authentication": "~1.3.1",
-    "feathers-authentication-hooks": "~0.1.6",
-    "feathers-authentication-jwt": "~0.3.2",
-    "feathers-authentication-local": "~0.4.4",
-    "feathers-authentication-management": "~1.0.3",
-    "feathers-blob": "~1.3.1",
-    "feathers-configuration": "~0.4.2",
-    "feathers-errors": "~2.9.2",
-    "feathers-hooks": "~2.1.2",
-    "feathers-hooks-common": "~3.10.0",
-    "feathers-logger": "0.2.3",
+    "feathers-authentication-hooks": "~0.3.0",
+    "feathers-authentication-management": "~2.0.0",
+    "feathers-blob": "~2.0.1",
+    "feathers-hooks-common": "~4.14.0",
+    "feathers-logger": "0.3.2",
     "feathers-mailer": "~2.0.0",
-    "feathers-memory": "~1.3.1",
-    "feathers-mongodb": "~3.0.0",
+    "feathers-memory": "~2.1.3",
+    "feathers-mongodb": "~3.2.0",
     "feathers-mongodb-fuzzy-search": "~1.1.1",
-    "feathers-mongoose": "~5.1.2",
+    "feathers-mongoose": "~6.1.2",
     "feathers-profiler": "^0.1.5",
-    "feathers-rest": "~1.8.1",
     "feathers-seeder": "~1.0.10",
-    "feathers-socketio": "~2.0.1",
     "fs-blob-store": "~5.2.1",
     "fs-extra": "~4.0.2",
     "handlebars": "~4.0.11",
@@ -93,29 +91,32 @@
     "mongoose": "~4.13.2",
     "multer": "~1.3.0",
     "node-sass": "~4.7.2",
+    "nyc": "^12.0.2",
     "quill-url-embeds": "^1.2.5",
     "raven": "~2.6.1",
-    "request": "~2.86.0",
+    "request": "~2.87.0",
     "request-promise": "~4.2.2",
     "sanitize-html": "^1.18.2",
     "serve-favicon": "~2.5.0",
-    "shortid": "~2.2.8",
+    "shortid": "~2.2.11",
     "slug": "~0.9.1",
     "trunc-html": "^1.1.2",
+    "uuid": "^3.3.2",
     "valid-url": "^1.0.9",
     "winston": "~3.0.0-rc5"
   },
   "devDependencies": {
     "babel-eslint": "~8.2.3",
     "chai": "^4.1.2",
-    "concurrently": "~3.5.1",
-    "cross-env": "^5.1.5",
     "cucumber": "^4.2.1",
+    "concurrently": "~3.6.0",
+    "cross-env": "^5.2.0",
     "eslint": "~4.19.1",
     "istanbul": "1.1.0-alpha.1",
     "mocha": "~5.2.0",
     "node-fetch": "^2.1.2",
     "nodemon": "~1.17.4",
+    "nyc": "^12.0.2",
     "wait-on": "~2.1.0"
   }
 }

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: []
   },