Merge pull request #2119 from opengovsg/release-1.73

Release 1.73
opengovsg · Dec 6, 2022 · abbb2b9 · abbb2b9
2 parents 1b71788 + 9d50d4e
commit abbb2b9
Show file tree

Hide file tree

Showing 91 changed files with 4,464 additions and 545 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -51,5 +51,15 @@
         "extensions": [".jsx", ".js", ".tsx", ".ts", ".scss", ".css", ".png", ".svg"]
       }
     }
-  }
+  },
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {
+          // Disabling `no-undef` lint rule in favor of Typescript checking
+          // https://github.com/typescript-eslint/typescript-eslint/blob/main/docs/linting/TROUBLESHOOTING.md#i-get-errors-from-the-no-undef-rule-about-global-variables-not-being-defined-even-though-there-are-no-typescript-errors
+          "no-undef": "off"
+      }
+    }
+  ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,21 @@ 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).
 
+#### [v1.73.0](https://github.com/opengovsg/GoGovSG/compare/v1.72.0...v1.73.0)
+
+- chore: fix links for health and edu [`#2122`](https://github.com/opengovsg/GoGovSG/pull/2122)
+- feat: improve validations and errors for shortUrl and longUrl [`#2100`](https://github.com/opengovsg/GoGovSG/pull/2100)
+- chore: change default session cookie max age to 1 day [`#2086`](https://github.com/opengovsg/GoGovSG/pull/2086)
+- build(deps): bump decode-uri-component from 0.2.0 to 0.2.2 [`#2115`](https://github.com/opengovsg/GoGovSG/pull/2115)
+- Feat/bulk/all [`#2020`](https://github.com/opengovsg/GoGovSG/pull/2020)
+- chore(datadog): add metric for generating API keys [`#2105`](https://github.com/opengovsg/GoGovSG/pull/2105)
+- chore: update homepage cta and header [`#2113`](https://github.com/opengovsg/GoGovSG/pull/2113)
+- build: fix localstack version in docker-compose to 1.2 [`#2112`](https://github.com/opengovsg/GoGovSG/pull/2112)
+
 #### [v1.72.0](https://github.com/opengovsg/GoGovSG/compare/v1.71.0...v1.72.0)
 
+> 25 November 2022
+
 - fix: updated api-doc urls [`#2094`](https://github.com/opengovsg/GoGovSG/pull/2094)
 - fix: disallow updating files for links and links for files [`#2084`](https://github.com/opengovsg/GoGovSG/pull/2084)
 - feat(api): amend header spacing on api integration page [`#2088`](https://github.com/opengovsg/GoGovSG/pull/2088)
@@ -26,11 +39,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(tagging): fix filtering for no results when searching by tags [`#2068`](https://github.com/opengovsg/GoGovSG/pull/2068)
 - [develop] Release 1.71.0 [`#2066`](https://github.com/opengovsg/GoGovSG/pull/2066)
 - Feat/apikey auth [`#2017`](https://github.com/opengovsg/GoGovSG/pull/2017)
-
-#### [v1.71.0](https://github.com/opengovsg/GoGovSG/compare/v1.70.0...v1.71.0)
-
-> 3 November 2022
-
 - feat: add announcement modal image for gov [`#2059`](https://github.com/opengovsg/GoGovSG/pull/2059)
 - chore: paginate directory search [`#2061`](https://github.com/opengovsg/GoGovSG/pull/2061)
 - build(deps): bump bcrypt from 5.0.1 to 5.1.0 [`#2056`](https://github.com/opengovsg/GoGovSG/pull/2056)
@@ -55,6 +63,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore(load-testing): add k6 script for load testing [`#1998`](https://github.com/opengovsg/GoGovSG/pull/1998)
 - feat: backend/bulk tags [`#2016`](https://github.com/opengovsg/GoGovSG/pull/2016)
 - fix(tagging): escape searching by tags with underscores [`#1999`](https://github.com/opengovsg/GoGovSG/pull/1999)
+
+#### [v1.71.0](https://github.com/opengovsg/GoGovSG/compare/v1.70.0...v1.71.0)
+
+> 6 October 2022
+
 - fix: host name display out of alignment with graphic [`#1977`](https://github.com/opengovsg/GoGovSG/pull/1977)
 - fix(tagging): serialize single tags for file uploads [`#1990`](https://github.com/opengovsg/GoGovSG/pull/1990)
 - fix: wrap backend errors in json messages [`#1991`](https://github.com/opengovsg/GoGovSG/pull/1991)
@@ -82,12 +95,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 > 4 October 2022
 
 - feat: bulk backend functionality [`#2006`](https://github.com/opengovsg/GoGovSG/pull/2006)
+- 1.69.0 [`#1969`](https://github.com/opengovsg/GoGovSG/pull/1969)
 
 #### [v1.69.0](https://github.com/opengovsg/GoGovSG/compare/v1.68.0...v1.69.0)
 
 > 15 September 2022
 
-- 1.69.0 [`#1969`](https://github.com/opengovsg/GoGovSG/pull/1969)
 - Feat/e2e/directory page test [`#1963`](https://github.com/opengovsg/GoGovSG/pull/1963)
 - feat(datadog): add metrics and set RUM user [`#1937`](https://github.com/opengovsg/GoGovSG/pull/1937)
 - fix: package.json & package-lock.json to reduce vulnerabilities [`#1893`](https://github.com/opengovsg/GoGovSG/pull/1893)
@@ -181,7 +194,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore: add transactional lock on CREATE OR REPLACE function [`#1831`](https://github.com/opengovsg/GoGovSG/pull/1831)
 - [develop] Release 1.62.0 [`#1825`](https://github.com/opengovsg/GoGovSG/pull/1825)
 
-#### [v1.62.0](https://github.com/opengovsg/GoGovSG/compare/v1.61.0...v1.62.0)
+#### [v1.62.0](https://github.com/opengovsg/GoGovSG/compare/v1.60.0...v1.62.0)
 
 > 28 April 2022
 
@@ -190,22 +203,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix: package.json & package-lock.json to reduce vulnerabilities [`#1822`](https://github.com/opengovsg/GoGovSG/pull/1822)
 - chore: add health cicd [`#1799`](https://github.com/opengovsg/GoGovSG/pull/1799)
 - [develop] Release 1.61.0 [`#1814`](https://github.com/opengovsg/GoGovSG/pull/1814)
-- feat: copy assets from edu for health as placeholders [`0417c15`](https://github.com/opengovsg/GoGovSG/commit/0417c15e5ed5fae03262f40d237ac2bcb2410898)
-- chore: add health asset variant [`87573bc`](https://github.com/opengovsg/GoGovSG/commit/87573bcc287e21b2d80efc9e445a97a89383e0e5)
-- feat: convert webpack config to ts, use SSOT for asset-variant [`3d5d953`](https://github.com/opengovsg/GoGovSG/commit/3d5d95376b23ea0be9e5890add9c43425bf2f808)
-
-#### [v1.61.0](https://github.com/opengovsg/GoGovSG/compare/v1.60.0...v1.61.0)
-
-> 13 April 2022
-
 - chore(deps): bump nanoid to v3 [`#1807`](https://github.com/opengovsg/GoGovSG/pull/1807)
 - build(deps): bump redux-thunk from 2.3.0 to 2.4.1 [`#1808`](https://github.com/opengovsg/GoGovSG/pull/1808)
 - Chore/ci cleanup [`#1792`](https://github.com/opengovsg/GoGovSG/pull/1792)
 - fix/url history defaults [`#1800`](https://github.com/opengovsg/GoGovSG/pull/1800)
 - fix: package.json & package-lock.json to reduce vulnerabilities [`#1802`](https://github.com/opengovsg/GoGovSG/pull/1802)
 - [develop] Release 1.60.0 [`#1797`](https://github.com/opengovsg/GoGovSG/pull/1797)
-- chore(deps): bump nanoid to 3.3.2 [`e6945eb`](https://github.com/opengovsg/GoGovSG/commit/e6945eb0587db0a87569c5a69cb9b5c5bb564b5e)
-- fix(nanoid): use new customAlphabet api [`805f30e`](https://github.com/opengovsg/GoGovSG/commit/805f30e32fc0dfe7e79c74d0aa96f0307d9e5dfb)
+- feat: copy assets from edu for health as placeholders [`0417c15`](https://github.com/opengovsg/GoGovSG/commit/0417c15e5ed5fae03262f40d237ac2bcb2410898)
+- chore: add health asset variant [`87573bc`](https://github.com/opengovsg/GoGovSG/commit/87573bcc287e21b2d80efc9e445a97a89383e0e5)
+- feat: convert webpack config to ts, use SSOT for asset-variant [`3d5d953`](https://github.com/opengovsg/GoGovSG/commit/3d5d95376b23ea0be9e5890add9c43425bf2f808)
 
 #### [v1.60.0](https://github.com/opengovsg/GoGovSG/compare/v1.59.0...v1.60.0)
 

diff --git a/Dockerfile.maildev-logging b/Dockerfile.maildev-logging
@@ -1,3 +1,3 @@
 FROM maildev/maildev:1.1.0
 WORKDIR /usr/src/app
-RUN echo "maildev.on('new', ({ html }) => console.log('Login OTP: ' + html.match(/\d{6}/)[0]))" >> bin/maildev
+RUN echo "maildev.on('new', ({ html }) => { if(html.includes('OTP')) { console.log('Login OTP: ' + html.match(/\d{6}/)[0]) } else { console.log(html) } } )" >> bin/maildev
diff --git a/README.md b/README.md
@@ -130,12 +130,21 @@ After these have been set up, set the environment variables according to the tab
 |SAFE_BROWSING_KEY|No|API key for access to Google Safe Browsing.|
 |SAFE_BROWSING_LOG_ONLY|No|Boolean, whether to log only, or throw error if unsafe link is found by Google SafeBrowsing. Defaults to false|
 |ASSET_VARIANT|Yes|Asset variant specifying environment for deployment, one of `gov`, `edu`, `health`|
-|COOKIE_MAX_AGE|Yes|Session duration of cookie|
+|COOKIE_MAX_AGE|No|Session duration of cookie in milliseconds. Defaults to 86400000 (1 day)|
 |BULK_UPLOAD_MAX_NUM|No|Maximum number of links that can be bulk uploaded at once. Defaults to 1000|
 |BULK_UPLOAD_RANDOM_STR_LENGTH|No|String length of randomly generated shortUrl in bulk upload. Defaults to 8|
-|API_LINK_RANDOM_STR_LENGTH|No|String length of randomly generated shortUrl in API created links. Defaults to 8|
+|BULK_QR_CODE_BATCH_SIZE|No|Maximum batch size of QR codes to generate in a single Lambda run. Defaults to 1000|
+|BULK_QR_CODE_BUCKET_URL|No|Link to download QR codes from|
+|ACTIVATE_BULK_QR_CODE_GENERATION|No|Whether to start Lambda for bulk QR code generation or not. Defaults to false|
 |REPLICA_URI|Yes|The postgres connection string, e.g. `postgres://postgres:postgres@postgres:5432/postgres`|
+|SQS_BULK_QRCODE_GENERATE_START_URL|No|The SQS queue for starting QR code bulk generation Lambda|
+|SQS_TIMEOUT|No|Duration of time in ms for sending to SQS queue before timeout. Defaults to 10000ms (10s)|
+|SQS_REGION|No|AWS Region of SQS queue for starting QR code bulk generation Lambda|
+|JOB_POLL_ATTEMPTS|No|Number of attempts for long polling of job status before timeout of 408 is returned. Defaults to 12|
+|JOB_POLL_INTERVAL|No|Interval of time between attempts for long polling of job status in ms. Defaults to 5000ms (5s)|
+|API_LINK_RANDOM_STR_LENGTH|No|String length of randomly generated shortUrl in API created links. Defaults to 8|
 |FF_EXTERNAL_API|No|Boolean, feature flag for enabling the external API. Defaults to false|
+|ADMIN_API_EMAIL|No|Email with admin API access. Defaults to none.|
 
 #### Serverless functions for link migration
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,6 +30,7 @@ services:
       - GA_TRACKING_ID=UA-139330318-1
       - OG_URL=https://go.gov.sg
       - VALID_EMAIL_GLOB_EXPRESSION=*.gov.sg
+      - COOKIE_MAX_AGE=86400000
       - LOGIN_MESSAGE=Your OTP might take awhile to get to you.
       - USER_MESSAGE=User message test
       - ANNOUNCEMENT_MESSAGE=Search by email to find link owners, or by keyword to discover other links! \n PRO TIP! Search your email domain to find out all the links made by your agency.
@@ -52,9 +53,18 @@ services:
       - ACTIVATE_POSTMAN_FALLBACK=
       - BULK_UPLOAD_MAX_NUM=1000
       - BULK_UPLOAD_RANDOM_STR_LENGTH=8
+      - SQS_BULK_QRCODE_GENERATE_START_URL=
+      - SQS_TIMEOUT=10000
+      - SQS_REGION=
+      - BULK_QR_CODE_BATCH_SIZE=1000
+      - ACTIVATE_BULK_QR_CODE_GENERATION=false
+      - JOB_POLL_ATTEMPTS=12
+      - JOB_POLL_INTERVAL=5000
+      - BULK_QR_CODE_BUCKET_URL=
       - API_LINK_RANDOM_STR_LENGTH=8
       - API_KEY_SALT=$$2b$$10$$9rBKuE4Gb5ravnvP4xjoPu
       - FF_EXTERNAL_API=true
+      - ADMIN_API_EMAIL=
     volumes:
       - ./public:/usr/src/gogovsg/public
       - ./src:/usr/src/gogovsg/src
@@ -73,7 +83,7 @@ services:
     ports:
       - '6379:6379'
   localstack:
-    image: localstack/localstack:latest
+    image: localstack/localstack:1.2
     container_name: gogovsg-localstack
     ports:
       - '4566:4566'