Merge pull request #8862 from opengovsg/release_v6.266.0

build: release v6.266.0

Author: scottheng96

CHANGELOG.md

@@ -4,8 +4,17 @@ 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.266.0](https://github.com/opengovsg/FormSG/compare/v6.265.0...v6.266.0)
+
+- feat: singpass with mrf first step [`#8729`](https://github.com/opengovsg/FormSG/pull/8729)
+- build: merge v6.265.0 back to develop [`#8861`](https://github.com/opengovsg/FormSG/pull/8861)
+- build: release v6.265.0 [`#8859`](https://github.com/opengovsg/FormSG/pull/8859)
+- build(deps): bump tar-fs from 2.1.3 to 2.1.4 in /frontend [`#8860`](https://github.com/opengovsg/FormSG/pull/8860)
+
 #### [v6.265.0](https://github.com/opengovsg/FormSG/compare/v6.264.0...v6.265.0)
 
+> 4 November 2025
+
 - fix(deps): bump playwright and @playwright/test [`#8827`](https://github.com/opengovsg/FormSG/pull/8827)
 - build(deps): bump tar-fs from 3.1.0 to 3.1.1 in /serverless/pdf-gen-sparticuz [`#8758`](https://github.com/opengovsg/FormSG/pull/8758)
 - fix(deps): bump validator from 13.15.15 to 13.15.20 in /shared [`#8840`](https://github.com/opengovsg/FormSG/pull/8840)
@@ -14,6 +23,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - feat: pinning pdf to generate from lambda [`#8858`](https://github.com/opengovsg/FormSG/pull/8858)
 - build: merge release v6.264.0 to develop [`#8855`](https://github.com/opengovsg/FormSG/pull/8855)
 - build: release v6.264.0 [`#8853`](https://github.com/opengovsg/FormSG/pull/8853)
+- chore: bump version to v6.265.0 [`b72e2ff`](https://github.com/opengovsg/FormSG/commit/b72e2ff92737a2663846972e41e2ccd6ae2ff063)
 
 #### [v6.264.0](https://github.com/opengovsg/FormSG/compare/v6.263.0...v6.264.0)
 

frontend/package-lock.json

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

frontend/package.json

@@ -244,7 +244,8 @@ export const MyInfoFieldPanel = ({ searchValue }: { searchValue: string }) => {
           </Box>
         )}
       </Droppable>
-      {user?.betaFlags?.children ? (
+      {user?.betaFlags?.children &&
+      form?.responseMode === FormResponseMode.Encrypt ? (
         <Droppable isDropDisabled droppableId={CREATE_MYINFO_CHILDREN_DROP_ID}>
           {(provided) => (
             <Box ref={provided.innerRef} {...provided.droppableProps}>
@@ -271,13 +272,9 @@ export const MyInfoFieldPanel = ({ searchValue }: { searchValue: string }) => {
   )
 }
 
-type MyInfoTextProps = Pick<
-  AdminFormDto,
-  'responseMode' | 'authType' | 'form_fields'
->
+type MyInfoTextProps = Pick<AdminFormDto, 'authType' | 'form_fields'>
 
 const MyInfoText = ({
-  responseMode,
   authType,
   form_fields,
 }: MyInfoTextProps): JSX.Element => {
@@ -288,12 +285,6 @@ const MyInfoText = ({
     [form_fields],
   )
 
-  if (responseMode === FormResponseMode.Multirespondent) {
-    return (
-      <Text>MyInfo fields are not available in multi-respondent forms.</Text>
-    )
-  }
-
   if (isMyInfoDisabled) {
     return (
       <Text>

frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/FieldListDrawer/field-panels/MyInfoPanel.tsx

@@ -159,7 +159,11 @@ export const EditStepBlock = ({
         isLoading={_isLoading}
       />
       <Divider />
-      <QuestionsBlock formMethods={formMethods} isLoading={_isLoading} />
+      <QuestionsBlock
+        formMethods={formMethods}
+        isLoading={_isLoading}
+        isFirstStep={isFirstStep}
+      />
       {!isFirstStep ? (
         <>
           <Divider />

frontend/src/features/admin-form/create/workflow/components/WorkflowContent/EditStepBlock/EditStepBlock.tsx

@@ -20,11 +20,13 @@ import { EditStepBlockContainer } from './EditStepBlockContainer'
 interface QuestionsBlockProps {
   isLoading: boolean
   formMethods: UseFormReturn<EditStepInputs>
+  isFirstStep: boolean
 }
 
 export const QuestionsBlock = ({
   isLoading,
   formMethods,
+  isFirstStep,
 }: QuestionsBlockProps): JSX.Element => {
   const { t } = useTranslation()
   const { formFields = [], idToFieldMap } = useAdminFormWorkflow()
@@ -34,11 +36,18 @@ export const QuestionsBlock = ({
   } = formMethods
 
   const items = formFields
-    .filter(
-      (f) =>
-        // Only retain actual inputs (exclude header, statement, image)
-        !NON_RESPONSE_FIELD_SET.has(f.fieldType),
-    )
+    .filter((f) => {
+      // Only retain actual inputs (exclude header, statement, image)
+      const isFillableField = !NON_RESPONSE_FIELD_SET.has(f.fieldType)
+      const isMyInfoField = 'myInfo' in f
+      if (!isFillableField) {
+        return false
+      }
+      if (isMyInfoField && !isFirstStep) {
+        return false
+      }
+      return true
+    })
     .map((f) => ({
       value: f._id,
       label: getLogicFieldLabel(idToFieldMap[f._id]),

frontend/src/features/admin-form/create/workflow/components/WorkflowContent/EditStepBlock/QuestionsBlock.tsx

@@ -110,6 +110,7 @@ export const getDecryptedSubmissionById = async ({
         encryptedContent: encryptedSubmission.encryptedContent,
         encryptedSubmissionSecretKey:
           encryptedSubmission.encryptedSubmissionSecretKey,
+        verifiedContent: encryptedSubmission.verifiedContent,
         version: encryptedSubmission.version,
       })
       if (!decryptedContent)

frontend/src/features/admin-form/responses/AdminSubmissionsService.ts

@@ -3,7 +3,6 @@ import {
   DecryptedContentV3,
   FormField as VerifiedFormField,
 } from '@opengovsg/formsg-sdk/dist/types'
-import { has } from 'lodash'
 
 import {
   AttachmentFieldResponseV3,
@@ -12,7 +11,6 @@ import {
   FormFieldDto,
 } from '~shared/types'
 import {
-  CURRENT_VERIFIED_FIELDS,
   SgidFieldTitle,
   SPCPFieldTitle,
   VerifiedKeys,
@@ -24,48 +22,57 @@ import {
 } from '~features/public-form/utils'
 
 /**
- * Returns a response matching the given type containing the given value.
- * @param type the field type to match
+ * Returns a verifiedFormField matching the given verifiedKey containing the given value.
+ * @param verifiedKey the field type to match
  * @param value the value to insert into the response to be returned
  * @returns the desired response object if type is valid. Else returns null.
  */
-const getResponseFromVerifiedField = (
-  type: VerifiedKeys,
+const getVerifiedFieldFromResponse = (
+  singpassAuthType: VerifiedKeys | string,
   value: string,
 ): VerifiedFormField | null => {
-  switch (type) {
+  // Extract verifiedKey and optional step number (for MRF cases) from singpassAuthType
+  const verifiedKeyMatch = singpassAuthType.match(
+    /^(uinFin|cpUen|cpUid|sgidUinFin)(?: \(Step (\d+)\))?$/,
+  )
+  if (!verifiedKeyMatch) return null
+
+  const [, verifiedKey, stepNumber] = verifiedKeyMatch
+  const stepSuffix = stepNumber ? ` (Step ${stepNumber})` : ''
+
+  switch (verifiedKey as VerifiedKeys) {
     case VerifiedKeys.SpUinFin:
       return {
-        question: SPCPFieldTitle.SpNric,
+        question: SPCPFieldTitle.SpNric + stepSuffix,
         fieldType: BasicField.Nric,
         answer: value,
-        // Just a unique identifier for CSV header uniqueness
-        _id: SPCPFieldTitle.SpNric,
+        _id: SPCPFieldTitle.SpNric + stepSuffix,
       }
 
     case VerifiedKeys.CpUen:
       return {
-        question: SPCPFieldTitle.CpUen,
+        question: SPCPFieldTitle.CpUen + stepSuffix,
         fieldType: BasicField.ShortText,
         answer: value,
-        _id: SPCPFieldTitle.CpUen,
+        _id: SPCPFieldTitle.CpUen + stepSuffix,
       }
 
     case VerifiedKeys.CpUid:
       return {
-        question: SPCPFieldTitle.CpUid,
+        question: SPCPFieldTitle.CpUid + stepSuffix,
         fieldType: BasicField.Nric,
         answer: value,
-        _id: SPCPFieldTitle.CpUid,
+        _id: SPCPFieldTitle.CpUid + stepSuffix,
       }
+
     case VerifiedKeys.SgidUinFin:
       return {
-        question: SgidFieldTitle.SgidNric,
+        question: SgidFieldTitle.SgidNric + stepSuffix,
         fieldType: 'nric',
         answer: value,
-        // Just a unique identifier for CSV header uniqueness
-        _id: SgidFieldTitle.SgidNric,
+        _id: SgidFieldTitle.SgidNric + stepSuffix,
       }
+
     default:
       return null
   }
@@ -82,15 +89,12 @@ const getResponseFromVerifiedField = (
 const convertToResponseArray = (
   verifiedObj: Record<string, string>,
 ): VerifiedFormField[] => {
-  return CURRENT_VERIFIED_FIELDS.filter((fieldType) =>
-    has(verifiedObj, fieldType),
-  )
-    .map((fieldType) =>
-      getResponseFromVerifiedField(fieldType, verifiedObj[fieldType]),
+  return Object.keys(verifiedObj)
+    .filter((key) =>
+      Object.values(VerifiedKeys).some((baseKey) => key.startsWith(baseKey)),
     )
-    .filter((field): field is VerifiedFormField => {
-      return !!field
-    })
+    .map((key) => getVerifiedFieldFromResponse(key, verifiedObj[key]))
+    .filter((field): field is VerifiedFormField => !!field)
 }
 
 /**
@@ -122,8 +126,7 @@ export const processDecryptedContentV3 = async (
   form_fields: FormFieldDto[],
   decrypted: DecryptedContentV3,
 ): Promise<VerifiedFormField[]> => {
-  const { responses } = decrypted
-
+  const { responses, verified } = decrypted
   // Convert decrypted content into displayable object.
   const displayedContent = form_fields
     .map((ff) => {
@@ -138,9 +141,17 @@ export const processDecryptedContentV3 = async (
           answer: answer.answer,
         }
       }
-      return transformInputsToOutputs(ff, response.answer)
-    })
-    .filter((output): output is FieldResponse => output !== null)
 
-  return displayedContent as VerifiedFormField[]
+      const decryptedResponse = transformInputsToOutputs(ff, response.answer)
+      if (decryptedResponse && 'myInfo' in ff) {
+        decryptedResponse.question = `[MyInfo] ${decryptedResponse.question} `
+      }
+      return decryptedResponse
+    })
+    .filter(
+      (output): output is FieldResponse => output !== null,
+    ) as VerifiedFormField[]
+  return verified
+    ? displayedContent.concat(convertToResponseArray(verified))
+    : displayedContent
 }

frontend/src/features/admin-form/responses/ResponsesPage/storage/utils/processDecryptedContent.ts

@@ -122,6 +122,7 @@ async function decryptIntoCsv(
             encryptedSubmissionSecretKey:
               submission.encryptedSubmissionSecretKey,
             encryptedContent: submission.encryptedContent,
+            verifiedContent: submission.verifiedContent,
             version: submission.version,
           })
           if (!decryptedObject) {

frontend/src/features/admin-form/responses/ResponsesPage/storage/worker/decryption.worker.ts

@@ -1,17 +1,21 @@
 import { FormResponseMode } from '~shared/types'
 
+import { useUser } from '~features/user/queries'
+
 import AuthSettingsSection from './components/AuthSettingsSection'
 import { AuthUnsupportedMsg } from './components/AuthSettingsSection/AuthUnsupportedMsg'
 import { CategoryHeader } from './components/CategoryHeader'
 import { useAdminFormSettings } from './queries'
 
 export const SettingsAuthPage = (): JSX.Element => {
   const { data: settings, isLoading } = useAdminFormSettings()
+  const { user } = useUser()
 
-  // Form auth is unsupported in MRF; show message.
+  // TODO: FRM-2151 remove when Singpass MRF is out of beta
   if (
     !isLoading &&
-    settings?.responseMode === FormResponseMode.Multirespondent
+    settings?.responseMode === FormResponseMode.Multirespondent &&
+    !user?.betaFlags?.singpassMrf
   ) {
     return <AuthUnsupportedMsg />
   }