Merge pull request #1221 from opengovsg/release-4.58.2

chore: merge release 4.58.2 into master
opengovsg · Feb 23, 2021 · 3d47f32 · 3d47f32
2 parents e28c87c + 8fec3d4
commit 3d47f32
Show file tree

Hide file tree

Showing 36 changed files with 869 additions and 1,189 deletions.
diff --git a/.template-env b/.template-env
@@ -84,7 +84,6 @@ FORMSG_SDK_MODE=
 # purposes. 
 # MYINFO_CLIENT_CONFIG=stg
 # MYINFO_FORMSG_KEY_PATH=./node_modules/@opengovsg/mockpass/static/certs/key.pem
-# SPCP_COOKIE_MAX_AGE=7200000
 
 # SP_FORMSG_KEY_PATH=./node_modules/@opengovsg/mockpass/static/certs/key.pem
 # SP_FORMSG_CERT_PATH=./node_modules/@opengovsg/mockpass/static/certs/server.crt

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,50 @@ 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).
 
+#### [v4.58.2](https://github.com/opengovsg/FormSG/compare/v4.58.1...v4.58.2)
+
+- fix: allow slash in msgSrvcName [`31fc57c`](https://github.com/opengovsg/FormSG/commit/31fc57c815fa903e822e4cce0384d96d8ca3329b)
+
+#### [v4.58.1](https://github.com/opengovsg/FormSG/compare/v4.58.0...v4.58.1)
+
+> 17 February 2021
+
+- fix: Release 4.58.1 hotfix - mobile signature validation [`#1151`](https://github.com/opengovsg/FormSG/pull/1151)
+- fix: add back homeno icon [`#1152`](https://github.com/opengovsg/FormSG/pull/1152)
+- chore: bump version to 4.58.1 [`d4a29df`](https://github.com/opengovsg/FormSG/commit/d4a29dffe6af49c98c42f6675531731c228333e6)
+- fix: allow 0 as fieldValue [`a81fda2`](https://github.com/opengovsg/FormSG/commit/a81fda281338e22a4c3af859e84cd5f1d6c66af6)
+
+#### [v4.58.0](https://github.com/opengovsg/FormSG/compare/v4.57.0...v4.58.0)
+
+> 16 February 2021
+
+- chore(deps-dev): bump typescript from 4.1.4 to 4.1.5 [`#1137`](https://github.com/opengovsg/FormSG/pull/1137)
+- chore(deps-dev): bump @babel/core from 7.12.13 to 7.12.16 [`#1136`](https://github.com/opengovsg/FormSG/pull/1136)
+- fix(deps): bump moment-timezone from 0.5.32 to 0.5.33 [`#1130`](https://github.com/opengovsg/FormSG/pull/1130)
+- fix(deps): bump jszip from 3.5.0 to 3.6.0 [`#1131`](https://github.com/opengovsg/FormSG/pull/1131)
+- chore(deps-dev): bump lint-staged from 10.5.3 to 10.5.4 [`#1132`](https://github.com/opengovsg/FormSG/pull/1132)
+- chore(deps-dev): bump stylelint from 13.8.0 to 13.10.0 [`#1135`](https://github.com/opengovsg/FormSG/pull/1135)
+- refactor: remove SPCP_COOKIE_MAX_AGE [`#1134`](https://github.com/opengovsg/FormSG/pull/1134)
+- feat: deprecate MyInfo fields for V3 (step 3 - drop support) [`#1073`](https://github.com/opengovsg/FormSG/pull/1073)
+- build: docker-compose to use mongo:4.0 image [`#1114`](https://github.com/opengovsg/FormSG/pull/1114)
+- feat: update SMS OTP message [`#1085`](https://github.com/opengovsg/FormSG/pull/1085)
+- chore(deps-dev): bump @typescript-eslint/parser from 4.12.0 to 4.15.0 [`#1106`](https://github.com/opengovsg/FormSG/pull/1106)
+- chore(deps-dev): bump ts-mock-imports from 1.3.1 to 1.3.3 [`#1122`](https://github.com/opengovsg/FormSG/pull/1122)
+- fix(deps): bump fp-ts from 2.9.4 to 2.9.5 [`#1124`](https://github.com/opengovsg/FormSG/pull/1124)
+- chore(deps-dev): bump @types/express-rate-limit from 5.1.0 to 5.1.1 [`#1123`](https://github.com/opengovsg/FormSG/pull/1123)
+- fix(deps): bump web-streams-polyfill from 3.0.1 to 3.0.2 [`#1121`](https://github.com/opengovsg/FormSG/pull/1121)
+- chore(deps-dev): bump typescript from 4.1.3 to 4.1.4 [`#1120`](https://github.com/opengovsg/FormSG/pull/1120)
+- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#1107`](https://github.com/opengovsg/FormSG/pull/1107)
+- chore(deps-dev): bump eslint from 7.17.0 to 7.19.0 [`#1108`](https://github.com/opengovsg/FormSG/pull/1108)
+- build: merge Release 4.57.0 into develop [`#1117`](https://github.com/opengovsg/FormSG/pull/1117)
+- fix: revert merge to extend [`#1115`](https://github.com/opengovsg/FormSG/pull/1115)
+- ref: migrate encrypt SP/CP verified content flow into separate module [`#934`](https://github.com/opengovsg/FormSG/pull/934)
+- chore: bump version to 4.58.0 [`ad2a796`](https://github.com/opengovsg/FormSG/commit/ad2a7969cc85c94c42a2b105baa9077eb9585917)
+
 #### [v4.57.0](https://github.com/opengovsg/FormSG/compare/v4.56.0...v4.57.0)
 
+> 10 February 2021
+
 - feat: mask cp uid in autoreply to respondent [`#1109`](https://github.com/opengovsg/FormSG/pull/1109)
 - fix: interrupt submission if field is blank [`#1096`](https://github.com/opengovsg/FormSG/pull/1096)
 - fix(deps): bump @babel/runtime from 7.12.5 to 7.12.13 [`#1098`](https://github.com/opengovsg/FormSG/pull/1098)
@@ -50,6 +92,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore(deps-dev): bump @types/node from 14.14.20 to 14.14.22 [`#1043`](https://github.com/opengovsg/FormSG/pull/1043)
 - chore(deps-dev): bump husky from 4.3.7 to 4.3.8 [`#1033`](https://github.com/opengovsg/FormSG/pull/1033)
 - chore: merge 4.55.0 into develop [`#1051`](https://github.com/opengovsg/FormSG/pull/1051)
+- chore: bump version to 4.57.0 [`8649e1d`](https://github.com/opengovsg/FormSG/commit/8649e1dc5467180fb80e52595eb8bfed1f7933e7)
 
 #### [v4.56.0](https://github.com/opengovsg/FormSG/compare/v4.55.0...v4.56.0)
 
@@ -266,16 +309,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - build: Release 4.30.1 - Fix field creation on old clients [`#74`](https://github.com/opengovsg/FormSG/pull/74)
 - Release 4.30.0 - acknowledgement for secret key backup, TypeScript migrations [`#67`](https://github.com/opengovsg/FormSG/pull/67)
 - build: empty commit to trigger PR build [`d0c6583`](https://github.com/opengovsg/FormSG/commit/d0c65838efa6731a0f10e89ff954c132b9f8b854)
-- feat: update table field styling to not rely on multiple divs [`db03da3`](https://github.com/opengovsg/FormSG/commit/db03da33eca2fc0a6174ca58d7dd8b3cfadadcea)
 - fix: return 401 for missing JWT [`e6c1947`](https://github.com/opengovsg/FormSG/commit/e6c19477b05fc4aed90b2db42916220aea2a263c)
+- test: add tests for extractJwt [`16191a9`](https://github.com/opengovsg/FormSG/commit/16191a957be0dc7f63dc4221569fac2794b7d063)
 
 #### [v4.50.2](https://github.com/opengovsg/FormSG/compare/v4.50.1...v4.50.2)
 
 > 16 December 2020
 
-- feat: update table field styling to not rely on multiple divs [`e857aed`](https://github.com/opengovsg/FormSG/commit/e857aed667145441758f09f311c2b9f16f57645b)
+- feat: update table field styling to not rely on multiple divs [`db03da3`](https://github.com/opengovsg/FormSG/commit/db03da33eca2fc0a6174ca58d7dd8b3cfadadcea)
 - fix: email format validation should allow 126/163.com, align frontend and backend validation [`be35522`](https://github.com/opengovsg/FormSG/commit/be35522e15d20521f58fada7ed3164e6c0c0894d)
-- chore: bump version to v4.50.2 [`fad62ec`](https://github.com/opengovsg/FormSG/commit/fad62ec5730412201e208332a91286fd53e2b36a)
+- chore: bump version to v4.50.2 [`1ac7be6`](https://github.com/opengovsg/FormSG/commit/1ac7be6cb69553d186ec194682ae25bd98318a8b)
 
 #### [v4.50.1](https://github.com/opengovsg/FormSG/compare/v4.50.0...v4.50.1)
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,7 +20,6 @@ services:
       - DB_HOST=mongodb://database:27017/formsg
       - APP_NAME=FormSG
       - MYINFO_CLIENT_CONFIG=stg
-      - SPCP_COOKIE_MAX_AGE=7200000
       - ATTACHMENT_S3_BUCKET=local-attachment-bucket
       - IMAGE_S3_BUCKET=local-image-bucket
       - LOGO_S3_BUCKET=local-logo-bucket
@@ -84,7 +83,7 @@ services:
     network_mode: 'service:formsg' # reuse formsg service's network stack so that it can resolve localhost:5156 to mockpass:5156
 
   database:
-    image: 'mongo:3.6'
+    image: 'mongo:4.0'
     container_name: 'formsg-db'
     environment:
       - MONGO_INITDB_DATABASE=formsg