opengovsg · mantariksh · Aug 11, 2021 · Jul 27, 2021 · Jul 27, 2021 · Jul 27, 2021
diff --git a/.template-env b/.template-env
@@ -107,6 +107,7 @@ FORMSG_SDK_MODE=
 
 # IS_SP_MAINTENANCE=
 # IS_CP_MAINTENANCE=
+# MYINFO_BANNER_CONTENT=
 
 ## Per-minute, per-IP request limits applied to specific endpoints
 # SUBMISSIONS_RATE_LIMIT=

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,54 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v5.22.0](https://github.com/opengovsg/FormSG/compare/v5.21.2...v5.22.0)
+
+- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#2508`](https://github.com/opengovsg/FormSG/pull/2508)
+- chore(deps-dev): bump @opengovsg/mockpass from 2.7.6 to 2.7.7 [`#2507`](https://github.com/opengovsg/FormSG/pull/2507)
+- fix(deps): bump zod from 3.6.1 to 3.7.1 [`#2506`](https://github.com/opengovsg/FormSG/pull/2506)
+- fix(deps): bump libphonenumber-js from 1.9.22 to 1.9.23 [`#2505`](https://github.com/opengovsg/FormSG/pull/2505)
+- feat(sms-limiting): db dependencies [`#2503`](https://github.com/opengovsg/FormSG/pull/2503)
+- chore: remove express-device [`#2498`](https://github.com/opengovsg/FormSG/pull/2498)
+- feat(shared-types): move billing related types to shared folder [`#2400`](https://github.com/opengovsg/FormSG/pull/2400)
+- fix(login): show Joi validation error correctly [`#2499`](https://github.com/opengovsg/FormSG/pull/2499)
+- feat(shared-types): relocate (admin-related) Submission types to new shared folder [`#2399`](https://github.com/opengovsg/FormSG/pull/2399)
+- fix(deps): bump aws-sdk from 2.956.0 to 2.958.0 [`#2497`](https://github.com/opengovsg/FormSG/pull/2497)
+- chore(deps-dev): bump core-js from 3.15.2 to 3.16.0 [`#2493`](https://github.com/opengovsg/FormSG/pull/2493)
+- chore(deps-dev): bump type-fest from 1.2.3 to 1.3.0 [`#2496`](https://github.com/opengovsg/FormSG/pull/2496)
+- chore(deps-dev): bump ts-essentials from 7.0.2 to 7.0.3 [`#2495`](https://github.com/opengovsg/FormSG/pull/2495)
+- chore(deps-dev): bump eslint from 7.31.0 to 7.32.0 [`#2494`](https://github.com/opengovsg/FormSG/pull/2494)
+- chore(deps-dev): bump @types/node from 14.17.6 to 14.17.7 [`#2492`](https://github.com/opengovsg/FormSG/pull/2492)
+- chore(deps-dev): bump @babel/preset-env from 7.14.8 to 7.14.9 [`#2491`](https://github.com/opengovsg/FormSG/pull/2491)
+- fix(deps): bump zod from 3.5.1 to 3.6.1 [`#2490`](https://github.com/opengovsg/FormSG/pull/2490)
+- chore: merge hotfix release v5.21.2 back to develop [`#2486`](https://github.com/opengovsg/FormSG/pull/2486)
+- fix: upgrade zod from 3.3.4 to 3.5.1 [`#2476`](https://github.com/opengovsg/FormSG/pull/2476)
+- fix(deps): bump aws-sdk from 2.955.0 to 2.956.0 [`#2474`](https://github.com/opengovsg/FormSG/pull/2474)
+- chore(deps-dev): bump type-fest from 1.2.2 to 1.2.3 [`#2473`](https://github.com/opengovsg/FormSG/pull/2473)
+- fix(SGID): disallow SGID authentication in storage mode [`#2468`](https://github.com/opengovsg/FormSG/pull/2468)
+- fix(snyk): Fix vulnerability in Twilio [`#2469`](https://github.com/opengovsg/FormSG/pull/2469)
+- chore: merge hotfix release v5.21.1 back into develop [`#2472`](https://github.com/opengovsg/FormSG/pull/2472)
+- fix(types): Fix express session types based on latest definitions [`#2463`](https://github.com/opengovsg/FormSG/pull/2463)
+- feat: add MYINFO_BANNER_CONTENT env var for bannering myinfo forms [`#2457`](https://github.com/opengovsg/FormSG/pull/2457)
+- fix(deps): bump aws-sdk from 2.954.0 to 2.955.0 [`#2461`](https://github.com/opengovsg/FormSG/pull/2461)
+- chore(deps-dev): bump @opengovsg/mockpass from 2.7.4 to 2.7.6 [`#2460`](https://github.com/opengovsg/FormSG/pull/2460)
+- chore(deps-dev): bump testcafe from 1.15.0 to 1.15.1 [`#2459`](https://github.com/opengovsg/FormSG/pull/2459)
+- fix(deps): bump fp-ts from 2.11.0 to 2.11.1 [`#2458`](https://github.com/opengovsg/FormSG/pull/2458)
+- fix: upgrade sortablejs from 1.13.0 to 1.14.0 [`#2456`](https://github.com/opengovsg/FormSG/pull/2456)
+- feat(client): add EncryptionService to validate encrypt submission responses [`#2436`](https://github.com/opengovsg/FormSG/pull/2436)
+- fix(deps): bump aws-sdk from 2.953.0 to 2.954.0 [`#2451`](https://github.com/opengovsg/FormSG/pull/2451)
+- build: merge 5.21.0 into develop [`#2445`](https://github.com/opengovsg/FormSG/pull/2445)
+- feat(shared-types): move core, FormFeedback related types to root shared folder [`#2394`](https://github.com/opengovsg/FormSG/pull/2394)
+- ref: remove backend package dependencies from Form (sub-)types and move to shared dir [`#2385`](https://github.com/opengovsg/FormSG/pull/2385)
+- chore: add postinstall script to install /shared modules [`#2438`](https://github.com/opengovsg/FormSG/pull/2438)
+- feat: remove validation when logging esrvcId to login collection [`90a0fb0`](https://github.com/opengovsg/FormSG/commit/90a0fb04c450607c5e246c153583844bfe6d42dc)
+- chore: bump version to v5.21.2 [`7c87b10`](https://github.com/opengovsg/FormSG/commit/7c87b106400c1fbd197fe503cfa716a0b169f8c0)
+
 #### [v5.21.2](https://github.com/opengovsg/FormSG/compare/v5.21.1...v5.21.2)
 
-- feat: remove validation when logging esrvcId to login collection [`90a0fb0`](https://github.com/opengovsg/FormSG/commit/90a0fb04c450607c5e246c153583844bfe6d42dc)
+> 30 July 2021
+
+- chore: bump version to v5.21.2 [`08cf7d4`](https://github.com/opengovsg/FormSG/commit/08cf7d4a838dde0ca3c418451f72eefd9ef88d19)
+- feat: remove validation when logging esrvcId to login collection [`5bea425`](https://github.com/opengovsg/FormSG/commit/5bea4252707eb1bd6e2776175dab591dd0738ec8)
 
 #### [v5.21.1](https://github.com/opengovsg/FormSG/compare/v5.21.0...v5.21.1)
 
@@ -415,7 +460,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(verification): loosen OTP waiting time by 2 seconds [`#1957`](https://github.com/opengovsg/FormSG/pull/1957)
 - chore: bump version to 5.12.0 [`85759bc`](https://github.com/opengovsg/FormSG/commit/85759bc9dc01f73da3cbd0ec73c636e58e983948)
 
-#### [v5.11.0](https://github.com/opengovsg/FormSG/compare/v5.10.1...v5.11.0)
+#### [v5.11.0](https://github.com/opengovsg/FormSG/compare/v5.10.0...v5.11.0)
 
 > 25 May 2021
 
@@ -483,11 +528,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#1868`](https://github.com/opengovsg/FormSG/pull/1868)
 - fix(deps): bump @sentry/integrations from 6.3.5 to 6.3.6 [`#1850`](https://github.com/opengovsg/FormSG/pull/1850)
 - chore: bump version to 5.11.0 [`54b1958`](https://github.com/opengovsg/FormSG/commit/54b1958d0968e670ef145461d9d7859384d573ef)
-
-#### [v5.10.1](https://github.com/opengovsg/FormSG/compare/v5.10.0...v5.10.1)
-
-> 17 May 2021
-
 - chore: bump version to v5.10.1 [`0442cd7`](https://github.com/opengovsg/FormSG/commit/0442cd72637019fb1e43bce5f8f5abe14ee79f8c)
 - fix: allow for unknown keys in updateEndPage validator [`617d86a`](https://github.com/opengovsg/FormSG/commit/617d86a28910eec6ebd3249a2de636086429d6a6)
 

diff --git a/CREDITS.md b/CREDITS.md
@@ -1293,38 +1293,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
--------------------------------------------------------------------------------
-
-## Project
-express-device
-
-### Source
-https://github.com/rguerreiro/express-device
-
-### License
-(The MIT License)
-
-Copyright (c) 2012-2015 Rodrigo Guerreiro
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 -------------------------------------------------------------------------------
 
 ## Project

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -74,6 +74,7 @@ services:
       - CORPPASS_IDP_ID=https://saml.corppass.gov.sg/FIM/sps/CorpIDPFed/saml20
       - IS_SP_MAINTENANCE
       - IS_CP_MAINTENANCE
+      - MYINFO_BANNER_CONTENT
       - MYINFO_CLIENT_CONFIG=dev
       - MYINFO_FORMSG_KEY_PATH=./node_modules/@opengovsg/mockpass/static/certs/key.pem
       - MYINFO_CERT_PATH=./node_modules/@opengovsg/mockpass/static/certs/spcp.crt

diff --git a/docs/DEPLOYMENT_SETUP.md b/docs/DEPLOYMENT_SETUP.md
@@ -106,7 +106,7 @@ The following env variables are set in Travis:
 ## Environment Variables
 
 These are configured by creating groups of environment variables formatted like `.env` files in the Parameter
-Store of AWS Service Manager. These groups have names formatted as `<environment>-<category>`. 
+Store of AWS Service Manager. These groups have names formatted as `<environment>-<category>`.
 
 The environment for each group is user-defined, and should be specified in the Elastic Beanstalk configuration
 as the environment variable `SSM_PREFIX`.
@@ -117,9 +117,9 @@ The list of categories can be inferred by looking at the file `.ebextensions/env
 
 #### AWS Service Manager
 
-| Variable            | Description                                                                                                      |
-| :------------------ | ---------------------------------------------------------------------------------------------------------------- |
-| `SSM_PREFIX`        | String prefix (typically the environment name) for AWS SSM parameter names to create a .env file for FormSG.     |
+| Variable     | Description                                                                                                  |
+| :----------- | ------------------------------------------------------------------------------------------------------------ |
+| `SSM_PREFIX` | String prefix (typically the environment name) for AWS SSM parameter names to create a .env file for FormSG. |
 
 #### App Config
 
@@ -190,6 +190,7 @@ SITE_BANNER_CONTENT=hello:This is an invalid banner type, and the full text will
 | `ADMIN_BANNER_CONTENT`   | If set, displays a banner message on private admin routes such as the form list page as well as form builder pages.                                                                                           |
 | `IS_LOGIN_BANNER`        | If set, displays a banner message on the login page.                                                                                                                                                          |
 | `IS_GENERAL_MAINTENANCE` | If set, displays a banner message on all forms. Overrides `IS_SP_MAINTENANCE` and `IS_CP_MAINTENANCE`.                                                                                                        |
+| `MYINFO_BANNER_CONTENT`  | all public **MyInfo-enabled** forms                                                                                                                                                                           |
 | `IS_SP_MAINTENANCE`      | all public **SingPass-enabled** forms                                                                                                                                                                         |
 | `IS_CP_MAINTENANCE`      | all public **CorpPass-enabled** forms                                                                                                                                                                         |