Sync master from development (#395)

* Bump simple-statistics from 7.3.1 to 7.3.2 (#370)

Bumps [simple-statistics](https://github.com/simple-statistics/simple-statistics) from 7.3.1 to 7.3.2.
- [Release notes](https://github.com/simple-statistics/simple-statistics/releases)
- [Changelog](https://github.com/simple-statistics/simple-statistics/blob/master/CHANGELOG.md)
- [Commits](simple-statistics/simple-statistics@v7.3.1...v7.3.2)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump csv-parse from 4.11.1 to 4.13.0 (#371)

Bumps [csv-parse](https://github.com/wdavidw/node-csv-parse) from 4.11.1 to 4.13.0.
- [Release notes](https://github.com/wdavidw/node-csv-parse/releases)
- [Changelog](https://github.com/adaltas/node-csv-parse/blob/master/CHANGELOG.md)
- [Commits](adaltas/node-csv-parse@v4.11.1...v4.13.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump csv-parse from 4.13.0 to 4.14.0 (#373)

Bumps [csv-parse](https://github.com/wdavidw/node-csv-parse) from 4.13.0 to 4.14.0.
- [Release notes](https://github.com/wdavidw/node-csv-parse/releases)
- [Changelog](https://github.com/adaltas/node-csv-parse/blob/master/CHANGELOG.md)
- [Commits](adaltas/node-csv-parse@v4.13.0...v4.14.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* build docs also for minor versions and patches

* Bump config from 3.3.2 to 3.3.3 (#380)

Bumps [config](https://github.com/lorenwest/node-config) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/lorenwest/node-config/releases)
- [Changelog](https://github.com/lorenwest/node-config/blob/master/History.md)
- [Commits](https://github.com/lorenwest/node-config/commits)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump got from 11.7.0 to 11.8.0 (#361)

* Bump csv-stringify from 5.5.1 to 5.5.3 (#378)

* Bump ms from 2.1.2 to 2.1.3 (#381)

Bumps [ms](https://github.com/vercel/ms) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/vercel/ms/releases)
- [Commits](vercel/ms@2.1.2...2.1.3)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* [Security] Bump ini from 1.3.5 to 1.3.8 (#385)

Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8. **This update includes a security fix.**
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](npm/ini@v1.3.5...v1.3.8)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump got from 11.8.0 to 11.8.1 (#382)

Bumps [got](https://github.com/sindresorhus/got) from 11.8.0 to 11.8.1.
- [Release notes](https://github.com/sindresorhus/got/releases)
- [Commits](sindresorhus/got@v11.8.0...v11.8.1)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump simple-statistics from 7.3.2 to 7.4.0 (#386)

Bumps [simple-statistics](https://github.com/simple-statistics/simple-statistics) from 7.3.2 to 7.4.0.
- [Release notes](https://github.com/simple-statistics/simple-statistics/releases)
- [Changelog](https://github.com/simple-statistics/simple-statistics/blob/master/CHANGELOG.md)
- [Commits](simple-statistics/simple-statistics@v7.3.2...v7.4.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump csv-parse from 4.14.0 to 4.14.2 (#387)

Bumps [csv-parse](https://github.com/wdavidw/node-csv-parse) from 4.14.0 to 4.14.2.
- [Release notes](https://github.com/wdavidw/node-csv-parse/releases)
- [Changelog](https://github.com/adaltas/node-csv-parse/blob/master/CHANGELOG.md)
- [Commits](adaltas/node-csv-parse@v4.14.0...v4.14.2)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump csv-stringify from 5.5.3 to 5.6.0 (#390)

Bumps [csv-stringify](https://github.com/adaltas/node-csv-stringify) from 5.5.3 to 5.6.0.
- [Release notes](https://github.com/adaltas/node-csv-stringify/releases)
- [Changelog](https://github.com/adaltas/node-csv-stringify/blob/master/CHANGELOG.md)
- [Commits](adaltas/node-csv-stringify@v5.5.3...v5.6.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Replace Travis CI with GitHub Actions (#393)

* run tests in github workflow

* try without tty

* add deploy-docs ci step

* fix yaml syntax

* try npx

* only deploy docs on release publish

* cleanup

* log in to docker

* execute on master and development

* Update .github/workflows/test.yaml

* Update README.md

* Bump grpc from 1.24.3 to 1.24.4 (#374)

Bumps [grpc](https://github.com/grpc/grpc-node) from 1.24.3 to 1.24.4.
- [Release notes](https://github.com/grpc/grpc-node/releases)
- [Commits](https://github.com/grpc/grpc-node/commits)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Matthias Pfeil <[email protected]>

* Bump millify from 3.3.0 to 3.5.0 (#392)

Bumps [millify](https://github.com/izolate/millify) from 3.3.0 to 3.5.0.
- [Release notes](https://github.com/izolate/millify/releases)
- [Changelog](https://github.com/izolate/millify/blob/master/CHANGELOG.md)
- [Commits](izolate/millify@v3.3.0...v3.5.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Gerald Pape <[email protected]>

* rename access_token to Authorization in docs (#394)

* rename access_token to Authorization in docs

* update README.md

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: felixerdy <[email protected]>
Co-authored-by: Matthias Pfeil <[email protected]>
Co-authored-by: Felix Erdmann <[email protected]>

Author: 4 people

.dockerignore

@@ -3,7 +3,7 @@ userimages
 *.yml
 Dockerfile
 .eslintrc.js
-.travis.yml
+.github
 doc
 version.js
 .dockerignore

.github/workflows/deploy-docs.yaml

@@ -0,0 +1,73 @@
+name: Deploy docs
+
+on:
+  release:
+    branches:
+      - master
+    types:
+      - published
+  pull_request:
+    branches:
+      - master
+      - development
+
+jobs:
+  test:
+    name: Deploy docs
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Gather branch information
+        id: version_info
+        continue-on-error: true
+        run: |
+          version=${GITHUB_REF##*/}
+          echo "##[set-output name=version;]${version}"
+
+          echo "We're running on version ${version}"
+
+      - name: Append the current version to the introduction document
+        run: |
+          sed -i "1 s|$| ${{ steps.version_info.outputs.version }}|" apidoc/introduction.md
+
+      - name: Run apidoc
+        run: |
+          npx [email protected] -i . -f js -e node_modules
+
+      - name: Deploy apidocs for git tags
+        if: ${{ github.event_name == 'release' && github.event.action == 'published' }}
+        run: |
+          set -e
+          # reset the changes to please git
+          git checkout -- apidoc/introduction.md
+
+          # checkout gh-pages branch
+          git remote set-branches --add origin gh-pages
+          git fetch
+          git checkout -t origin/gh-pages
+
+          # delete everything except for the doc folder
+          find . ! \( -path './.git' -prune \) ! \( -path './doc' -prune \) ! -name '.' ! -name '..' -print0 |  xargs -0 rm -rf --
+
+          # move content of doc to .
+          mv doc/* .
+
+          # delete doc folder
+          rm -rf doc
+
+          # add .nojekyll file
+          touch .nojekyll
+
+          # add everything
+          git add -A
+
+          # tell git who you are
+          git config user.name "GitHub-CI"
+          git config user.email "[email protected]"
+
+          # commit
+          git commit -m "apidoc build for ${{ steps.version_info.outputs.version }} by GitHub Actions"
+
+          # push to github
+          git push "https://${{ github.token }}@github.com/${{ github.repository }}.git" gh-pages

.github/workflows/test.yaml

@@ -0,0 +1,27 @@
+name: Test and build
+
+on:
+  push:
+    branches:
+      - master
+      - development
+  pull_request:
+    branches:
+      - master
+      - development
+
+jobs:
+  test:
+    name: Run tests
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_PASS }}
+
+      - name: Execute tests
+        run: |
+          yarn test

.scripts/deploy-docs.sh

@@ -45,18 +45,18 @@ function executeTests() {
   runComposeCommand down -v --remove-orphans
 
   if [[ -z $only_models_tests ]]; then
-    runComposeCommand up -d --force-recreate --remove-orphans
+    runComposeCommand up --quiet-pull -d --force-recreate --remove-orphans
 
     # Allow the dust to settle
     sleep 3
 
-    runComposeCommand exec osem-api yarn mocha --exit tests/waitForHttp.js tests/tests.js
+    runComposeCommand exec -T osem-api yarn mocha --exit tests/waitForHttp.js tests/tests.js
     runComposeCommand stop osem-api
   fi
 
-  runComposeCommand up -d --remove-orphans db mailer
+  runComposeCommand up --quiet-pull -d --remove-orphans db mailer
   # use ./node_modules/.bin/mocha because the workspace does not have the devDependency mocha
-  runComposeCommand run --workdir=/usr/src/app/packages/models osem-api ../../node_modules/.bin/mocha --exit test/waitForDatabase test/index
+  runComposeCommand run -T --workdir=/usr/src/app/packages/models osem-api ../../node_modules/.bin/mocha --exit test/waitForDatabase test/index
 }
 
 case "$cmd" in

.scripts/run-tests.sh

@@ -60,7 +60,7 @@ yarn test
   - Bleeding edge and possibly unstable development version
 - gh-pages
   - Hosts API docs for [https://docs.opensensemap.org/](https://docs.opensensemap.org/)
-  - Is generated and pushed to github by Travis CI
+  - Is generated and pushed to GitHub by GitHub Actions [file](.github/workflows/test.yaml)
 
 ### Tags and Versions
 Git Tags are used for Docker hub builds (like `v1`). Version number is increased by one for each new version. Docker images are built automatically by the Docker hub for all tags starting with `v`
@@ -85,4 +85,3 @@ Every commit on branch `development` will be built with the tag `development`.
 [MongoDB]:http://www.mongodb.com/
 [openSenseMap]:https://opensensemap.org/
 [senseBox]:https://sensebox.de/
-

.travis.yml

@@ -12,7 +12,6 @@
     "NOTpretest": "node tests/waitForHttp",
     "tag-container": "./.scripts/npm_tag-container.sh",
     "lint": "eslint --ignore-pattern node_modules --fix \"{tests,packages}/**/*.js\"",
-    "deploy-docs": "./.scripts/deploy-docs.sh",
     "create-version-file": "node .scripts/create-version.js"
   },
   "devDependencies": {
@@ -21,11 +20,11 @@
     "chai": "^4.1.2",
     "chakram": "^1.5.0",
     "cheerio": "^1.0.0-rc.2",
-    "csv-parse": "^4.11.1",
+    "csv-parse": "^4.14.2",
     "eslint": "6.8.0",
     "mimelib": "^0.3.1",
     "mocha": "^7.1.2",
     "mqtt": "^3.0.0",
     "randomgeojson": "^1.0.0"
   }
-}
+}

README.md

@@ -219,7 +219,7 @@ const getDataMulti = async function getDataMulti (req, res, next) {
  * @apiParam (RequestBody) {String} value the measured value of the sensor. Also accepts JSON float numbers.
  * @apiParam (RequestBody) {RFC3339Date} [createdAt] the timestamp of the measurement. Should conform to RFC 3339. Is needed when posting with Location Values!
  * @apiParam (RequestBody) {Location} [location] the WGS84-coordinates of the measurement.
- * @apiHeader {String} access_token Box' unique access_token. Will be used as authorization token if box has auth enabled (e.g. useAuth: true)
+ * @apiHeader {String} Authorization Box' unique access_token. Will be used as authorization token if box has auth enabled (e.g. useAuth: true)
  */
 const postNewMeasurement = async function postNewMeasurement (req, res, next) {
   const { boxId, sensorId, value, createdAt, location } = req._userParams;
@@ -277,7 +277,7 @@ const postNewMeasurement = async function postNewMeasurement (req, res, next) {
  * @apiUse LocationBody
  * @apiParam {String} [luftdaten] Specify whatever you want (like `luftdaten=1`. Signals the api to treat the incoming data as luftdaten.info formatted json.
  * * @apiParam {String} [hackair] Specify whatever you want (like `hackair=1`. Signals the api to treat the incoming data as hackair formatted json.
- * @apiHeader {String} access_token Box' unique access_token. Will be used as authorization token if box has auth enabled (e.g. useAuth: true)
+ * @apiHeader {String} Authorization Box' unique access_token. Will be used as authorization token if box has auth enabled (e.g. useAuth: true)
  * @apiParamExample {application/json} JSON-Object:
  * {
  *   "sensorID": "value",

package.json

@@ -21,19 +21,19 @@
     "@turf/triangle-grid": "^6.0.1",
     "apicache": "^1.4.0",
     "bunyan": "^1.8.14",
-    "config": "^3.3.2",
-    "csv-stringify": "^5.5.1",
+    "config": "^3.3.3",
+    "csv-stringify": "^5.6.0",
     "dashify": "^2.0.0",
-    "got": "^11.7.0",
+    "got": "^11.8.1",
     "honeybadger": "^1.4.0",
     "isemail": "^3.0.0",
     "jsonwebtoken": "^8.1.0",
-    "millify": "^3.3.0",
+    "millify": "^3.5.0",
     "moment": "^2.29.1",
-    "ms": "^2.1.1",
+    "ms": "^2.1.3",
     "restify": "^5.2.0",
     "restify-errors": "^8.0.2",
-    "simple-statistics": "^7.3.1",
+    "simple-statistics": "^7.4.0",
     "stringify-stream": "^1.0.5",
     "uuid": "^7.0.3"
   },