build: merge release v5.15.0 into master

.template-env

@@ -31,7 +31,6 @@ FORMSG_SDK_MODE=
 # APP_NAME=FormSG
 # OTP_LIFE_SPAN=900000
 # BOUNCE_LIFE_SPAN=86400000
-# AGGREGATE_COLLECTION=
 
 # If provided, a banner with the provided message will show up in every form.
 # IS_GENERAL_MAINTENANCE=

.vscode/settings.json

@@ -16,5 +16,6 @@
       "source.fixAll.eslint": false
     },
     "editor.defaultFormatter": "esbenp.prettier-vscode"
-  }
+  },
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

CHANGELOG.md

@@ -4,8 +4,86 @@ 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.15.0](https://github.com/opengovsg/FormSG/compare/v5.14.1...v5.15.0)
+
+- feat: Add webhook support for storage mode attachments [`#1713`](https://github.com/opengovsg/FormSG/pull/1713)
+
+#### [v5.14.1](https://github.com/opengovsg/FormSG/compare/v5.14.0...v5.14.1)
+
+> 15 June 2021
+
+- chore: bump version to v5.14.1 [`d7a612e`](https://github.com/opengovsg/FormSG/commit/d7a612e55ed56aac1d7784d25a8b894b924f3401)
+- fix: allow read key in permissionList when updating collaborators [`6ae1af6`](https://github.com/opengovsg/FormSG/commit/6ae1af6859e8b9be275204f4274ba396a6769ff4)
+
+#### [v5.14.0](https://github.com/opengovsg/FormSG/compare/v5.13.1...v5.14.0)
+
+> 15 June 2021
+
+- feat: revert backwards-incompatible changes for v5.14.0 [`#2169`](https://github.com/opengovsg/FormSG/pull/2169)
+- fix(auth.client.controller): add missing undefinedness check [`#2168`](https://github.com/opengovsg/FormSG/pull/2168)
+- refactor: simplify isUenValid logic [`#2156`](https://github.com/opengovsg/FormSG/pull/2156)
+- fix(deps): bump @opengovsg/spcp-auth-client from 1.4.7 to 1.4.8 [`#2164`](https://github.com/opengovsg/FormSG/pull/2164)
+- fix(deps): bump @sentry/integrations from 6.6.0 to 6.7.0 [`#2163`](https://github.com/opengovsg/FormSG/pull/2163)
+- chore(deps-dev): bump @typescript-eslint/parser from 4.26.1 to 4.27.0 [`#2162`](https://github.com/opengovsg/FormSG/pull/2162)
+- refactor(encrypt-submission): introduce IncomingEncryptSubmission [`#1987`](https://github.com/opengovsg/FormSG/pull/1987)
+- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#2161`](https://github.com/opengovsg/FormSG/pull/2161)
+- fix(deps): bump @sentry/browser from 6.6.0 to 6.7.0 [`#2160`](https://github.com/opengovsg/FormSG/pull/2160)
+- refactor(angularjs): remove angular-moment [`#2154`](https://github.com/opengovsg/FormSG/pull/2154)
+- feat: add UEN field [`#2100`](https://github.com/opengovsg/FormSG/pull/2100)
+- build: mute Localstack logs [`#2146`](https://github.com/opengovsg/FormSG/pull/2146)
+- feat(feature-manager): remove GoogleAnalytics feature [`#2127`](https://github.com/opengovsg/FormSG/pull/2127)
+- feat(feature-manager): hardcode /features API response [`#2149`](https://github.com/opengovsg/FormSG/pull/2149)
+- fix(deps): bump zod from 3.1.0 to 3.2.0 [`#2151`](https://github.com/opengovsg/FormSG/pull/2151)
+- fix(deps): bump aws-sdk from 2.925.0 to 2.927.0 [`#2153`](https://github.com/opengovsg/FormSG/pull/2153)
+- chore(deps-dev): bump @types/mongodb from 3.6.17 to 3.6.18 [`#2152`](https://github.com/opengovsg/FormSG/pull/2152)
+- chore(deps-dev): bump htmlhint from 0.14.2 to 0.15.1 [`#2150`](https://github.com/opengovsg/FormSG/pull/2150)
+- chore: merge v5.13.1 into develop [`#2144`](https://github.com/opengovsg/FormSG/pull/2144)
+- docs(feature-manager): update docs to reflect FeatureManager removal [`#2145`](https://github.com/opengovsg/FormSG/pull/2145)
+- feat(feature-manager): remove Sentry from feature manager [`#2130`](https://github.com/opengovsg/FormSG/pull/2130)
+- fix(submissions): remove captcha dependence on feature toggle [`#2143`](https://github.com/opengovsg/FormSG/pull/2143)
+- chore(deps-dev): bump @babel/plugin-transform-runtime [`#2141`](https://github.com/opengovsg/FormSG/pull/2141)
+- fix(deps): bump aws-sdk from 2.924.0 to 2.925.0 [`#2136`](https://github.com/opengovsg/FormSG/pull/2136)
+- fix(deps): bump @sentry/browser from 6.5.1 to 6.6.0 [`#2135`](https://github.com/opengovsg/FormSG/pull/2135)
+- chore(deps-dev): bump @babel/preset-env from 7.14.4 to 7.14.5 [`#2140`](https://github.com/opengovsg/FormSG/pull/2140)
+- fix(deps): bump @babel/runtime from 7.14.0 to 7.14.5 [`#2139`](https://github.com/opengovsg/FormSG/pull/2139)
+- chore(deps-dev): bump @babel/core from 7.14.3 to 7.14.5 [`#2138`](https://github.com/opengovsg/FormSG/pull/2138)
+- fix(deps): bump @sentry/integrations from 6.5.1 to 6.6.0 [`#2137`](https://github.com/opengovsg/FormSG/pull/2137)
+- test(adminsubmissionservice): unit tests for download methods [`#2129`](https://github.com/opengovsg/FormSG/pull/2129)
+- feat(feature-manager): remove Intranet from feature manager [`#2131`](https://github.com/opengovsg/FormSG/pull/2131)
+- refactor(submissions.client.factory): refactored download methods [`#2054`](https://github.com/opengovsg/FormSG/pull/2054)
+- refactor(auth.client.service): refactor to Typescript [`#2132`](https://github.com/opengovsg/FormSG/pull/2132)
+- test: remove basic and full e2e test separation [`#2128`](https://github.com/opengovsg/FormSG/pull/2128)
+- fix(auth): make login emails case-insensitive [`#2125`](https://github.com/opengovsg/FormSG/pull/2125)
+- feat(feature-manager): tear out AggregateStats feature [`#2120`](https://github.com/opengovsg/FormSG/pull/2120)
+- feat(feature-manager): remove feature toggles from frontend [`#2118`](https://github.com/opengovsg/FormSG/pull/2118)
+- refactor: formFactoryClientService [`#2117`](https://github.com/opengovsg/FormSG/pull/2117)
+- chore(deps-dev): bump csv-parse from 4.15.4 to 4.16.0 [`#2124`](https://github.com/opengovsg/FormSG/pull/2124)
+- fix(deps): bump aws-sdk from 2.923.0 to 2.924.0 [`#2123`](https://github.com/opengovsg/FormSG/pull/2123)
+- chore(deps-dev): bump @types/validator from 13.1.3 to 13.1.4 [`#2122`](https://github.com/opengovsg/FormSG/pull/2122)
+- test: loosen URL check in e2e test [`#2119`](https://github.com/opengovsg/FormSG/pull/2119)
+- feat: add and call v3 API for retrieving individual admin form [`#2113`](https://github.com/opengovsg/FormSG/pull/2113)
+- chore: remove blocking of SP and RP admin updates [`#2114`](https://github.com/opengovsg/FormSG/pull/2114)
+- refactor(auth.client): (1) extract email validation and send login otp flow to Typescript [`#2084`](https://github.com/opengovsg/FormSG/pull/2084)
+- feat: store only user ID in session [`#1849`](https://github.com/opengovsg/FormSG/pull/1849)
+- fix: return storage mode submission version when when retrieving from server [`#2112`](https://github.com/opengovsg/FormSG/pull/2112)
+- refactor: replace $resource in angularjs form-api.client.factory.js with typescript FormService  [`#1947`](https://github.com/opengovsg/FormSG/pull/1947)
+- refactor(ts-migration): ndjsonstream and process-decrypted-content [`#2111`](https://github.com/opengovsg/FormSG/pull/2111)
+- chore: remove redundant ValidationOption object properties for short text, long text and number fields [`#2040`](https://github.com/opengovsg/FormSG/pull/2040)
+- chore(deps-dev): bump @types/node from 14.17.2 to 14.17.3 [`#2108`](https://github.com/opengovsg/FormSG/pull/2108)
+- chore(deps-dev): bump ts-essentials from 7.0.1 to 7.0.2 [`#2110`](https://github.com/opengovsg/FormSG/pull/2110)
+- chore(deps-dev): bump @types/express-rate-limit from 5.1.1 to 5.1.2 [`#2109`](https://github.com/opengovsg/FormSG/pull/2109)
+- fix(deps): bump zod from 3.0.0 to 3.1.0 [`#2107`](https://github.com/opengovsg/FormSG/pull/2107)
+- fix(deps): bump aws-sdk from 2.922.0 to 2.923.0 [`#2105`](https://github.com/opengovsg/FormSG/pull/2105)
+- chore: merge release v5.13.0 into develop [`#2102`](https://github.com/opengovsg/FormSG/pull/2102)
+- feat: Add webhook support for storage mode attachments [`#1713`](https://github.com/opengovsg/FormSG/pull/1713)
+- refactor(auth.client.service): refactor to Typescript (#2132) [`#2066`](https://github.com/opengovsg/FormSG/issues/2066)
+- chore: bump version to 5.14.0 [`a3f6291`](https://github.com/opengovsg/FormSG/commit/a3f6291e0800c18024b635344aafcddcd7c0a567)
+
 #### [v5.13.1](https://github.com/opengovsg/FormSG/compare/v5.13.0...v5.13.1)
 
+> 11 June 2021
+
+- chore: bump version to 5.13.1 [`7c87bf3`](https://github.com/opengovsg/FormSG/commit/7c87bf3af16347b630581427bc9223a84846dea3)
 - feat(verification): up expiry time to 30min [`34b28c8`](https://github.com/opengovsg/FormSG/commit/34b28c87c14e8e0b55276e5a21b6f5473c436e24)
 
 #### [v5.13.0](https://github.com/opengovsg/FormSG/compare/v5.12.1...v5.13.0)

README.md

@@ -41,11 +41,11 @@ Notable features include:
 
 The current product roadmap includes:
 
-- (in progress) Migrating backend code from JavaScript to [TypeScript](https://www.typescriptlang.org/)
-- (in progress) Refactoring backend code to use [Domain-driven Design](https://en.wikipedia.org/wiki/Domain-driven_design)
-- (in progress) Migrating backend tests from [Jasmine](https://jasmine.github.io/) to [Jest](https://jestjs.io/) and expanding unit vs integration tests
-- (yet to start) Support for webhooks attachments
-- (yet to start) Frontend rewrite from [AngularJS](https://angularjs.org/) to [React](https://reactjs.org/)
+- (in progress) Frontend rewrite from [AngularJS](https://angularjs.org/) to [React](https://reactjs.org/)
+- Enabling payments on forms
+- Electronic signatures
+- Notifications to form admins for Storage mode submissions
+- Integration with vault.gov.sg
 
 ## Local Development (Docker)
 
@@ -168,29 +168,6 @@ An overview of the architecture can be found [here](docs/ARCHITECTURE.md).
 
 Scripts for common tasks in MongoDB can be found [here](docs/MONGODB.md).
 
-## Maintenance Banners
-
-Banners providing form-fillers with useful information can shown at the top of
-forms and configured using the environment variables below.
-
-| Environment Variable     | Value will be shown as a banner at the bottom of                                                                                                                                   |
-| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `ADMIN_BANNER_CONTENT`   | private form routes such as `/forms` and `/{formId}/admin`                                                                                                                         |
-| `SITE_BANNER_CONTENT`    | both private routes that `ADMIN_BANNER_CONTENT` covers **and** public form routes that `IS_GENERAL_MAINTENANCE` covers. This supersedes **ALL** other banner environment variables |
-| `IS_GENERAL_MAINTENANCE` | all public forms                                                                                                                                                                   |
-| `IS_SP_MAINTENANCE`      | all public **SingPass-enabled** forms                                                                                                                                              |
-| `IS_CP_MAINTENANCE`      | all public **CorpPass-enabled** forms                                                                                                                                              |
-
-> Note that if more than one of the above environment variables are defined,
-> only one environment variable will be used to display the given values.
->
-> For public form routes, only one environment variable will be read in the
-> following precedence: `SITE_BANNER_CONTENT` > `IS_GENERAL_MAINTENANCE` >
-> `IS_SP_MAINTENANCE` > `IS_CP_MAINTENANCE`
->
-> For private form routes, only one environment variable will be read in the
-> following precendence: `SITE_BANNER_CONTENT` > `ADMIN_BANNER_CONTENT`
-
 ## Contributing
 
 We welcome all contributions, bug reports, bug fixes, documentation improvements, enhancements, and ideas to code open sourced by the Government Technology Agency of Singapore. Contributors should read [CONTRIBUTING.md](CONTRIBUTING.md) and will also be asked to sign a Contributor License Agreement (CLA) in order to ensure that everybody is free to use their contributions.
@@ -211,4 +188,4 @@ Contributions have also been made by:
 [@zioul123](https://github.com/zioul123)  
 [@JoelWee](https://github.com/JoelWee)  
 [@limli](https://github.com/limli)  
-[@tankevan](https://github.com/tankevan)  
+[@tankevan](https://github.com/tankevan)

docker-compose.yml

@@ -39,8 +39,12 @@ services:
       - MYINFO_CLIENT_ID=mockClientId
       - MYINFO_CLIENT_SECRET=mockClientSecret
       - WEBHOOK_SQS_URL=http://localhost:4566/000000000000/local-webhooks-sqs-main
-      - GA_TRACKING_ID
-      - SENTRY_CONFIG_URL
+      - INTRANET_IP_LIST_PATH
+      - SENTRY_CONFIG_URL=https://[email protected]/123456
+      - CSP_REPORT_URI=https://[email protected]/123456
+      # This needs to be removed and replaced with a real tracking ID in a local .env file
+      # in order to enable GA in a local environment
+      - GA_TRACKING_ID=mockGATrackingId
       - TWILIO_ACCOUNT_SID
       - TWILIO_API_KEY
       - TWILIO_API_SECRET
@@ -71,7 +75,6 @@ services:
       - CORPPASS_IDP_ID
       - IS_SP_MAINTENANCE
       - IS_CP_MAINTENANCE
-      - AGGREGATE_COLLECTION
 
   mockpass:
     build: https://github.com/opengovsg/mockpass.git
@@ -112,6 +115,8 @@ services:
       - './.localstack:/tmp/localstack'
       - '/var/run/docker.sock:/var/run/docker.sock'
     network_mode: 'service:formsg' # reuse formsg service's network stack so that it can resolve localhost:4566 to localstack:4566
+    logging:
+      driver: none
 
   maildev:
     image: maildev/maildev