Skip to content

Commit

Permalink
Merge branch 'dato-3-release' into dependabot/npm_and_yarn/xmldom-0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
de-laz authored May 4, 2021
2 parents c5dbf1f + a7bb40f commit acd72bc
Show file tree
Hide file tree
Showing 125 changed files with 5,965 additions and 3,714 deletions.
4 changes: 2 additions & 2 deletions .env.test
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
NODE_ENV=test
NODE_ENV=test
NODE_TLS_REJECT_UNAUTHORIZED=0
NODE_OPTIONS=--tls-cipher-list=\"ECDHE-RSA-AES128-GCM-SHA256\"
NODE_OPTIONS=--tls-cipher-list=\"ECDHE-RSA-AES128-GCM-SHA256\"
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dist: focal
language: node_js
node_js:
- "lts/dubnium"
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ This project uses [mocha](https://mochajs.org/) as a unit testing framework with

**Pro tips:**

- `npm run lint` - ensure the code is lint free, this is also run before an `npm test`
- `npm run lint` - ensure the code is lint free, this is also run after an `npm test`
- `npm link` - will symlink you local working directory to the globally installed openhim-core module. Use this so you can use the global openhim-core binary to run your current work in progress. Also, if you build any local changes the server will automatically restart.
- `npm test -- --grep <regex>` - will only run tests with names matching the regex.
- `npm test -- --inspect` - enabled the node debugger while running unit tests. Add `debugger` statements and use `node debug localhost:5858` to connect to the debugger instance.
- `npm test -- --bail` - exit on first test failure.
- `npm test:<int|unit> -- --grep <regex>` - will only run tests with names matching the regex.
- `npm test:<int|unit> -- --inspect` - enabled the node debugger while running unit tests. Add `debugger` statements and use `node debug localhost:5858` to connect to the debugger instance.
- `npm test:<int|unit> -- --bail` - exit on first test failure.

---

Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ const presets = [
]
]

module.exports = {presets}
module.exports = { presets }
9 changes: 0 additions & 9 deletions config/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,8 @@ The following config option are provided by the OpenHIM. All of these options ha
// API request are only valid for a particular window once made, this is
// the size of that window in seconds
"authWindowSeconds": 10,
// Max size allowed for ALL bodies in the transaction together
// Use min 1 MB to allow space for all routes on a transaction and max 15 MB leaving 1 MB available for the transaction metadata
"maxBodiesSizeMB": 15,
// Max size of a request payload to the API
// Due to the maximum size of a mongo document, the bodies in the request will be truncated if the request is larger than 16MB
"maxPayloadSizeMB": 50,
// Certain API endpoints allow for details to be truncated, e.g. transactions with very large bodies
// This setting sets the size to truncate to (number of characters)
"truncateSize": 15000,
// A message to append to detail strings that have been truncated
"truncateAppend": "\n[truncated ...]",
// The types of authentication to use for the API
// Supported types are "token" and "basic"
"authenicationTypes": ["token"]
Expand Down
6 changes: 2 additions & 4 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"mongoLogger": {
"options": {
"w": 0,
"useNewUrlParser": true
"useNewUrlParser": true,
"useUnifiedTopology": true
}
},
"router": {
Expand All @@ -35,10 +36,7 @@
"protocol": "https",
"port": 8080,
"authWindowSeconds": 10,
"maxBodiesSizeMB": 15,
"maxPayloadSizeMB": 50,
"truncateSize": 15000,
"truncateAppend": "\n[truncated ...]",
"authenticationTypes": ["token"]
},
"rerun": {
Expand Down
3 changes: 0 additions & 3 deletions config/test.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
"protocol": "https",
"port": 8080,
"authWindowSeconds": 50,
"maxBodiesSizeMB": 15,
"maxPayloadSizeMB": 50,
"truncateSize": 10,
"truncateAppend": "\n[truncated ...]",
"authenticationTypes": ["token", "basic"]
},
"caching": {
Expand Down
Loading

0 comments on commit acd72bc

Please sign in to comment.