Sync to latest

.env.sample

@@ -4,11 +4,14 @@ API_PORT=5000
 ENABLE_CALLBACK=true
 ENABLE_CHECK_IN=true
 ENABLE_METRICS=true
+ENABLE_NOTICES=true
+ENABLE_QR_VENUES=true
 
 CONFIG_VAR_PREFIX=
 NODE_ENV=development
 LOG_LEVEL=debug
 CORS_ORIGIN=true
+CORS_CREDENTIALS=
 
 DB_HOST=localhost
 DB_READ_HOST=localhost
@@ -28,15 +31,18 @@ JWT_ISSUER=local-api
 
 HSTS_MAX_AGE=300
 CERTIFICATE_AUDIENCE=local-api
-DEFAULT_REGION=
+DEFAULT_REGION=IE
 REFRESH_TOKEN_EXPIRY=10y
 CODE_LIFETIME_MINS=10
+CODE_LIFETIME_DEEPLINK_MINS=1440
+DEEP_LINKS_ALLOWED=true
 TOKEN_LIFETIME_MINS=60
 UPLOAD_MAX_KEYS=14
 UPLOAD_TOKEN_LIFETIME_MINS=1440
 VERIFY_RATE_LIMIT_SECS=1
 ENCRYPT_KEY=12345678901234567890123456789012
 CALLBACK_QUEUE_URL=
+NOTICES_QUEUE_URL=
 ASSETS_BUCKET=
 METRICS_CONFIG={ "CONTACT_UPLOAD": 60, "CHECK_IN": 60, "FORGET": 60, "TOKEN_RENEWAL": 60, "CALLBACK_OPTIN": 60, "CALLBACK_REQUEST": 60, "DAILY_ACTIVE_TRACE": 60, "CONTACT_NOTIFICATION": 60 }
 
@@ -48,9 +54,24 @@ DEVICE_CHECK_PACKAGE_DIGEST=
 DEVICE_CHECK_CERTIFICATE_DIGEST=
 DEVICE_CHECK_ROOT_CA=
 DEVICE_CHECK_TIME_DIFF_THRESHOLD_MINS=10
+DEVICE_CHECK_RECAPTCHA_SECRET=
 
 VERIFY_KEY_ID=
 VERIFY_PRIVATE_KEY=
 VERIFY_PUBLIC_KEY=
+VERIFY_PROXY_URL=
+VERIFY_PROXY_API_KEY=
+
+QR_EMAIL_ADDRESS_VERIFY_LIFETIME=60
+QR_ALERT_QUEUE_URL=
+QR_QUEUE_URL=
+QR_SECRET=
 
 TIME_ZONE=UTC
+
+DEEPLINK_PACKAGE_NAME=com.nf.app
+DEEPLINK_APPSTORE_LINK=https://apps.apple.com/ie/app/covid-tracker-nf/id1234567
+DEEPLINK_DEFAULT_WEBPAGE=https://nf.com/covidapps
+LOG_CALLBACK_REQUEST=false
+ALLOW_NO_TOKEN=false
+

.github/workflows/covidgreen-tests-linting.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Running tests with node ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci
@@ -35,7 +35,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Running lint with node ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci

CONTRIBUTING.md

@@ -37,15 +37,16 @@ We have many collaborators, and every kind of contribution is welcome! Our organ
 | `@covidgreen/leads` | Lead Maintainers | GitHub organization owners |
 | `@covidgreen/core`  |  Core development  |  `covid-green-backend-api` |
 
-Every memeber of the org is also part of `@covidgreen/members`.
+Every member of the org is also part of `@covidgreen/members`.
 
 ### Onboarding Collaborators
 
-Welcome to the team! We are happy to have you. Before you start, please complete the following tasks:
+Before a new Collaborator can be onboarded, an issue nominating the new contributor as a project member must be opened. The new member will be added if there are no objections raised from other existing members. Contributors nominated should have at least some history of contribution and an intent to continue contributing.
+
+Once a nomination has been accepted... Welcome to the team! We are happy to have you. Before you start, please complete the following tasks:
 1. Set up 2 factor authentication for GitHub and NPM
   - [GitHub 2FA](https://help.github.com/en/articles/securing-your-account-with-two-factor-authentication-2fa)
   - [NPM 2FA](https://docs.npmjs.com/about-two-factor-authentication)
-2. Choose which team to join *(more than one is ok!)* based on how you want to help.
 3. Open a pull request to [`covidgreen/covid-green-backend-api:current`](https://github.com/covidgreen/covid-green-backend-api/pulls) that adds your name, username, and email to the team you have choosen in the [README.md](./README.md). The members lists are sorted alphabetically; make sure to add your name in the proper order.
 
 ### Offboarding Collaborators
@@ -58,7 +59,7 @@ We'll be really happy to see you here again if you want to come back, but for no
 
 The person that did the onboarding must:
 1. If the collaborator doesn't reply to the ping in reasonable time, open the pull requests described above.
-2. Remove the collaborator from the teams on GitHub.
+1. Remove the collaborator from the teams on GitHub.
 -----------------------------------------
 
 <a id="developers-certificate-of-origin"></a>

README.md

@@ -17,7 +17,7 @@ $> npm run create:env
 
 ### Running API Outside Docker
 
-You can run the API outside of Docker but the database still requires Docker. 
+You can run the API outside of Docker but the database still requires Docker.
 
 First we'll start and setup the database.
 ```bash
@@ -87,7 +87,7 @@ And again, at this point the API service is up and listening on port 5000. You c
 $> docker ps
 IMAGE                                     PORTS                    NAMES
 covid-green-backend-api_covid-green-api   0.0.0.0:5000->5000/tcp   covid-green-api
-postgres:10.4-alpine                      0.0.0.0:5432->5432/tcp   covid-green-db 
+postgres:10.4-alpine                      0.0.0.0:5432->5432/tcp   covid-green-db
 ```
 ​
 Editing files outside the container will cause `nodemon` to restart the service.
@@ -132,6 +132,7 @@ All the endpoints in this service use varied sets of configuration settings and
 | `ENABLE_CALLBACK` | `enable_callback` | Boolean indicating whether feature is turned on |
 | `ENABLE_CHECK_IN` | `enable_check_in` | Boolean indicating whether feature is turned on |
 | `ENABLE_METRICS` | `enable_metrics` | Boolean indicating whether feature is turned on |
+| `ENABLE_NOTICES` | `enable_self_isolation_notices` | Boolean indicating whether feature is turned on |
 | `LOG_LEVEL` | `log_level` | Standard logging level setting |
 | `CORS_ORIGIN` | `cors_origin` | Boolean indicating something about CORS |
 | `DB_HOST` | `db_host` | Connection host for database (writing/reading) |
@@ -147,9 +148,11 @@ All the endpoints in this service use varied sets of configuration settings and
 | `UPLOAD_TOKEN_LIFETIME_MINS` | `upload_token_lifetime_mins` | ?? |
 | `VERIFY_RATE_LIMIT_SECS` | `security_verify_rate_limit_secs` | ?? |
 | `CALLBACK_QUEUE_URL` | `callback_url` | ?? |
+| `NOTICES_QUEUE_URL` | `self_isolation_notices_url` | ?? |
 | `ASSETS_BUCKET` | `s3_assets_bucket` | ?? |
 | `CALLBACK_RATE_LIMIT_SECS` | `security_callback_rate_limit_secs` | # of seconds required before a user can request another callback |
 | `CALLBACK_RATE_LIMIT_REQUEST_COUNT` | `security_callback_rate_limit_request_count` | # of callback requests allowed before rate limit goes into effect |
+| `NOTICES_RATE_LIMIT_SECS` | `security_notices_rate_limit_secs` | # of seconds required before a user can request another notice unique key |
 
 #### Secret Settings
 
@@ -186,16 +189,16 @@ All the endpoints in this service use varied sets of configuration settings and
 
 ### Contributors
 
-* @dennisgove - Dennis Gove <dpgove@gmail.com>
+* @fiacc - Fiacc O'Brien Moran <fiacc.obrienmoran@nearform.com>
 
 ### Past Contributors
 
-* TBD
-* TBD
+* @dennisgove - Dennis Gove <[email protected]>
+* @dharding - David J Harding <[email protected]>
 
 ## Hosted By
 
-<a href="https://www.lfph.io"><img alttext="Linux Foundation Public Health Logo" src="https://raw.githubusercontent.com/lfph/artwork/master/lfph/stacked/color/lfph-stacked-color.svg" width="200"></a>
+<a href="https://www.lfph.io"><img alttext="Linux Foundation Public Health Logo" src="https://raw.githubusercontent.com/lfph/artwork/main/other/lfph/stacked/color/lfph-stacked-color.svg" width="200"></a>
 
 [Linux Foundation Public Health](https://www.lfph.io)