Merge branch 'master' into omitDeleted

Author: carrolp

.gitignore

@@ -70,5 +70,3 @@ dev/
 # vscode settings
 .vscode
 .DS_Store
-
-.nvmrc

.nvmrc

@@ -0,0 +1 @@
+v14.18.1

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "lts/*"
+  - 14
 
 services:
   - docker
@@ -9,13 +9,14 @@ before_install:
   - echo "$DOCKERHUB_TOKEN" | docker login -u "icdevops" --password-stdin;
 
 script:
-  # Audit npm packages. Fail build whan a PR audit fails, otherwise report the vulnerability and proceed.
-  - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then npx audit-ci --low -a node-fetch; else npx audit-ci --low -a node-fetch || true; fi
+  # Audit npm packages. Fail build whan a PR audit fails, otherwise report the vulnerability and proceed.  See audit-ci for details of allowlisted packages etc.
+  - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then npx audit-ci --config ./audit-ci.json; else npx audit-ci --config ./audit-ci.json || true; fi
   - npm run lint
   - npm test
   - npm run test:apollo:default
   - npm run test:apollo:local
   - npm run test:apollo:passport.local
+  - npm run test:apollo:extauthtest
   - export BUILD_TIME=`date '+%Y-%m-%d %H:%M:%S'`
   - docker build --rm --build-arg BUILD_TIME="$BUILD_TIME" --build-arg BUILD_ID="${TRAVIS_BUILD_NUMBER}-${TRAVIS_COMMIT}" -t "quay.io/razee/razeedash-api:${TRAVIS_COMMIT}" .
   - if [ -n "${TRAVIS_TAG}" ]; then docker tag quay.io/razee/razeedash-api:${TRAVIS_COMMIT} quay.io/razee/razeedash-api:${TRAVIS_TAG}; fi

Dockerfile

@@ -19,7 +19,7 @@
 FROM node:12-alpine as buildImg
 
 RUN apk update
-RUN apk --no-cache add python make g++
+RUN apk --no-cache add python2 make g++
 
 USER node
 WORKDIR /home/node

README.md

@@ -73,6 +73,22 @@ brew install gettext
 brew link --force gettext
 ```
 
+## Run locally for development
+
+To run Razeedash-api locally, Redis and MongoDB can be easily run in containers:
+
+- Podman (recommended): See [./local-dev/podman/README.md](./local-dev/podman/README.md)
+- Docker / Docker Compose: See [./local-dev/compose/README.md](./local-dev/compose/README.md)
+
+Once Redis and MongoDB are running, execute:
+
+```bash
+export MONGO_URL=mongodb://meteor:secret@localhost:27117/meteor
+export AUTH_MODEL=local
+npm install
+npm start
+```
+
 ## Install on Kubernetes
 
 Setup so you can use `kubectl` commands on the target cluster.  For IBM Cloud