Merge pull request #7315 from opengovsg/release-al2

build: merge v6.119.1 into develop
opengovsg · May 7, 2024 · 216f6a1 · 216f6a1
2 parents 03927ad + 0024d4f
commit 216f6a1
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,14 +4,22 @@ 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).
 
+#### [v6.119.1](https://github.com/opengovsg/FormSG/compare/v6.119.0...v6.119.1)
+
+- * fix(deps): bump zod from 3.23.4 to 3.23.5 in /shared (#7301) [`#7309`](https://github.com/opengovsg/FormSG/pull/7309)
+- fix: remove attachment integrity validation [`79408a9`](https://github.com/opengovsg/FormSG/commit/79408a9c845d39b9c4b583e34d2db587a65dc9ff)
+
 #### [v6.119.0](https://github.com/opengovsg/FormSG/compare/v6.118.0...v6.119.0)
 
+> 5 May 2024
+
 - build: merge release v6.118 to develop [`#7306`](https://github.com/opengovsg/FormSG/pull/7306)
 - fix(mrf): attachment v2 [`#7281`](https://github.com/opengovsg/FormSG/pull/7281)
 - fix(deps): bump ejs from 3.1.8 to 3.1.10 [`#7304`](https://github.com/opengovsg/FormSG/pull/7304)
 - fix(deps): bump type-fest from 4.18.0 to 4.18.1 in /shared [`#7303`](https://github.com/opengovsg/FormSG/pull/7303)
 - fix(deps): bump zod from 3.23.4 to 3.23.5 in /shared [`#7301`](https://github.com/opengovsg/FormSG/pull/7301)
 - chore: bump version to v6.118.0 [`#7300`](https://github.com/opengovsg/FormSG/pull/7300)
+- chore: bump version to v6.119.0 [`91a38bf`](https://github.com/opengovsg/FormSG/commit/91a38bf30c4b91f764a7f33e1c3721a8329bb5cf)
 
 #### [v6.118.0](https://github.com/opengovsg/FormSG/compare/v6.117.0...v6.118.0)
 
@@ -57,7 +65,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore: reverting package-lock changes [`040b962`](https://github.com/opengovsg/FormSG/commit/040b96284ea317de22d9de6cf872fd4116f24c51)
 - chore: bump version to v6.117.0 [`6eb4aca`](https://github.com/opengovsg/FormSG/commit/6eb4aca28514e3286c23c0834f9962de291a7fbc)
 
-#### [v6.116.0](https://github.com/opengovsg/FormSG/compare/v6.115.1...v6.116.0)
+#### [v6.116.0](https://github.com/opengovsg/FormSG/compare/v6.115.0...v6.116.0)
 
 > 8 April 2024
 
@@ -68,17 +76,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(mrf): webhook be validation [`#7247`](https://github.com/opengovsg/FormSG/pull/7247)
 - chore: move react-dev-inspector to frontend/package.json [`#7245`](https://github.com/opengovsg/FormSG/pull/7245)
 - refactor: add exhaustive checks, use answerArray for arrays [`#7244`](https://github.com/opengovsg/FormSG/pull/7244)
+- * chore(deps-dev): bump @types/express from 4.17.17 to 4.17.21 (#7233) [`#7241`](https://github.com/opengovsg/FormSG/pull/7241)
 - fix(deps): bump type-fest from 4.14.0 to 4.15.0 in /shared [`#7243`](https://github.com/opengovsg/FormSG/pull/7243)
 - chore: bump version to v6.116.0 [`31e1a33`](https://github.com/opengovsg/FormSG/commit/31e1a33c96d76b69c492f5212bc48a3dabe054af)
 
-#### [v6.115.1](https://github.com/opengovsg/FormSG/compare/v6.115.0...v6.115.1)
-
-> 5 April 2024
-
-- * chore(deps-dev): bump @types/express from 4.17.17 to 4.17.21 (#7233) [`#7241`](https://github.com/opengovsg/FormSG/pull/7241)
-- fix: add check to block webhooks updates on mrf [`71ab0c5`](https://github.com/opengovsg/FormSG/commit/71ab0c592c15de5fddbffc9970a424af7a31d4ab)
-- chore: bump version to 6.115.1 [`7d127b2`](https://github.com/opengovsg/FormSG/commit/7d127b2e8353a8a282acabe1c309cefb1e750f9c)
-
 #### [v6.115.0](https://github.com/opengovsg/FormSG/compare/v6.114.1...v6.115.0)
 
 > 3 April 2024

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.119.0",
+  "version": "6.119.1",
   "homepage": ".",
   "private": true,
   "dependencies": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "6.119.0",
+  "version": "6.119.1",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <formsg@data.gov.sg>"

diff --git a/...pp/modules/submission/multirespondent-submission/multirespondent-submission.middleware.ts b/...pp/modules/submission/multirespondent-submission/multirespondent-submission.middleware.ts
@@ -457,15 +457,16 @@ export const validateMultirespondentSubmission = async (
                     const incomingResField = req.body.responses[fieldId]
                     const prevResField = previousResponses[fieldId]
 
+                    // TODO(FRM-1724): Reenable this validation.
                     if (prevResField.fieldType === BasicField.Attachment) {
-                      prevResField.answer.content = Buffer.from(
-                        /**
-                         * JSON.parse(JSON.stringify(fooBuffer)) does not fully reconstruct the Buffer object
-                         * it gets parsed as { type: 'Buffer', data: number[] } instead of the original Buffer object
-                         */
-                        // @ts-expect-error data does not exist on Buffer
-                        prevResField.answer.content.data,
-                      )
+                      // prevResField.answer.content = Buffer.from(
+                      //   /**
+                      //    * JSON.parse(JSON.stringify(fooBuffer)) does not fully reconstruct the Buffer object
+                      //    * it gets parsed as { type: 'Buffer', data: number[] } instead of the original Buffer object
+                      //    */
+                      //   // @ts-expect-error data does not exist on Buffer
+                      //   prevResField.answer.content.data,
+                      // )
                     }
 
                     const resp = isFieldResponseV3Equal(

diff --git a/src/app/utils/response-v3.ts b/src/app/utils/response-v3.ts
@@ -1,8 +1,6 @@
-import crypto from 'crypto'
 import _ from 'lodash'
 
 import { BasicField, FieldResponseV3 } from '../../../shared/types'
-import { ParsedClearAttachmentResponseV3 } from '../../types/api'
 
 export const isFieldResponseV3Equal = (
   l: FieldResponseV3,
@@ -31,6 +29,9 @@ export const isFieldResponseV3Equal = (
     case BasicField.Children:
       return _.isEqual(l.answer, r.answer)
     case BasicField.Attachment: {
+      return true
+      // TODO(FRM-1724): Re-enable this validation
+      /**
       const lAnswer = l.answer as ParsedClearAttachmentResponseV3['answer']
       const rAnswer = r.answer as ParsedClearAttachmentResponseV3['answer']
 
@@ -47,6 +48,7 @@ export const isFieldResponseV3Equal = (
       return (
         lMd5.equals(rMd5) && l.answer.hasBeenScanned === rAnswer.hasBeenScanned
       )
+      */
     }
     case BasicField.Section:
       return true