Merge pull request #1682 from opengovsg/release-v5.6.1

build: merge Release v5.6.1 into master
opengovsg · Apr 20, 2021 · cc19a8f · cc19a8f
2 parents 4f0194c + 9f0930e
commit cc19a8f
Show file tree

Hide file tree

Showing 296 changed files with 17,825 additions and 10,218 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -66,9 +66,9 @@
     { "files": ["*.spec.ts"], "extends": ["plugin:jest/recommended"] },
     {
       "files": ["*.ts", "*.js"],
-      "excludedFiles": ["**/*.spec.ts", "**/.spec.js"],
+      "excludedFiles": ["**/*.spec.ts", "**/.spec.js", "**/__tests__/**/*.ts"],
       "rules": {
-        "typesafe/no-await-without-trycatch": "warn"
+        "@typescript-eslint/no-non-null-assertion": "error"
       }
     }
   ],

diff --git a/.travis.yml b/.travis.yml
@@ -36,17 +36,16 @@ jobs:
           name: build
           paths: .
     - stage: Tests
-      name: Javascript tests
+      name: Frontend tests
       workspaces:
         use: build
       script:
-        - npm run test-backend-jasmine
         - npm run test-frontend
-    - name: Typescript tests
+    - name: Backend tests
       workspaces:
         use: build
       script:
-        - npm run test-backend-jest
+        - npm run test-backend
       after_success:
         - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
     - name: End-to-end tests

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,88 @@ 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.6.1](https://github.com/opengovsg/FormSG/compare/v5.6.0...v5.6.1)
+
+- test(AdminFormRoutes): test for equal start and end dates validation [`2d81ff4`](https://github.com/opengovsg/FormSG/commit/2d81ff4a4573a70a698596f5ac2ec1a4c5139b27)
+- fix: use Joi.date.min() instead of Joi.date.greater() for date range [`864561c`](https://github.com/opengovsg/FormSG/commit/864561c129bebd24cfd7dca2851106066141a780)
+
+#### [v5.6.0](https://github.com/opengovsg/FormSG/compare/v5.5.1...v5.6.0)
+
+> 13 April 2021
+
+- fix: call correct user update emergency contact endpoint [`#1631`](https://github.com/opengovsg/FormSG/pull/1631)
+- fix(deps): bump winston-cloudwatch from 2.5.1 to 2.5.2 [`#1626`](https://github.com/opengovsg/FormSG/pull/1626)
+- chore(deps-dev): bump @typescript-eslint/parser from 4.21.0 to 4.22.0 [`#1627`](https://github.com/opengovsg/FormSG/pull/1627)
+- chore(deps-dev): bump date-fns from 2.20.1 to 2.20.2 [`#1628`](https://github.com/opengovsg/FormSG/pull/1628)
+- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#1625`](https://github.com/opengovsg/FormSG/pull/1625)
+- chore(deps-dev): bump typescript from 4.1.5 to 4.2.4 [`#1624`](https://github.com/opengovsg/FormSG/pull/1624)
+- chore: disable no-await-without-trycatch in backend [`#1623`](https://github.com/opengovsg/FormSG/pull/1623)
+- refactor(admin-form/controller): changed if-else in admin-form controller into chains [`#1622`](https://github.com/opengovsg/FormSG/pull/1622)
+- test: fix flaky form feedback test [`#1620`](https://github.com/opengovsg/FormSG/pull/1620)
+- Test: publicform integration tests [`#1572`](https://github.com/opengovsg/FormSG/pull/1572)
+- refactor: Minor cleanup to avoid using res.locals [`#1621`](https://github.com/opengovsg/FormSG/pull/1621)
+- refactor(misc-api): duplicate misc endpoints to new /api/v3 router [`#1573`](https://github.com/opengovsg/FormSG/pull/1573)
+- chore: rearrange directory structure [`#1606`](https://github.com/opengovsg/FormSG/pull/1606)
+- chore: uninstall sinon and ts-mock-imports (forreal) [`#1611`](https://github.com/opengovsg/FormSG/pull/1611)
+- chore: merge release v5.5.1 back to develop [`#1612`](https://github.com/opengovsg/FormSG/pull/1612)
+- chore(deps-dev): bump @types/bcrypt from 3.0.0 to 3.0.1 [`#1619`](https://github.com/opengovsg/FormSG/pull/1619)
+- chore(deps-dev): bump eslint from 7.23.0 to 7.24.0 [`#1613`](https://github.com/opengovsg/FormSG/pull/1613)
+- fix(deps): bump web-streams-polyfill from 3.0.2 to 3.0.3 [`#1618`](https://github.com/opengovsg/FormSG/pull/1618)
+- fix(deps): bump aws-sdk from 2.883.0 to 2.884.0 [`#1615`](https://github.com/opengovsg/FormSG/pull/1615)
+- chore(deps-dev): bump date-fns from 2.20.0 to 2.20.1 [`#1617`](https://github.com/opengovsg/FormSG/pull/1617)
+- chore(deps-dev): bump eslint-plugin-jest from 24.3.4 to 24.3.5 [`#1616`](https://github.com/opengovsg/FormSG/pull/1616)
+- fix(deps): bump winston-cloudwatch from 2.5.0 to 2.5.1 [`#1614`](https://github.com/opengovsg/FormSG/pull/1614)
+- chore(deps-dev): bump date-fns from 2.19.0 to 2.20.0 [`#1607`](https://github.com/opengovsg/FormSG/pull/1607)
+- chore(deps-dev): bump core-js from 3.9.1 to 3.10.1 [`#1608`](https://github.com/opengovsg/FormSG/pull/1608)
+- chore(deps-dev): bump @babel/preset-env from 7.13.12 to 7.13.15 [`#1599`](https://github.com/opengovsg/FormSG/pull/1599)
+- fix(deps): bump aws-sdk from 2.882.0 to 2.883.0 [`#1609`](https://github.com/opengovsg/FormSG/pull/1609)
+- chore(deps-dev): bump @babel/plugin-transform-runtime [`#1602`](https://github.com/opengovsg/FormSG/pull/1602)
+- fix(deps): bump twilio from 3.59.0 to 3.60.0 [`#1601`](https://github.com/opengovsg/FormSG/pull/1601)
+- chore(deps-dev): bump @babel/core from 7.13.14 to 7.13.15 [`#1600`](https://github.com/opengovsg/FormSG/pull/1600)
+- test: fix flakiness (again) by hardcoding created dates [`#1604`](https://github.com/opengovsg/FormSG/pull/1604)
+- refactor: remove typecasts and non-null assertions [`#1596`](https://github.com/opengovsg/FormSG/pull/1596)
+- refactor: migrate public routes to TypeScript [`#1595`](https://github.com/opengovsg/FormSG/pull/1595)
+- refactor: convert Bounce module to use neverthrow [`#1591`](https://github.com/opengovsg/FormSG/pull/1591)
+- fix: clear current worker pool on download [`#1590`](https://github.com/opengovsg/FormSG/pull/1590)
+- feat: migrate EncryptSubmissionRouter to own router, remove unused forms.server.controller, remove jasmine [`#1592`](https://github.com/opengovsg/FormSG/pull/1592)
+- refactor: migrate frontend routes and google analytics factory to ts [`#1405`](https://github.com/opengovsg/FormSG/pull/1405)
+- refactor: update getPublicForm endpoint to typescript [`#1398`](https://github.com/opengovsg/FormSG/pull/1398)
+- refactor: collapse email preview submission middleware [`#1561`](https://github.com/opengovsg/FormSG/pull/1561)
+- refactor: collapse encrypt preview submission middleware [`#1554`](https://github.com/opengovsg/FormSG/pull/1554)
+- test: migrate logic.spec from javascript to typescript [`#1587`](https://github.com/opengovsg/FormSG/pull/1587)
+- test: migrate file-validation util tests to TypeScript [`#1578`](https://github.com/opengovsg/FormSG/pull/1578)
+- fix(deps): bump aws-sdk from 2.880.0 to 2.882.0 [`#1585`](https://github.com/opengovsg/FormSG/pull/1585)
+- chore(deps-dev): bump testcafe from 1.13.0 to 1.14.0 [`#1580`](https://github.com/opengovsg/FormSG/pull/1580)
+- fix: /adminform integration tests being flakey by loosening some checks [`#1584`](https://github.com/opengovsg/FormSG/pull/1584)
+- ref: migrate (most) /adminform endpoints to TypeScript, add integration tests [`#1567`](https://github.com/opengovsg/FormSG/pull/1567)
+- fix: convert bigint to string, not number to avoid losing fidelity [`#1577`](https://github.com/opengovsg/FormSG/pull/1577)
+- fix(test): use app import instead of dist import [`#1576`](https://github.com/opengovsg/FormSG/pull/1576)
+- refactor: migrate admin-console client service to ts [`#1531`](https://github.com/opengovsg/FormSG/pull/1531)
+- refactor: Refactor attachment upload into a service [`#1547`](https://github.com/opengovsg/FormSG/pull/1547)
+- refactor(user-api): duplicate user endpoints to new /api/v3 router [`#1553`](https://github.com/opengovsg/FormSG/pull/1553)
+- fix(deps): bump aws-sdk from 2.879.0 to 2.880.0 [`#1570`](https://github.com/opengovsg/FormSG/pull/1570)
+- fix(deps): bump libphonenumber-js from 1.9.14 to 1.9.16 [`#1569`](https://github.com/opengovsg/FormSG/pull/1569)
+- chore(deps-dev): bump concurrently from 6.0.0 to 6.0.1 [`#1568`](https://github.com/opengovsg/FormSG/pull/1568)
+- refactor(webhook-services): migrate webhook services to neverthrow [`#1529`](https://github.com/opengovsg/FormSG/pull/1529)
+- build: merge Release 5.5.0 into develop [`#1566`](https://github.com/opengovsg/FormSG/pull/1566)
+- [Snyk] Security upgrade mongoose from 5.11.10 to 5.12.3 [`#1538`](https://github.com/opengovsg/FormSG/pull/1538)
+- ref(auth-api): duplicate auth endpoints to new /api/v3 router [`#1551`](https://github.com/opengovsg/FormSG/pull/1551)
+- chore: add createReqMeta to verification module logging [`#1562`](https://github.com/opengovsg/FormSG/pull/1562)
+- chore(deps-dev): bump @typescript-eslint/parser from 4.20.0 to 4.21.0 [`#1558`](https://github.com/opengovsg/FormSG/pull/1558)
+- chore(deps-dev): bump ngrok from 4.0.0 to 4.0.1 [`#1560`](https://github.com/opengovsg/FormSG/pull/1560)
+- chore(deps-dev): bump eslint-plugin-jest from 24.3.3 to 24.3.4 [`#1559`](https://github.com/opengovsg/FormSG/pull/1559)
+- chore(deps-dev): bump @types/mongodb from 3.6.10 to 3.6.12 [`#1557`](https://github.com/opengovsg/FormSG/pull/1557)
+- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#1556`](https://github.com/opengovsg/FormSG/pull/1556)
+- fix(deps): bump @opengovsg/spcp-auth-client from 1.4.4 to 1.4.5 [`#1555`](https://github.com/opengovsg/FormSG/pull/1555)
+- refactor(corppass-ui): make ui changes for corppass [`#1533`](https://github.com/opengovsg/FormSG/pull/1533)
+- chore: bump version to v5.6.0 [`c4724a9`](https://github.com/opengovsg/FormSG/commit/c4724a9f64c6dd5cb134dd46ceae8ab6a736dbec)
+
 #### [v5.5.1](https://github.com/opengovsg/FormSG/compare/v5.5.0...v5.5.1)
 
+> 9 April 2021
+
 - refactor(corppass-ui): make ui changes for corppass [`#1533`](https://github.com/opengovsg/FormSG/pull/1533)
+- chore: bump version to v5.5.1 [`aca5c20`](https://github.com/opengovsg/FormSG/commit/aca5c20e2b3245163cdc9aa4fcc2d3e0df9a77f3)
 
 #### [v5.5.0](https://github.com/opengovsg/FormSG/compare/v5.4.0...v5.5.0)
 

diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
@@ -13,12 +13,9 @@ identities, and E-mail servers hosted in Government Data Centres.
 
 ## Backend
 
-FormSG is currently in the process of migrating its backend to TypeScript, so you will find
-a mixture of `.js` and `.ts` files in the backend.
-
-The backend for FormSG is bootstrapped using `src/server.ts` and `src/loaders`.
-It sets up express.js routes defined in `src/app/routes/*.(j|t)s`, with business logic
-defined in `src/app/controllers/*.(j|t)s` and mongoose models defined in `src/app/models/*.(j|t)s`.
+The backend for FormSG is bootstrapped using `src/server.ts` and `src/app/loaders`.
+It sets up express.js routes defined in `src/app/**/*.routes.ts`, with business logic
+defined in `src/app/**/*.controller.ts` and mongoose models defined in `src/app/**/*.model.ts`.
 
 ### Security