build: release v6.255.0 (#8796)

* Merge pull request #8793 from opengovsg/fix/chromatic-ignore-url-diff

fix: ignore url line in printable response

* Merge pull request #8794 from opengovsg/fix/empty-tooltip-bug

fix: hide empty tooltip for main save draft button

* feat: signatures v1.4 (webhooks) (#8782)

* add encryptedWebhookContent to req.formsg

* generate separate encrypted webhook content

* pass encryptedWebhookContent through to postsubmission actions and substitute it for encryptedContent before firing webhook

* standardize constants in encrypt mode

* included webhookresponsev3 for signatures, and separated webhook encryption for mrf

* added encryptedSubmissionSecretKey to mrf webhook payload

* add encryptedSubmissionSecretKey to webhookdata payload

* added signature webhook conversion to string in MRF create and update actions

* moved spy function to outside test

* added submission object to postSubmission functions

* refactored encrypt submission service spec

* added webhook tests for MRF submissions

* resolved webhook firing for subsequent steps test

* changes from PR comments, added more verbose logging

* added tests for v3 prepareWebhookContent util function

* updated tests

* fixed backend lint

* resolved failing tests

* feat: add tc for middleware

* fire webhook in encrypt only if encryptedWebhookContent exists

* feat: add tc to cover webhook not fired for undefined encrypted wh content

---------

Co-authored-by: Kevin Foong <[email protected]>

* chore: bump version to v6.255.0

---------

Co-authored-by: scottheng96 <[email protected]>

Author: kevin9foong

CHANGELOG.md

@@ -4,11 +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.255.0](https://github.com/opengovsg/FormSG/compare/v6.254.0...v6.255.0)
+
+- feat: signatures v1.4 (webhooks) [`#8782`](https://github.com/opengovsg/FormSG/pull/8782)
+- fix: hide empty tooltip for main save draft button [`#8794`](https://github.com/opengovsg/FormSG/pull/8794)
+- build: merge release v6.254.0 to develop [`#8792`](https://github.com/opengovsg/FormSG/pull/8792)
+- fix: ignore url line in printable response [`#8793`](https://github.com/opengovsg/FormSG/pull/8793)
+- build: release v6.254.0 [`#8791`](https://github.com/opengovsg/FormSG/pull/8791)
+
 #### [v6.254.0](https://github.com/opengovsg/FormSG/compare/v6.253.0...v6.254.0)
 
+> 6 October 2025
+
 - feat: create local pdf print version of results page [`#8700`](https://github.com/opengovsg/FormSG/pull/8700)
 - build: merge release v6.253.0 to develop [`#8788`](https://github.com/opengovsg/FormSG/pull/8788)
 - build: release v6.253.0 [`#8787`](https://github.com/opengovsg/FormSG/pull/8787)
+- chore: bump version to v6.254.0 [`c66e690`](https://github.com/opengovsg/FormSG/commit/c66e69075eb62bf1c2227f8610c8c9c5f428a834)
 
 #### [v6.253.0](https://github.com/opengovsg/FormSG/compare/v6.252.0...v6.253.0)
 

frontend/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.254.0",
+  "version": "6.255.0",
   "homepage": ".",
   "type": "module",
   "private": true,

frontend/package.json

@@ -1,5 +1,5 @@
 import { forwardRef } from 'react'
-import { Box, Center, Text } from '@chakra-ui/react'
+import { Box, Text } from '@chakra-ui/react'
 import { FieldType } from '@opengovsg/formsg-sdk/dist/types'
 
 import { BasicField } from '~shared/types/field'
@@ -166,9 +166,9 @@ export const PrintableResponse = ({
           color="white"
           textDecor="underline"
           textDecorationColor="white"
+          data-chromatic="ignore"
         >
-          <span data-chromatic="ignore">{window.location.origin}</span>
-          <span>{`/${formId}`}</span>
+          {window.location.origin}/{formId}
         </Text>
       </Box>
       <Box mx="5%" my="30px">

frontend/src/features/admin-form/responses/IndividualResponsePage/PrintableResponse.tsx

@@ -41,6 +41,7 @@ const PublicFormSaveDraftButton = (props: ButtonProps) => {
   return (
     <Tooltip
       placement="top"
+      isDisabled={!tooltipLabel}
       label={<Text data-chromatic="ignore">{tooltipLabel}</Text>}
     >
       <Button variant="outline" onClick={onSaveDraft} {...props}>

frontend/src/features/public-form/components/FormFields/PublicFormSubmitButton.tsx

@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "6.254.0",
+  "version": "6.255.0",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <[email protected]>"

package-lock.json

@@ -144,3 +144,8 @@ export type SignatureFieldResponseV3 = {
   type: 'draw'
   value: SignatureVectorArray
 }
+
+export type SignatureFieldWebhookResponseV3 = {
+  fieldType: BasicField.Signature
+  answer: string[]
+}

package.json

@@ -592,6 +592,7 @@ MultirespondentSubmissionSchema.methods.getWebhookView = async function (
     formId,
     submissionId: String(this._id),
     encryptedContent: this.encryptedContent,
+    encryptedSubmissionSecretKey: this.encryptedSubmissionSecretKey,
     verifiedContent: '',
     version: this.version,
     created: this.created,

shared/types/response-v3.ts

@@ -0,0 +1,159 @@
+import { ObjectId } from 'bson'
+
+import { BasicField } from '../../../../../../shared/types'
+import formsgSdk from '../../../../config/formsg-sdk'
+import { getEncryptedAttachmentsMapFromAttachmentsMap } from '../../submission.utils'
+import { encryptSubmission } from '../encrypt-submission.middleware'
+import { prepareWebhookResponseContent } from '../encrypt-submission.utils'
+
+jest.mock('../encrypt-submission.utils', () => ({
+  ...jest.requireActual('../encrypt-submission.utils'),
+  prepareWebhookResponseContent: jest.fn(),
+}))
+jest.mock('../../../../config/formsg-sdk')
+jest.mock('../../submission.utils')
+
+describe('encryptSubmission', () => {
+  const MOCK_FORM_ID = new ObjectId().toHexString()
+  const MOCK_PUBLIC_KEY = 'mock-public-key'
+  const MOCK_ENCRYPTED_WEBHOOK_CONTENT = 'mock-encrypted-webhook-content'
+  const MOCK_WEBHOOK_RESPONSES: ReturnType<
+    typeof prepareWebhookResponseContent
+  > = [
+    {
+      fieldType: BasicField.ShortText,
+      answer: 'test answer',
+      _id: 'field1',
+      question: 'Test Question 1',
+    },
+    {
+      fieldType: BasicField.Email,
+      answer: '[email protected]',
+      _id: 'field2',
+      question: 'Test Question 2',
+    },
+  ]
+
+  const MOCK_ENCRYPTED_FORM_DEF = {
+    _id: MOCK_FORM_ID,
+    publicKey: MOCK_PUBLIC_KEY,
+    title: 'Test Form',
+  }
+
+  const MOCK_RESPONSES = [
+    {
+      fieldType: BasicField.ShortText,
+      answer: 'test answer',
+      _id: 'field1',
+      question: 'Test Question 1',
+      isVisible: true,
+    },
+    {
+      fieldType: BasicField.Email,
+      answer: '[email protected]',
+      _id: 'field2',
+      question: 'Test Question 2',
+      isVisible: true,
+    },
+  ]
+
+  const MOCK_STRIPPED_BODY_RESPONSES = [
+    {
+      fieldType: BasicField.ShortText,
+      answer: 'test answer',
+      _id: 'field1',
+      question: 'Test Question 1',
+      // isVisible property should be removed by omitResponseKeys
+    },
+    {
+      fieldType: BasicField.Email,
+      answer: '[email protected]',
+      _id: 'field2',
+      question: 'Test Question 2',
+      // isVisible property should be removed by omitResponseKeys
+    },
+  ]
+
+  const createMockReq = (params: { formId: string }) =>
+    ({
+      params,
+      body: {
+        responses: MOCK_RESPONSES,
+        version: 1,
+      },
+      formsg: {
+        encryptedFormDef: MOCK_ENCRYPTED_FORM_DEF,
+      },
+      get: jest.fn((name: string) => {
+        if (name === 'cf-connecting-ip') return '127.0.0.1'
+        if (name === 'cf-ray') return 'mock-cf-ray'
+        return undefined
+      }),
+      ip: '127.0.0.1',
+      id: 'mock-request-id',
+      headers: {
+        'cf-connecting-ip': '127.0.0.1',
+        'cf-ray': 'mock-cf-ray',
+        'x-request-id': 'mock-request-id',
+      },
+      baseUrl: '/api/v3',
+      path: '/forms/mock-form-id/submissions',
+      originalUrl: '/api/v3/forms/mock-form-id/submissions?param=value',
+    }) as any
+
+  const createMockRes = () => ({
+    status: jest.fn().mockReturnThis(),
+    json: jest.fn().mockReturnThis(),
+    send: jest.fn().mockReturnThis(),
+  })
+
+  const mockNext = jest.fn()
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+    jest.resetAllMocks()
+
+    // Mock formsgSdk.crypto.encrypt
+    jest
+      .mocked(formsgSdk.crypto.encrypt)
+      .mockReturnValue(MOCK_ENCRYPTED_WEBHOOK_CONTENT)
+
+    // Mock prepareWebhookResponseContent
+    jest
+      .mocked(prepareWebhookResponseContent)
+      .mockReturnValue(MOCK_WEBHOOK_RESPONSES)
+
+    // Mock getEncryptedAttachmentsMapFromAttachmentsMap
+    jest
+      .mocked(getEncryptedAttachmentsMapFromAttachmentsMap)
+      .mockResolvedValue({})
+  })
+
+  it('should include encryptedWebhookContent in req.formsg', async () => {
+    const mockReq = createMockReq({
+      formId: MOCK_FORM_ID,
+    })
+    const mockRes = createMockRes()
+
+    // Act
+    await encryptSubmission(mockReq, mockRes as any, mockNext)
+
+    // Assert
+    expect(mockNext).toHaveBeenCalled()
+    expect(mockReq.formsg).toHaveProperty('encryptedWebhookContent')
+    expect(mockReq.formsg.encryptedWebhookContent).toBe(
+      MOCK_ENCRYPTED_WEBHOOK_CONTENT,
+    )
+
+    // Verify that prepareWebhookResponseContent was called with correct parameters
+    expect(prepareWebhookResponseContent).toHaveBeenCalledWith(
+      MOCK_STRIPPED_BODY_RESPONSES,
+    )
+
+    // Verify that formsgSdk.crypto.encrypt was called with correct parameters
+    expect(formsgSdk.crypto.encrypt).toHaveBeenCalledWith(
+      MOCK_WEBHOOK_RESPONSES,
+      MOCK_PUBLIC_KEY,
+    )
+  })
+})