Merge branch 'develop' into hack/eliminate-data

CHANGELOG.md

@@ -4,12 +4,41 @@ 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.89.2](https://github.com/opengovsg/FormSG/compare/v6.89.0...v6.89.2)
+
+- fix: hotfix v6.89.1 for proper error handling in encrypt-submission middleware [`#6903`](https://github.com/opengovsg/FormSG/pull/6903)
+- build: release v6.89.0 [`#6898`](https://github.com/opengovsg/FormSG/pull/6898)
+- fix: remove myinfo child from storage mode [`#6901`](https://github.com/opengovsg/FormSG/pull/6901)
+- fix: add learn more link [`#6897`](https://github.com/opengovsg/FormSG/pull/6897)
+- chore: security upgrade axios to 1.6.2 [`#6893`](https://github.com/opengovsg/FormSG/pull/6893)
+- chore: revert commit 6869 [`efab3cf`](https://github.com/opengovsg/FormSG/commit/efab3cf844113573d758b1b2c57147d5d0656a28)
+- chore: bump version to v6.89.0 [`1665a48`](https://github.com/opengovsg/FormSG/commit/1665a48b0ff133378c7126d3fedf8f1145f67111)
+- fix: remove error block [`fb415fc`](https://github.com/opengovsg/FormSG/commit/fb415fcd7189a90056557c242ed98f1dc10e757e)
+
+#### [v6.89.0](https://github.com/opengovsg/FormSG/compare/v6.88.0...v6.89.0)
+
+> 15 November 2023
+
+- feat: myinfo for storage-mode [`#6870`](https://github.com/opengovsg/FormSG/pull/6870)
+- feat: announcement modal and what's new for myinfo storage-mode [`#6892`](https://github.com/opengovsg/FormSG/pull/6892)
+- chore: remove eb shift frontend feature flags [`#6869`](https://github.com/opengovsg/FormSG/pull/6869)
+- chore(deps-dev): bump @types/lodash from 4.14.200 to 4.14.201 in /shared [`#6888`](https://github.com/opengovsg/FormSG/pull/6888)
+- chore(deps): bump axios from 1.2.1 to 1.6.0 in /frontend [`#6887`](https://github.com/opengovsg/FormSG/pull/6887)
+- fix(deps): bump axios from 1.2.1 to 1.6.0 [`#6886`](https://github.com/opengovsg/FormSG/pull/6886)
+- fix(deps): bump type-fest from 4.5.0 to 4.7.1 in /shared [`#6883`](https://github.com/opengovsg/FormSG/pull/6883)
+- build: merge release 6.88.0 into develop  [`#6882`](https://github.com/opengovsg/FormSG/pull/6882)
+- build: release v6.88.0 [`#6881`](https://github.com/opengovsg/FormSG/pull/6881)
+- chore: bump version to v6.89.0 [`3a15ceb`](https://github.com/opengovsg/FormSG/commit/3a15ceb52806aae4a0aaa91c0e2c49d4bcae8606)
+
 #### [v6.88.0](https://github.com/opengovsg/FormSG/compare/v6.87.0...v6.88.0)
 
+> 9 November 2023
+
 - chore: add note to update guide to sync with file exts [`#6876`](https://github.com/opengovsg/FormSG/pull/6876)
 - fix(datepicker): webkit-related stylings [`#6875`](https://github.com/opengovsg/FormSG/pull/6875)
 - build: merge release 6.87.0 into develop [`#6879`](https://github.com/opengovsg/FormSG/pull/6879)
 - build: release v6.87.0 [`#6878`](https://github.com/opengovsg/FormSG/pull/6878)
+- chore: bump version to v6.88.0 [`352ae5c`](https://github.com/opengovsg/FormSG/commit/352ae5c49ed30d73450364f8b4d6048e21f72ee2)
 
 #### [v6.87.0](https://github.com/opengovsg/FormSG/compare/v6.86.0...v6.87.0)
 
@@ -20,22 +49,21 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix: add case for SGID MyInfo when field value is missing [`#6874`](https://github.com/opengovsg/FormSG/pull/6874)
 - build: merge release v6.86.0 into develop  [`#6873`](https://github.com/opengovsg/FormSG/pull/6873)
 - build: release v6.86.0 [`#6866`](https://github.com/opengovsg/FormSG/pull/6866)
-- chore: use non-testing branch for font-wqy-zenhei [`#6867`](https://github.com/opengovsg/FormSG/pull/6867)
-- chore: bump version to v6.86.0 [`1eec9b6`](https://github.com/opengovsg/FormSG/commit/1eec9b63c914b56b7b10adffd03554e07fde0f3a)
 - chore: bump version to v6.87.0 [`5054803`](https://github.com/opengovsg/FormSG/commit/50548038804b03f30ce6d23b4d43b7a8cf7d9620)
 
 #### [v6.86.0](https://github.com/opengovsg/FormSG/compare/v6.85.1...v6.86.0)
 
 > 6 November 2023
 
+- chore: use non-testing branch for font-wqy-zenhei [`#6867`](https://github.com/opengovsg/FormSG/pull/6867)
 - chore: update credits and terms of use [`#6865`](https://github.com/opengovsg/FormSG/pull/6865)
 - fix: add cloudflareinsights as allowable csp [`#6864`](https://github.com/opengovsg/FormSG/pull/6864)
 - feat: optimise submission query [`#6863`](https://github.com/opengovsg/FormSG/pull/6863)
 - chore(dockerfile): update mocktwilio to start asap [`#6862`](https://github.com/opengovsg/FormSG/pull/6862)
 - fix: only render delete button if owner [`#6837`](https://github.com/opengovsg/FormSG/pull/6837)
 - build: merge release v6.85.1 into develop [`#6861`](https://github.com/opengovsg/FormSG/pull/6861)
 - fix: hotfix v6.85.1 to prevent creation of SGID_MyInfo storage mode forms [`#6860`](https://github.com/opengovsg/FormSG/pull/6860)
-- chore: bump version to v6.86.0 [`1c827cd`](https://github.com/opengovsg/FormSG/commit/1c827cd11844649ca303bb5dc9987db5367637c9)
+- chore: bump version to v6.86.0 [`1eec9b6`](https://github.com/opengovsg/FormSG/commit/1eec9b63c914b56b7b10adffd03554e07fde0f3a)
 
 #### [v6.85.1](https://github.com/opengovsg/FormSG/compare/v6.85.0...v6.85.1)
 

__tests__/e2e/encrypt-submission.spec.ts

@@ -1,6 +1,11 @@
 import mongoose from 'mongoose'
 import { featureFlags } from 'shared/constants/feature-flags'
-import { BasicField, FormResponseMode } from 'shared/types'
+import {
+  BasicField,
+  FormAuthType,
+  FormResponseMode,
+  MyInfoAttribute,
+} from 'shared/types'
 
 import { IFeatureFlagModel, IFormModel } from 'src/types'
 
@@ -19,6 +24,7 @@ import {
 } from './helpers'
 import {
   createBlankVersion,
+  createMyInfoField,
   createOptionalVersion,
   deleteDocById,
   getSettings,
@@ -143,4 +149,33 @@ test.describe('Storage form submission', () => {
     )
     await deleteDocById(Form, form._id)
   })
+
+  test('Create and submit storage mode form with MyInfo fields', async ({
+    page,
+  }) => {
+    // Define
+    const formFields = [
+      // Short answer
+      createMyInfoField(MyInfoAttribute.Name, 'LIM YONG XIANG', true),
+      // Dropdown
+      createMyInfoField(MyInfoAttribute.Sex, 'MALE', true),
+      // Date
+      createMyInfoField(MyInfoAttribute.DateOfBirth, '06/10/1980', true),
+      // Mobile
+      createMyInfoField(MyInfoAttribute.MobileNo, '97399245', false),
+      // Unverified
+      createMyInfoField(MyInfoAttribute.WorkpassStatus, 'Live', false),
+    ]
+    const formLogics = NO_LOGIC
+    const formSettings = getSettings({
+      authType: FormAuthType.MyInfo,
+    })
+
+    // Test
+    await runEncryptSubmissionTest(page, Form, {
+      formFields,
+      formLogics,
+      formSettings,
+    })
+  })
 })

__tests__/integration/helpers/express-auth.ts

@@ -6,6 +6,7 @@ import * as OtpUtils from 'src/app/utils/otp'
 
 const MOCK_VALID_OTP = '123456'
 const MOCK_OTP_PREFIX = 'ABC'
+const ADMIN_LOGIN_SESSION_COOKIE_NAME = 'formsg.connect.sid'
 
 /**
  * Integration test helper to create an authenticated session where the user
@@ -50,7 +51,7 @@ export const createAuthedSession = async (
   // Assert
   // Should have session cookie returned.
   const sessionCookie = request.cookies.find(
-    (cookie) => cookie.name === 'connect.sid',
+    (cookie) => cookie.name === ADMIN_LOGIN_SESSION_COOKIE_NAME,
   )
   expect(sessionCookie).toBeDefined()
 
@@ -68,7 +69,7 @@ export const logoutSession = async (request: Session): Promise<Session> => {
   expect(response.status).toEqual(200)
 
   const sessionCookie = request.cookies.find(
-    (cookie) => cookie.name === 'connect.sid',
+    (cookie) => cookie.name === ADMIN_LOGIN_SESSION_COOKIE_NAME,
   )
   expect(sessionCookie).not.toBeDefined()
 

__tests__/integration/helpers/express-setup.ts

@@ -17,7 +17,7 @@ const testSessionMiddlewares = () => {
     saveUninitialized: false,
     resave: false,
     secret: 'test-session-secret',
-    name: 'connect.sid',
+    name: 'formsg.connect.sid',
     store: new session.MemoryStore(),
   })
 

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.88.0",
+  "version": "6.89.0",
   "homepage": ".",
   "private": true,
   "dependencies": {
@@ -16,7 +16,7 @@
     "@stripe/react-stripe-js": "^1.15.0",
     "@stripe/stripe-js": "^1.44.1",
     "@types/stopword": "^2.0.1",
-    "axios": "^1.6.0",
+    "axios": "^1.6.2",
     "broadcast-channel": "^4.13.0",
     "browser-image-compression": "^2.0.2",
     "comlink": "^4.3.1",

frontend/src/components/InlineMessage/InlineMessage.stories.tsx

@@ -41,6 +41,6 @@ Warning.args = {
 export const Error = InlineMessageTemplate.bind({})
 Error.args = {
   variant: 'error',
-  children: `Only 30 MyInfo fields are allowed in Email mode (30/30). [Learn more](http://localhost:6006)`,
+  children: `Only 30 MyInfo fields are allowed (30/30). [Learn more](http://localhost:6006)`,
   useMarkdown: true,
 }

frontend/src/constants/localStorage.ts

@@ -17,7 +17,7 @@ export const LOCAL_STORAGE_EVENT = 'local-storage'
  * Key to store whether a user has seen the rollout announcements before.
  */
 export const ROLLOUT_ANNOUNCEMENT_KEY_PREFIX =
-  'has-seen-rollout-announcement-20231026-'
+  'has-seen-rollout-announcement-20231116-'
 
 /**
  * Key to store whether the admin has seen the feature tour in localStorage.

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

@@ -113,14 +113,12 @@ export const MyInfoFieldPanel = () => {
   )
 
   // myInfo should be disabled if
-  // 1. form response mode is not email mode
-  // 2. form auth type is not myInfo
-  // 3. # of myInfo fields >= 30
+  // 1. form auth type is not myInfo
+  // 2. # of myInfo fields >= 30
   const isMyInfoDisabled = useMemo(
     () =>
       form
         ? form.form_fields.filter(isMyInfo).length >= 30 ||
-          form.responseMode !== FormResponseMode.Email ||
           (form.authType !== FormAuthType.MyInfo &&
             form.authType !== FormAuthType.SGID_MyInfo)
         : true,
@@ -207,7 +205,8 @@ export const MyInfoFieldPanel = () => {
           </Box>
         )}
       </Droppable>
-      {user?.betaFlags?.children ? (
+      {user?.betaFlags?.children &&
+      form?.responseMode === FormResponseMode.Email ? (
         <Droppable isDropDisabled droppableId={CREATE_MYINFO_CHILDREN_DROP_ID}>
           {(provided) => (
             <Box ref={provided.innerRef} {...provided.droppableProps}>
@@ -232,14 +231,10 @@ export const MyInfoFieldPanel = () => {
   )
 }
 
-type MyInfoTextProps = Pick<
-  AdminFormDto,
-  'authType' | 'responseMode' | 'form_fields'
->
+type MyInfoTextProps = Pick<AdminFormDto, 'authType' | 'form_fields'>
 
 const MyInfoText = ({
   authType,
-  responseMode,
   form_fields,
 }: MyInfoTextProps): JSX.Element => {
   const isMyInfoDisabled =
@@ -249,10 +244,6 @@ const MyInfoText = ({
     [form_fields],
   )
 
-  if (responseMode !== FormResponseMode.Email) {
-    return <Text>MyInfo fields are not available in Storage mode forms.</Text>
-  }
-
   if (isMyInfoDisabled) {
     return (
       <Text>
@@ -267,7 +258,7 @@ const MyInfoText = ({
 
   return (
     <Text>
-      {`Only 30 MyInfo fields are allowed in Email mode (${numMyInfoFields}/30). `}
+      {`Only 30 MyInfo fields are allowed (${numMyInfoFields}/30). `}
       <Link isExternal href={GUIDE_EMAIL_MODE}>
         Learn more
       </Link>

frontend/src/features/admin-form/settings/components/AuthSettingsSection/AuthSettingsSection.tsx

@@ -21,7 +21,7 @@ import { isMyInfo } from '~features/myinfo/utils'
 
 import { useMutateFormSettings } from '../../mutations'
 
-import { AUTHTYPE_TO_TEXT, STORAGE_MODE_AUTHTYPES } from './constants'
+import { FORM_AUTHTYPES } from './constants'
 import { EsrvcIdBox } from './EsrvcIdBox'
 
 const esrvcidRequired = (authType: FormAuthType) => {
@@ -42,13 +42,11 @@ interface AuthSettingsSectionProps {
 export const AuthSettingsSectionSkeleton = (): JSX.Element => {
   return (
     <Radio.RadioGroup>
-      {Object.entries(STORAGE_MODE_AUTHTYPES).map(
-        ([authType, textToRender]) => (
-          <Radio isDisabled key={authType}>
-            <Skeleton>{textToRender}</Skeleton>
-          </Radio>
-        ),
-      )}
+      {Object.entries(FORM_AUTHTYPES).map(([authType, textToRender]) => (
+        <Radio isDisabled key={authType}>
+          <Skeleton>{textToRender}</Skeleton>
+        </Radio>
+      ))}
     </Radio.RadioGroup>
   )
 }
@@ -116,12 +114,9 @@ export const AuthSettingsSection = ({
     [isDisabled, mutateFormAuthType, settings.authType],
   )
 
-  const radioOptions: [FormAuthType, string][] = useMemo(() => {
-    return Object.entries(AUTHTYPE_TO_TEXT[settings.responseMode]) as [
-      FormAuthType,
-      string,
-    ][]
-  }, [settings.responseMode])
+  const radioOptions: [FormAuthType, string][] = Object.entries(
+    FORM_AUTHTYPES,
+  ) as [FormAuthType, string][]
 
   return (
     <Box>

frontend/src/features/admin-form/settings/components/AuthSettingsSection/constants.ts

@@ -1,29 +1,16 @@
-import { FormAuthType, FormResponseMode } from '~shared/types/form'
+import { FormAuthType } from '~shared/types/form'
 
 export type EmailFormAuthType = FormAuthType
-export type StorageFormAuthType =
-  | FormAuthType.NIL
-  | FormAuthType.SP
-  | FormAuthType.CP
-  | FormAuthType.SGID
+export type StorageFormAuthType = FormAuthType
 
-export const STORAGE_MODE_AUTHTYPES: Record<StorageFormAuthType, string> = {
-  [FormAuthType.NIL]: 'None',
-  [FormAuthType.SGID]: 'Singpass App-only Login',
-  [FormAuthType.SP]: 'Singpass',
-  [FormAuthType.CP]: 'Singpass (Corporate)',
-}
-
-// Not using STORAGE_MODE_AUTHTYPES due to wanting a different order.
-export const EMAIL_MODE_AUTHTYPES: Record<EmailFormAuthType, string> = {
+export const FORM_AUTHTYPES: Record<
+  StorageFormAuthType | EmailFormAuthType,
+  string
+> = {
   [FormAuthType.NIL]: 'None',
   [FormAuthType.SGID]: 'Singpass App-only Login',
   [FormAuthType.SGID_MyInfo]: 'Singpass App-only with Myinfo',
   [FormAuthType.SP]: 'Singpass',
   [FormAuthType.MyInfo]: 'Singpass with Myinfo',
   [FormAuthType.CP]: 'Singpass (Corporate)',
 }
-export const AUTHTYPE_TO_TEXT = {
-  [FormResponseMode.Email]: EMAIL_MODE_AUTHTYPES,
-  [FormResponseMode.Encrypt]: STORAGE_MODE_AUTHTYPES,
-}