From 5030a06e816af7c05fd386942847865ad9be67a7 Mon Sep 17 00:00:00 2001
From: Ken Jin <119096102+kenjin-work@users.noreply.github.com>
Date: Thu, 20 Jul 2023 17:16:12 +0800
Subject: [PATCH 01/10] fix: github warning about unused import (#6558)

---
 frontend/src/utils/fieldValidation.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/utils/fieldValidation.ts b/frontend/src/utils/fieldValidation.ts
index 14b2bb6b76..5427a9c40d 100644
--- a/frontend/src/utils/fieldValidation.ts
+++ b/frontend/src/utils/fieldValidation.ts
@@ -48,7 +48,6 @@ import {
 import { DATE_PARSE_FORMAT } from '~templates/Field/Date/DateField'
 import {
   CheckboxFieldValues,
-  ChildrenCompoundFieldValues,
   SingleAnswerValue,
   VerifiableFieldValues,
 } from '~templates/Field/types'

From 1ba72f75471e69a572a28580e517957479f0bfa6 Mon Sep 17 00:00:00 2001
From: Lin Huiqing <37061143+LinHuiqing@users.noreply.github.com>
Date: Tue, 25 Jul 2023 10:32:46 +0800
Subject: [PATCH 02/10] feat: react router params validator for mongo ids
 (#6561)

* feat: react router params validator for mongo ids

- refactor: rename FORMID_REGEX as MONGODB_ID_REGEX

* refactor: isInvalidMongoId check
---
 frontend/src/app/AppRouter.tsx                | 39 ++++++++++++++++---
 frontend/src/app/ParamIdValidator.tsx         | 26 +++++++++++++
 frontend/src/constants/routes.ts              |  2 +-
 .../src/features/admin-form/common/queries.ts |  6 +--
 .../public-form/PublicFormProvider.tsx        |  4 +-
 frontend/src/features/public-form/queries.ts  |  4 +-
 6 files changed, 67 insertions(+), 14 deletions(-)
 create mode 100644 frontend/src/app/ParamIdValidator.tsx

diff --git a/frontend/src/app/AppRouter.tsx b/frontend/src/app/AppRouter.tsx
index b34717e646..9cab6884ec 100644
--- a/frontend/src/app/AppRouter.tsx
+++ b/frontend/src/app/AppRouter.tsx
@@ -40,6 +40,7 @@ import { FormPaymentPage } from '~features/public-form/components/FormPaymentPag
 import { BillingPage } from '~features/user/billing'
 
 import { HashRouterElement } from './HashRouterElement'
+import { ParamIdValidator } from './ParamIdValidator'
 import { PrivateElement } from './PrivateElement'
 import { PublicElement } from './PublicElement'
 
@@ -109,20 +110,38 @@ export const AppRouter = (): JSX.Element => {
         <Route path={PUBLICFORM_ROUTE}>
           <Route
             index
-            element={<PublicElement element={<PublicFormPage />} />}
+            element={
+              <ParamIdValidator
+                element={<PublicElement element={<PublicFormPage />} />}
+              />
+            }
           />
           <Route
             path={USE_TEMPLATE_REDIRECT_SUBROUTE}
-            element={<PublicElement element={<UseTemplateRedirectPage />} />}
+            element={
+              <ParamIdValidator
+                element={
+                  <PublicElement element={<UseTemplateRedirectPage />} />
+                }
+              />
+            }
           />
           <Route
             path={PAYMENT_PAGE_SUBROUTE}
-            element={<PublicElement element={<FormPaymentPage />} />}
+            element={
+              <ParamIdValidator
+                element={<PublicElement element={<FormPaymentPage />} />}
+              />
+            }
           />
         </Route>
         <Route
           path={`${ADMINFORM_ROUTE}/:formId`}
-          element={<PrivateElement element={<AdminFormLayout />} />}
+          element={
+            <ParamIdValidator
+              element={<PrivateElement element={<AdminFormLayout />} />}
+            />
+          }
         >
           <Route index element={<CreatePage />} />
           <Route path={ADMINFORM_SETTINGS_SUBROUTE} element={<SettingsPage />}>
@@ -147,11 +166,19 @@ export const AppRouter = (): JSX.Element => {
         </Route>
         <Route
           path={`${ADMINFORM_ROUTE}/:formId/${ADMINFORM_PREVIEW_ROUTE}`}
-          element={<PrivateElement element={<PreviewFormPage />} />}
+          element={
+            <ParamIdValidator
+              element={<PrivateElement element={<PreviewFormPage />} />}
+            />
+          }
         />
         <Route
           path={`${ADMINFORM_ROUTE}/:formId/${ADMINFORM_USETEMPLATE_ROUTE}`}
-          element={<PrivateElement element={<TemplateFormPage />} />}
+          element={
+            <ParamIdValidator
+              element={<PrivateElement element={<TemplateFormPage />} />}
+            />
+          }
         />
         <Route path="*" element={<NotFoundErrorPage />} />
       </Routes>
diff --git a/frontend/src/app/ParamIdValidator.tsx b/frontend/src/app/ParamIdValidator.tsx
new file mode 100644
index 0000000000..34a381f61d
--- /dev/null
+++ b/frontend/src/app/ParamIdValidator.tsx
@@ -0,0 +1,26 @@
+import { useParams } from 'react-router-dom'
+
+import { MONGODB_ID_REGEX } from '~constants/routes'
+
+import NotFoundErrorPage from '~pages/NotFoundError'
+
+interface ParamIdValidatorProps {
+  element: React.ReactElement
+}
+
+export const ParamIdValidator = ({ element }: ParamIdValidatorProps) => {
+  const { formId, submissionId, paymentId } = useParams()
+
+  const isInvalidMongoId = (id?: string) => id && !id.match(MONGODB_ID_REGEX)
+
+  // Bootstrap route validation as suggested by React Router Docs:
+  // https://reactrouter.com/en/main/start/faq#what-happened-to-regexp-routes-paths
+  if (
+    isInvalidMongoId(formId) ||
+    isInvalidMongoId(submissionId) ||
+    isInvalidMongoId(paymentId)
+  )
+    return <NotFoundErrorPage />
+
+  return element
+}
diff --git a/frontend/src/constants/routes.ts b/frontend/src/constants/routes.ts
index 7c56f70e51..24e9ef6577 100644
--- a/frontend/src/constants/routes.ts
+++ b/frontend/src/constants/routes.ts
@@ -13,7 +13,7 @@ export const BILLING_ROUTE = '/billing'
 // the regex in PublicFormPage.
 export const PUBLICFORM_ROUTE = '/:formId'
 export const USE_TEMPLATE_REDIRECT_SUBROUTE = 'use-template'
-export const FORMID_REGEX = /^([a-fA-F0-9]{24})$/
+export const MONGODB_ID_REGEX = /^([a-fA-F0-9]{24})$/
 
 export const ADMINFORM_ROUTE = '/admin/form'
 /** Build tab has no subroute, its the index admin form route. */
diff --git a/frontend/src/features/admin-form/common/queries.ts b/frontend/src/features/admin-form/common/queries.ts
index fb0db5c058..37d638b91f 100644
--- a/frontend/src/features/admin-form/common/queries.ts
+++ b/frontend/src/features/admin-form/common/queries.ts
@@ -6,7 +6,7 @@ import { AdminFormDto, PreviewFormViewDto } from '~shared/types/form/form'
 
 import { ApiError } from '~typings/core'
 
-import { FORMID_REGEX } from '~constants/routes'
+import { MONGODB_ID_REGEX } from '~constants/routes'
 
 import { useUser } from '~features/user/queries'
 
@@ -134,7 +134,7 @@ export const usePreviewForm = (
     {
       // Treat preview form as static on load.
       staleTime: Infinity,
-      enabled: FORMID_REGEX.test(formId) && enabled,
+      enabled: MONGODB_ID_REGEX.test(formId) && enabled,
     },
   )
 }
@@ -150,7 +150,7 @@ export const useFormTemplate = (
     {
       // Treat preview form as static on load.
       staleTime: Infinity,
-      enabled: FORMID_REGEX.test(formId) && enabled,
+      enabled: MONGODB_ID_REGEX.test(formId) && enabled,
     },
   )
 }
diff --git a/frontend/src/features/public-form/PublicFormProvider.tsx b/frontend/src/features/public-form/PublicFormProvider.tsx
index 4ec473826a..545020a875 100644
--- a/frontend/src/features/public-form/PublicFormProvider.tsx
+++ b/frontend/src/features/public-form/PublicFormProvider.tsx
@@ -28,7 +28,7 @@ import {
   PublicFormDto,
 } from '~shared/types/form'
 
-import { FORMID_REGEX } from '~constants/routes'
+import { MONGODB_ID_REGEX } from '~constants/routes'
 import { useBrowserStm } from '~hooks/payments'
 import { useTimeout } from '~hooks/useTimeout'
 import { useToast } from '~hooks/useToast'
@@ -93,7 +93,7 @@ export function useCommonFormProvider(formId: string) {
     return vfnTransaction.transactionId
   }, [createTransactionMutation, vfnTransaction])
 
-  const isNotFormId = useMemo(() => !FORMID_REGEX.test(formId), [formId])
+  const isNotFormId = useMemo(() => !MONGODB_ID_REGEX.test(formId), [formId])
 
   const expiryInMs = useMemo(() => {
     if (!vfnTransaction?.expireAt) return null
diff --git a/frontend/src/features/public-form/queries.ts b/frontend/src/features/public-form/queries.ts
index c246ce9f43..c6f5bb2dc3 100644
--- a/frontend/src/features/public-form/queries.ts
+++ b/frontend/src/features/public-form/queries.ts
@@ -4,7 +4,7 @@ import { PublicFormViewDto } from '~shared/types/form/form'
 
 import { ApiError } from '~typings/core'
 
-import { FORMID_REGEX } from '~constants/routes'
+import { MONGODB_ID_REGEX } from '~constants/routes'
 
 import { getPublicFormView } from './PublicFormService'
 
@@ -26,7 +26,7 @@ export const usePublicFormView = (
     {
       // Treat form as static on load.
       staleTime: Infinity,
-      enabled: FORMID_REGEX.test(formId) && enabled,
+      enabled: MONGODB_ID_REGEX.test(formId) && enabled,
     },
   )
 }

From 9afa247a7a64c3845abdc94b3c8c21eed2e13448 Mon Sep 17 00:00:00 2001
From: Ken Jin <119096102+kenjin-work@users.noreply.github.com>
Date: Tue, 25 Jul 2023 11:31:40 +0800
Subject: [PATCH 03/10] fix: subtle bugs in MyInfo Child and UI copyedits
 (#6562)

---
 .../EditMyInfoChildren/EditMyInfoChildren.tsx |  4 +-
 .../create/builder-and-design/constants.ts    |  3 ++
 .../ChildrenCompoundField.tsx                 | 43 +++++++++++--------
 shared/constants/field/myinfo/index.ts        |  2 +-
 src/app/modules/myinfo/myinfo.util.ts         |  3 ++
 5 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMyInfoChildren/EditMyInfoChildren.tsx b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMyInfoChildren/EditMyInfoChildren.tsx
index 22e674c320..9706cb9a69 100644
--- a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMyInfoChildren/EditMyInfoChildren.tsx
+++ b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMyInfoChildren/EditMyInfoChildren.tsx
@@ -97,9 +97,7 @@ export const EditMyInfoChildren = ({
         </HStack>
       </VStack>
       <VStack align="flex-start">
-        <Text textStyle="subhead-1">
-          Collect the following child information
-        </Text>
+        <Text textStyle="subhead-1">Collect the following child data</Text>
         <Box alignSelf="stretch">
           <Controller
             control={control}
diff --git a/frontend/src/features/admin-form/create/builder-and-design/constants.ts b/frontend/src/features/admin-form/create/builder-and-design/constants.ts
index 8d72f19b21..82dc078800 100644
--- a/frontend/src/features/admin-form/create/builder-and-design/constants.ts
+++ b/frontend/src/features/admin-form/create/builder-and-design/constants.ts
@@ -141,6 +141,9 @@ export const CREATE_MYINFO_CHILDREN_SUBFIELDS_OPTIONS: {
   label: string
 }[] = Object.values(MyInfoChildAttributes)
   .filter((e) => e !== MyInfoChildAttributes.ChildName)
+  // TODO awaiting approval from MyInfo to get child vaccination status.
+  // Disabling in the frontend for now.
+  .filter((e) => e !== MyInfoChildAttributes.ChildVaxxStatus)
   .map((value) => {
     return {
       value,
diff --git a/frontend/src/templates/Field/ChildrenCompound/ChildrenCompoundField.tsx b/frontend/src/templates/Field/ChildrenCompound/ChildrenCompoundField.tsx
index e331d9cd8e..b7a195d8ea 100644
--- a/frontend/src/templates/Field/ChildrenCompound/ChildrenCompoundField.tsx
+++ b/frontend/src/templates/Field/ChildrenCompound/ChildrenCompoundField.tsx
@@ -124,24 +124,27 @@ export const ChildrenCompoundField = ({
         aria-describedby={`children-desc-${schema._id}`}
         aria-labelledby={`${schema._id}-label`}
       >
-        <VStack align="stretch" role="list">
-          {fields.map((field, currChildBodyIdx) => (
-            <ChildrenBody
-              key={`body-${currChildBodyIdx}`}
-              {...{
-                currChildBodyIdx,
-                schema,
-                fields,
-                field,
-                colorTheme,
-                remove,
-                myInfoChildrenBirthRecords,
-                isSubmitting,
-                formContext,
-              }}
-            />
-          ))}
-        </VStack>
+        <>
+          <Spacer h="8px" />
+          <VStack align="stretch" role="list">
+            {fields.map((field, currChildBodyIdx) => (
+              <ChildrenBody
+                key={`body-${currChildBodyIdx}`}
+                {...{
+                  currChildBodyIdx,
+                  schema,
+                  fields,
+                  field,
+                  colorTheme,
+                  remove,
+                  myInfoChildrenBirthRecords,
+                  isSubmitting,
+                  formContext,
+                }}
+              />
+            ))}
+          </VStack>
+        </>
         {schema.allowMultiple ? (
           <HStack>
             <Button
@@ -376,7 +379,9 @@ const ChildrenBody = ({
                   </FormLabel>
                   <DatePicker
                     {...rest}
-                    inputValue={value}
+                    dateFormat="yyyy/MM/dd"
+                    // Convert MyInfo YYYY-MM-DD to YYYY/MM/DD
+                    inputValue={value?.replaceAll('-', '/')}
                     onInputValueChange={(date) => {
                       setValue(fieldPath, date)
                     }}
diff --git a/shared/constants/field/myinfo/index.ts b/shared/constants/field/myinfo/index.ts
index 777695d51b..72473222ca 100644
--- a/shared/constants/field/myinfo/index.ts
+++ b/shared/constants/field/myinfo/index.ts
@@ -318,7 +318,7 @@ export const types: MyInfoFieldBlock[] = [
     verified: ['SG', 'PR', 'F'],
     source: 'Immigration & Checkpoints Authority / Health Promotion Board',
     description:
-      "The data of the form-filler's children. This field is verified by ICA and HPB for vaccination status.",
+      "The data of the form-filler's children. Vaccination status is verified by HPB. All other data in this field is verified by ICA.",
     fieldType: BasicField.Children,
     previewValue: 'Child 1',
   },
diff --git a/src/app/modules/myinfo/myinfo.util.ts b/src/app/modules/myinfo/myinfo.util.ts
index a37b2e8d2a..9856d9c92e 100644
--- a/src/app/modules/myinfo/myinfo.util.ts
+++ b/src/app/modules/myinfo/myinfo.util.ts
@@ -92,6 +92,9 @@ function hashChildrenFieldValues(
       ) {
         return
       }
+      if (!value) {
+        return
+      }
       readOnlyHashPromises[
         getMyInfoChildHashKey(field._id, subField, childIdx, childName)
       ] = bcrypt.hash(value, HASH_SALT_ROUNDS)

From 712be3d728cd204129472eb7bea7293d76d342fa Mon Sep 17 00:00:00 2001
From: "hui (h-way)" <limhj90@gmail.com>
Date: Tue, 25 Jul 2023 05:57:07 +0100
Subject: [PATCH 04/10] feat: updated uen validator (ref stdnum) and tests
 cases  (#6534)

* uen code

* first draft

* update

* feat. UEN validator added

* feat: updated uen validator based on stdnum, along with corresponding tests

* Update package.json

* refactored code for better readability

* updated code for better readibility and removed unnecessary updates

* ran prettier on uen-validation.ts and uen-validation.spec.ts

* revert package-lock.json

* deleted jest.config.js and.patch file

* removed jest (unnecessary) from shared/package.json

* updated UEN for e2e and frontend test, and ran linting on shared

* revert package.json and package-lock.json

* revert package-lock.json
---
 CREDITS.md                                    |  29 +++
 __tests__/e2e/constants/field.ts              |   2 +-
 .../templates/Field/Uen/UenField.stories.tsx  |   4 +-
 .../src/templates/Field/Uen/UenField.test.tsx |   8 +-
 package-lock.json                             |   2 +-
 package.json                                  |   5 +-
 shared/types/converter.ts                     |  12 +-
 shared/types/form/form.ts                     |  10 +-
 shared/utils/__tests__/uen-validation.spec.ts | 163 +++++++++++++
 shared/utils/uen-validation.ts                | 223 ++++++++++++++----
 10 files changed, 389 insertions(+), 69 deletions(-)
 create mode 100644 shared/utils/__tests__/uen-validation.spec.ts

diff --git a/CREDITS.md b/CREDITS.md
index d2029eaa44..ba986f91cc 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -2200,6 +2200,35 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 -------------------------------------------------------------------------------
 
+## Project
+python_stdnum
+
+### Source
+https://github.com/arthurdejong/python-stdnum/
+
+### License
+uen.py - functions for handling Singapore UEN numbers
+coding: utf-8
+
+Copyright (C) 2020 Leandro Regueiro
+Copyright (C) 2020 Arthur de Jong
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA
+
+
 ## Project
 toastr
 
diff --git a/__tests__/e2e/constants/field.ts b/__tests__/e2e/constants/field.ts
index 6689825aa7..1f51524df8 100644
--- a/__tests__/e2e/constants/field.ts
+++ b/__tests__/e2e/constants/field.ts
@@ -314,7 +314,7 @@ export const ALL_FIELDS: E2eFieldMetadata[] = [
   {
     title: 'Some UEN here please',
     fieldType: BasicField.Uen,
-    val: 'T09LL0001B',
+    val: 'T09SS0050A',
   },
   {
     title: 'Yes or No?',
diff --git a/frontend/src/templates/Field/Uen/UenField.stories.tsx b/frontend/src/templates/Field/Uen/UenField.stories.tsx
index b93e065e97..c13531f171 100644
--- a/frontend/src/templates/Field/Uen/UenField.stories.tsx
+++ b/frontend/src/templates/Field/Uen/UenField.stories.tsx
@@ -92,11 +92,11 @@ ValidationOptional.args = {
 export const ValidationInvalidUen = Template.bind({})
 ValidationInvalidUen.args = {
   schema: baseSchema,
-  defaultValue: 'RS1LP1234Z',
+  defaultValue: '0123456789',
 }
 
 export const ValidationValidUen = Template.bind({})
 ValidationValidUen.args = {
   schema: baseSchema,
-  defaultValue: '01234567A',
+  defaultValue: '53333286M',
 }
diff --git a/frontend/src/templates/Field/Uen/UenField.test.tsx b/frontend/src/templates/Field/Uen/UenField.test.tsx
index b09b6f47ae..864b807e21 100644
--- a/frontend/src/templates/Field/Uen/UenField.test.tsx
+++ b/frontend/src/templates/Field/Uen/UenField.test.tsx
@@ -38,12 +38,12 @@ describe('validation required', () => {
 
     // Act
     // Valid UEN
-    await user.type(input, '01234567A')
+    await user.type(input, '53333286M')
     await user.click(submitButton)
 
     // Assert
     // Should show success message.
-    const success = screen.getByText('You have submitted: 01234567A')
+    const success = screen.getByText('You have submitted: 53333286M')
     expect(success).not.toBeNull()
     const error = screen.queryByText('Please fill in required field')
     expect(error).toBeNull()
@@ -79,12 +79,12 @@ describe('validation optional', () => {
     expect(input.value).toBe('')
 
     // Act
-    await user.type(input, 'S01LP1234Z')
+    await user.type(input, '201707903G')
     await user.click(submitButton)
 
     // Assert
     // Should show success message.
-    const success = screen.getByText('You have submitted: S01LP1234Z')
+    const success = screen.getByText('You have submitted: 201707903G')
     expect(success).not.toBeNull()
     const error = screen.queryByText(REQUIRED_ERROR)
     expect(error).toBeNull()
diff --git a/package-lock.json b/package-lock.json
index 64c6d539ee..c0905a8068 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48776,4 +48776,4 @@
       "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="
     }
   }
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index a76d5a5a83..82583d5c8e 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,9 @@
     "dev:backend": "tsnd --poll --respawn --transpile-only --inspect=0.0.0.0 --exit-child -r dotenv/config -- src/app/server.ts",
     "dev:frontend": "npm run --prefix frontend start",
     "lint": "eslint src/ --quiet --fix",
+    "lint:shared": "eslint shared/ --quiet --fix",
     "lint:frontend": "npm run --prefix frontend lint",
-    "lint-ci": "eslint src/ --quiet",
+    "lint-ci": "eslint src/ shared/ --quiet",
     "version": "auto-changelog -p && git add CHANGELOG.md",
     "prepare": "husky install",
     "pre-commit": "lint-staged",
@@ -284,4 +285,4 @@
       "arch": "x64"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/shared/types/converter.ts b/shared/types/converter.ts
index 6b7c7df0e7..880fd568aa 100644
--- a/shared/types/converter.ts
+++ b/shared/types/converter.ts
@@ -1,5 +1,4 @@
 export interface MyInfoDataTransformer<T, U> {
-
   /**
    * NRIC/FIN.
    */
@@ -15,15 +14,12 @@ export interface MyInfoDataTransformer<T, U> {
    * editable. The field is locked if it is government-verified and if it
    * does not contain marriage-related information (decision by SNDGO & MSF due to
    * overseas unregistered marriages).
-   * 
+   *
    * @param attr The field/attribute name directly obtained from the sgID
    *    information source.
-   * @param fieldValue FormSG field value. 
+   * @param fieldValue FormSG field value.
    */
-  _isDataReadOnly(
-    attr: T,
-    fieldValue: string | undefined,
-  ): boolean
+  _isDataReadOnly(attr: T, fieldValue: string | undefined): boolean
 
   /**
    * Retrieves the fieldValue for the givern internal
@@ -34,4 +30,4 @@ export interface MyInfoDataTransformer<T, U> {
     fieldValue: string | undefined
     isReadOnly: boolean
   }
-}
\ No newline at end of file
+}
diff --git a/shared/types/form/form.ts b/shared/types/form/form.ts
index d35c50ee18..b97058cfaf 100644
--- a/shared/types/form/form.ts
+++ b/shared/types/form/form.ts
@@ -180,7 +180,7 @@ export type PublicStorageFormDto = Merge<
     StorageFormDto,
     // Arrays like typeof list have numeric index signatures, so their number key
     // yields the union of all numerically-indexed properties.
-    typeof STORAGE_PUBLIC_FORM_FIELDS[number]
+    (typeof STORAGE_PUBLIC_FORM_FIELDS)[number]
   >,
   PublicFormBase
 >
@@ -190,7 +190,7 @@ export type PublicEmailFormDto = Merge<
     EmailFormDto,
     // Arrays like typeof list have numeric index signatures, so their number key
     // yields the union of all numerically-indexed properties.
-    typeof EMAIL_PUBLIC_FORM_FIELDS[number]
+    (typeof EMAIL_PUBLIC_FORM_FIELDS)[number]
   >,
   PublicFormBase
 >
@@ -199,11 +199,11 @@ export type PublicFormDto = PublicStorageFormDto | PublicEmailFormDto
 
 export type EmailFormSettings = Pick<
   EmailFormDto,
-  typeof EMAIL_FORM_SETTINGS_FIELDS[number]
+  (typeof EMAIL_FORM_SETTINGS_FIELDS)[number]
 >
 export type StorageFormSettings = Pick<
   StorageFormDto,
-  typeof STORAGE_FORM_SETTINGS_FIELDS[number]
+  (typeof STORAGE_FORM_SETTINGS_FIELDS)[number]
 >
 
 export type FormSettings = EmailFormSettings | StorageFormSettings
@@ -241,7 +241,7 @@ export type AdminFormViewDto = {
 
 export type AdminDashboardFormMetaDto = Pick<
   AdminFormDto,
-  typeof ADMIN_FORM_META_FIELDS[number]
+  (typeof ADMIN_FORM_META_FIELDS)[number]
 >
 
 export type DuplicateFormBodyDto = {
diff --git a/shared/utils/__tests__/uen-validation.spec.ts b/shared/utils/__tests__/uen-validation.spec.ts
new file mode 100644
index 0000000000..80efe735ca
--- /dev/null
+++ b/shared/utils/__tests__/uen-validation.spec.ts
@@ -0,0 +1,163 @@
+import { isUenValid } from '../uen-validation'
+
+describe('isUenValid', () => {
+  const localCoy = [
+    '201608355W',
+    '201932505K',
+    '201932529Z',
+    '201615963E',
+    '201616400Z',
+    '201616403M',
+    '201622938K',
+    '201622940R',
+    '201622942W',
+    '201622945K',
+    '201622947M',
+    '201622949N',
+    '201625295C',
+    '201625297D',
+    '201625299E',
+    '201625302H',
+    '201625311K',
+    '201625312C',
+    '201626633W',
+    '201626635Z',
+    '201626636K',
+    '201703427W',
+    '201703429Z',
+    '201703432R',
+    '201703434W',
+    '201707903G',
+    '201707905H',
+    '201707920Z',
+    '201716165K',
+    '201716185R',
+    '201716186G',
+    '201716187W',
+    '201716188H',
+    '201716189Z',
+    '201720961D',
+  ]
+  const business = [
+    '53333127K',
+    '53333132C',
+    '53333133A',
+    '53333286M',
+    '53334620K',
+    '53339179B',
+    '53339181D',
+    '53339185K',
+    '53339191A',
+    '53339219E',
+    '53339220M',
+    '53339221K',
+    '53339224A',
+    '53339550W',
+    '53339553D',
+    '53339554B',
+    '53344401B',
+    '53344402X',
+    '53344404K',
+    '53344409L',
+    '53344412L',
+    '53344413J',
+    '53344414D',
+    '53344417M',
+    '53344420M',
+    '53346090E',
+    '53355848D',
+    '53355850J',
+    '53358965K',
+    '53358966E',
+    '53358969W',
+    '53358970C',
+    '53358972W',
+    '53364379A',
+    '53364394E',
+  ]
+  const others = [
+    'S13SS0001G',
+    'S36CS0039B',
+    'S37SS0006B',
+    'S37SS0013H',
+    'S37SS0014D',
+    'S39CS0041K',
+    'S39SS0014C',
+    'S46CS0044H',
+    'S46TU0001K',
+    'S46TU0002F',
+    'S46TU0003B',
+    'S46TU0004J',
+    'S47SS0014G',
+    'S62SS0014K',
+    'T09SS0032E',
+    'T09SS0034H',
+    'T09SS0035D',
+    'T09SS0036L',
+    'T09SS0042K',
+    'T09SS0048H',
+    'T09SS0050A',
+    'T09SS0053L',
+    'T09SS0056K',
+    'T09SS0058B',
+    'T09SS0060F',
+    'T09SS0062J',
+    'T09SS0063E',
+    'T09SS0064A',
+    'T16LL0604C',
+    'T16UF2321H',
+    'T16UF4146J',
+    'T16UF7020E',
+    'T16UF7023D',
+    'T16UF7025G',
+    'T16UF7437A',
+  ]
+  const checksumCases = [
+    '53333286M',
+    'T09SS0034H',
+    '53339179B',
+    'S36CS0039B',
+    '201707903G',
+  ]
+
+  it('should pass all Local Company UEN', () => {
+    // happy path
+    for (let i = 0; i < localCoy.length; i++) {
+      const test_uen = localCoy[i]
+      expect(isUenValid(test_uen)).toBe(true)
+    }
+  })
+
+  it('should pass all business UEN', () => {
+    // happy path
+    for (let i = 0; i < business.length; i++) {
+      const test_uen = business[i]
+      expect(isUenValid(test_uen)).toBe(true)
+    }
+  })
+
+  it('should pass all other UEN', () => {
+    // happy path
+    for (let i = 0; i < others.length; i++) {
+      const test_uen = others[i]
+      expect(isUenValid(test_uen)).toBe(true)
+    }
+  })
+
+  it('should fail wrong checksum digits for all variants', () => {
+    // verify checksum
+    for (let i = 0; i < checksumCases.length; i++) {
+      const temp = checksumCases[i].slice(0, -1)
+      const digit = checksumCases[i].slice(-1)
+      const alpha = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('')
+      for (let j = 0; j < alpha.length; j++) {
+        const test_string = temp.concat(alpha[j])
+        if (alpha[j] !== digit) {
+          expect(isUenValid(test_string)).toBe(false)
+        } else {
+          expect(isUenValid(test_string)).toBe(true)
+        }
+      }
+    }
+  })
+})
diff --git a/shared/utils/uen-validation.ts b/shared/utils/uen-validation.ts
index 47298ed697..e96ece809d 100644
--- a/shared/utils/uen-validation.ts
+++ b/shared/utils/uen-validation.ts
@@ -1,8 +1,27 @@
 /**
  * Validate entity-type indicators, as per
- * https://www.uen.gov.sg/ueninternet/faces/pages/admin/aboutUEN.jspx and additional input
+ * https://www.uen.gov.sg/ueninternet/faces/pages/admin/aboutUEN.jspx
+ * https://www.oecd.org/tax/automatic-exchange/crs-implementation-and-assistance/tax-identification-numbers/Singapore-TIN.pdf
+ *
+ * with code modified from https://github.com/arthurdejong/python-stdnum/blob/master/stdnum/sg/uen.py
+ * See credits.md for details on copyright
  */
-const VALID_ENTITY_TYPE_INDICATORS = new Set([
+
+/** General Comments:
+ *
+ * UEN Type indicators created as a const Set<string>().
+ * Maintain by adding new codes in VALID_ENTITY_TYPE_INDICATORS.
+ *
+ * Arrow helper functions:
+ * UpperCaseandTrim -> convert to uppercase and remove whitespace
+ * isNumeric and isAlphabetic are self explanatory.
+ *
+ * isUenValid parses UEN and evaluates if UEN is Business UEN based on ROB,
+ * Local Comany UEN based on ROC, or Other UEN.
+ *
+ */
+
+const VALID_ENTITY_TYPE_INDICATORS = new Set<string>([
   // ACRA
   'BN',
   'LP',
@@ -80,8 +99,18 @@ const VALID_ENTITY_TYPE_INDICATORS = new Set([
   // SNDGO
   'GA',
   'GB',
+
+  // Foreign Entities
+  'UF',
 ])
 
+/**
+ * Helper to standardise format - uppercase and without whitespace
+ * @param s String
+ * @returns True if string is numeric
+ */
+const upperCaseAndTrim = (s: string): string => s.toUpperCase().trim()
+
 /**
  * Helper to check whether a string is numeric
  * @param s String
@@ -97,72 +126,174 @@ const isNumeric = (s: string): boolean => !!s.match(/^[0-9]+$/)
 const isAlphabetic = (s: string): boolean => !!s.match(/^[a-zA-Z]+$/)
 
 /**
- * Validates whether a provided string value adheres to the UIN/FIN format
- * as provided on the Singapore Government's National Registration Identity Card.
- * @param value The value to be validated
+ * Helper for business checksum
+ * @param number
+ * @returns
+ */
+const calcBusinessCheckDigit = (number: string): string => {
+  const weights = [10, 4, 9, 3, 8, 2, 7, 1]
+  const alpha = 'XMKECAWLJDB'.split('')
+  const num_list = number.split('')
+  let sum = 0
+
+  for (let i = 0; i < weights.length; i++) {
+    sum += parseInt(num_list[i]) * weights[i]
+  }
+  return alpha[sum % 11]
+}
+
+/**
+ * Helper for Business UEN.
+ * Performs validation based on Business (ROB) numbers
+ * @param number
+ * @returns true if valid Business UEN
  */
-export const isUenValid = (uen: string): boolean => {
-  // allow lowercase strings
-  uen = uen.toUpperCase()
+const validateBusiness = (number: string): boolean => {
+  const first8Char = number.slice(0, -1)
+  if (!isNumeric(first8Char)) {
+    return false
+  }
 
-  // check if uen is 9 or 10 digits
-  if (uen.length < 9 || uen.length > 10) {
+  const checkSum = number.slice(-1)
+  if (!isAlphabetic(checkSum)) {
     return false
   }
 
-  // (A) Businesses registered with ACRA
-  if (uen.length === 9) {
-    // check that last character is a letter
-    const lastChar = uen[uen.length - 1]
-    if (!isAlphabetic(lastChar)) {
-      return false
-    }
+  if (checkSum !== calcBusinessCheckDigit(number)) {
+    return false
+  }
+  return true
+}
 
-    // check that first 8 letters are all numbers
-    const first8Chars = uen.slice(0, 8)
-    if (!isNumeric(first8Chars)) {
-      return false
-    }
+/**
+ * Helper for local company checksum
+ * @param number
+ * @returns
+ */
+const calcLocalCompanyCheckDigit = (number: string): string => {
+  const weights = [10, 8, 6, 4, 9, 7, 5, 3, 1]
+  const alpha = 'ZKCMDNERGWH'.split('')
+  const num_list = number.split('')
+  let sum = 0
 
-    // (A) Businesses registered with ACRA (SUCCESS)
-    return true
+  for (let i = 0; i < weights.length; i++) {
+    sum += parseInt(num_list[i]) * weights[i]
   }
+  return alpha[sum % 11]
+}
 
-  // Length is 10
-  // check that last character is a letter
-  const lastChar = uen[uen.length - 1]
-  if (!isAlphabetic(lastChar)) {
+/**
+ * Helper for local UEN. Validation baed on local company based (ROC) number
+ * @param number
+ * @returns true if valid local company UEN
+ */
+const validateLocalCompany = (number: string): boolean => {
+  const first9Char = number.slice(0, -1)
+  if (!isNumeric(first9Char)) {
     return false
   }
 
-  // (B) Local companies registered with ACRA
-  const first4Chars = uen.slice(0, 4)
-  if (isNumeric(first4Chars)) {
-    // if first 4 are digits then next 5 must be digits too
-    const next5Chars = uen.slice(4, 9)
-    return isNumeric(next5Chars)
+  const currentYear = new Date().getFullYear()
+  const first4Char = number.slice(0, 4)
+  if (parseInt(first4Char) > currentYear) {
+    return false
   }
 
-  // (C) All other entities which will be issued new UEN
-  // check that 1st letter is either T or S or R
-  const firstChar = uen[0]
-  if (!['T', 'S', 'R'].includes(firstChar)) {
+  const checkSum = number.slice(-1)
+  if (checkSum !== calcLocalCompanyCheckDigit(number)) {
     return false
   }
+  return true
+}
+
+/**
+ * Helper for others checksum
+ * @param number
+ * @returns
+ */
+const calcOtherCheckDigit = (number: string): string => {
+  const weights = [4, 3, 5, 3, 10, 2, 2, 5, 7]
+  const alpha = 'ABCDEFGHJKLMNPQRSTUVWX0123456789'.split('')
+  const num_list = number.split('')
+  let sum = 0
 
-  // check that 2nd and 3rd letters are numbers only
-  const chars2And3 = uen.slice(1, 3)
+  for (let i = 0; i < weights.length; i++) {
+    const n = num_list[i]
+    sum += alpha.indexOf(n) * weights[i]
+  }
+
+  return alpha[(sum - 5) % 11]
+}
+
+/**
+ * Helper for other UEN. Performs validation based on UEN in
+ * VALID_ENTITY_TYPE_INDICATORS
+ * @param number
+ * @returns true if valid UEN
+ */
+const validateOther = (number: string): boolean => {
+  const uenPrefix = ['R', 'S', 'T']
+  const firstChar = number.slice(0, 1)
+  if (!uenPrefix.includes(firstChar)) {
+    return false
+  }
+
+  const chars2And3 = number.slice(1, 3)
   if (!isNumeric(chars2And3)) {
     return false
   }
 
-  // check entity-type indicator
-  const entityTypeIndicator = uen.slice(3, 5)
-  if (!VALID_ENTITY_TYPE_INDICATORS.has(entityTypeIndicator)) {
+  const currentYear = parseInt(
+    new Date().getFullYear().toString().substring(-2),
+  )
+  const uenYear = parseInt(number.slice(1, 3))
+  if (number.slice(0, 1) === 'T' && uenYear > currentYear) {
+    return false
+  }
+
+  const chars4And5 = number.slice(3, 5)
+  if (!VALID_ENTITY_TYPE_INDICATORS.has(chars4And5)) {
+    return false
+  }
+
+  const chars6To9 = number.slice(5, -1)
+  if (!isNumeric(chars6To9)) {
     return false
   }
 
-  // check that 6th to 9th letters are numbers only
-  const chars5To8 = uen.slice(5, 9)
-  return isNumeric(chars5To8)
+  const checkSum = number.slice(-1)
+  if (checkSum !== calcOtherCheckDigit(number)) {
+    return false
+  }
+  return true
+}
+
+/**
+ * Heart of the validation function. Parses given UEN and decide which function
+ * to call base on the perceived UEN type.
+ *
+ * Business UEN based on ROB
+ * Local Comany UEN based on ROC
+ * Other UEN.
+ *
+ * @param uen string that represents the UEN
+ * @returns true if UEN is valid
+ */
+const isUenValid = (uen: string): boolean => {
+  const number = upperCaseAndTrim(uen)
+  if (number.length !== 9 && number.length !== 10) {
+    return false
+  }
+
+  if (number.length === 9) {
+    return validateBusiness(number)
+  }
+
+  if (isNumeric(number.slice(0, 1))) {
+    return validateLocalCompany(number)
+  }
+
+  return validateOther(number)
 }
+
+export { isUenValid }

From 32868d95e45ec369449dc4ea21771b4c4242273e Mon Sep 17 00:00:00 2001
From: Lin Huiqing <37061143+LinHuiqing@users.noreply.github.com>
Date: Tue, 25 Jul 2023 17:25:01 +0800
Subject: [PATCH 05/10] chore: rm redundant type assertion in url validation
 (#6566)

* chore: rm redundant type assertion in url validation

- chore: remove unused isValidUrl function

* chore: backend linting

* chore: remove type assertion in useMdComponents

* chore: typo in comments
---
 .../src/features/logic/utils/typeguards.ts    |  2 +-
 frontend/src/hooks/useLocalStorage.ts         |  2 +-
 frontend/src/hooks/useMdComponents.tsx        |  2 +-
 shared/types/field/childrenCompoundField.ts   |  6 +----
 shared/types/form/form.ts                     |  1 -
 shared/utils/url-validation.ts                | 24 ++-----------------
 6 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/frontend/src/features/logic/utils/typeguards.ts b/frontend/src/features/logic/utils/typeguards.ts
index afda47e954..7bd39d5429 100644
--- a/frontend/src/features/logic/utils/typeguards.ts
+++ b/frontend/src/features/logic/utils/typeguards.ts
@@ -45,6 +45,6 @@ export const isLogicableField = (args: {
 export const isValueStringArray = (
   value: FormCondition['value'],
 ): value is string[] => {
-  // use .some because of limitation of typecript in calling .every() on union of array types: https://github.com/microsoft/TypeScript/issues/44373
+  // use .some because of limitation of typescript in calling .every() on union of array types: https://github.com/microsoft/TypeScript/issues/44373
   return Array.isArray(value) && !value.some((v) => typeof v === 'number')
 }
diff --git a/frontend/src/hooks/useLocalStorage.ts b/frontend/src/hooks/useLocalStorage.ts
index a4826d6d1c..b9cc37ae94 100644
--- a/frontend/src/hooks/useLocalStorage.ts
+++ b/frontend/src/hooks/useLocalStorage.ts
@@ -11,7 +11,7 @@ export const useLocalStorage = <T>(
   // Get from local storage then
   // parse stored json or return initialValue
   const readValue = useCallback(() => {
-    // Prevent build error "window is undefined" but keep keep working
+    // Prevent build error "window is undefined" and keep it working
     if (typeof window === 'undefined') {
       return initialValue
     }
diff --git a/frontend/src/hooks/useMdComponents.tsx b/frontend/src/hooks/useMdComponents.tsx
index de5a09e06c..35f515cdfd 100644
--- a/frontend/src/hooks/useMdComponents.tsx
+++ b/frontend/src/hooks/useMdComponents.tsx
@@ -84,7 +84,7 @@ export const useMdComponents = ({
       a: ({ node, ...props }) => {
         const { href } = props
         const isExternal =
-          typeof href === 'string' && !href.startsWith(window.location.origin)
+          (href && !href.startsWith(window.location.origin)) || false
 
         return <Link {...props} isExternal={isExternal} {...linkStyles} />
       },
diff --git a/shared/types/field/childrenCompoundField.ts b/shared/types/field/childrenCompoundField.ts
index 44097c5edb..3a8ad874f2 100644
--- a/shared/types/field/childrenCompoundField.ts
+++ b/shared/types/field/childrenCompoundField.ts
@@ -1,8 +1,4 @@
-import {
-  BasicField,
-  MyInfoChildAttributes,
-  MyInfoableFieldBase,
-} from './base'
+import { BasicField, MyInfoChildAttributes, MyInfoableFieldBase } from './base'
 
 export interface ChildrenCompoundFieldBase extends MyInfoableFieldBase {
   fieldType: BasicField.Children
diff --git a/shared/types/form/form.ts b/shared/types/form/form.ts
index b97058cfaf..2451a6feb9 100644
--- a/shared/types/form/form.ts
+++ b/shared/types/form/form.ts
@@ -13,7 +13,6 @@ import {
 import { DateString } from '../generic'
 import { FormLogic, LogicDto } from './form_logic'
 import { PaymentChannel, PaymentType } from '../payment'
-import { MyInfoChildrenBirthRecords } from '@opengovsg/myinfo-gov-client'
 
 export type FormId = Opaque<string, 'FormId'>
 
diff --git a/shared/utils/url-validation.ts b/shared/utils/url-validation.ts
index 8d21a98778..398eec775f 100644
--- a/shared/utils/url-validation.ts
+++ b/shared/utils/url-validation.ts
@@ -4,28 +4,8 @@ import validator from 'validator'
  * Checks that string is a valid URL over HTTPS.
  * @param url
  */
-export const isValidHttpsUrl = (url: string): boolean => {
-  // TODO(#1788): Remove redundant type assertions once frontend is fully in Typescript.
-  if (typeof url !== 'string') {
-    return false
-  }
-  return validator.isURL(url, {
+export const isValidHttpsUrl = (url: string): boolean =>
+  validator.isURL(url, {
     protocols: ['https'],
     require_protocol: true,
   })
-}
-
-/**
- * Checks that string is a valid HTTP or HTTPS URL.
- * @param url the url to check
- * @returns true if valid, false otherwise
- */
-export const isValidUrl = (url: string): boolean => {
-  // TODO(#1788): Remove redundant type assertions once frontend is fully in Typescript.
-  if (typeof url !== 'string') {
-    return false
-  }
-  return validator.isURL(url, {
-    protocols: ['https', 'http'],
-  })
-}

From 3177870a44730e3fa896ace14cd56101b05ce792 Mon Sep 17 00:00:00 2001
From: Ken Jin <119096102+kenjin-work@users.noreply.github.com>
Date: Tue, 25 Jul 2023 19:28:18 +0800
Subject: [PATCH 06/10] feat: MyInfo over sgID (frontend) (#6447)

* feat: MyInfo over sgID (frontend)

* fix: address review

* feat: redesigned settings page

* feat: add tag, fix test

* fix: address Stacey's design review

* feat: aria-labels and fix test again

* fix: try to fix tests again

* fix: hopefully fix tests...

* fix: actually fix tests this time for real

* fix: disable children fields as well

* chore: revert back to original design

* chore: formatting

* chore: reduce diff

* fix: e2e tests

* fix: link to sgID data catalog

* fix: inline message

* fix: link

* fix: closer to Figma

* fix: even closer to Figma

* fix: design review addressed

* fix: UI review round 1.5

* fix: address all remaining design reviews

* fix: design add gap in initial sentence and first radio

* fix: address review by Huiqing

* fix: ensure same typography
---
 __tests__/e2e/helpers/createForm.ts           | 16 ++---
 .../field-panels/MyInfoPanel.tsx              | 69 ++++++++++++++----
 .../AuthSettingsSection.tsx                   | 72 +++++++++----------
 .../AuthSettingsSection/EsrvcIdBox.tsx        | 30 ++++----
 .../AuthSettingsSection/constants.ts          | 16 ++---
 .../components/FormAuth/FormAuth.tsx          |  1 +
 package-lock.json                             |  7 +-
 package.json                                  |  2 +-
 8 files changed, 117 insertions(+), 96 deletions(-)

diff --git a/__tests__/e2e/helpers/createForm.ts b/__tests__/e2e/helpers/createForm.ts
index 443cf6ae3a..62fc941040 100644
--- a/__tests__/e2e/helpers/createForm.ts
+++ b/__tests__/e2e/helpers/createForm.ts
@@ -302,18 +302,12 @@ const addAuthSettings = async (
     page.getByRole('heading', { name: 'Enable Singpass authentication' }),
   ).toBeVisible()
 
-  const name = `Singpass${
-    formSettings.authType === FormAuthType.SP
-      ? ''
-      : formSettings.authType === FormAuthType.SGID
-      ? ' App-only Login'
-      : formSettings.authType === FormAuthType.MyInfo
-      ? ' with MyInfo'
-      : ' (Corporate)'
-  }`
-
   await page
-    .locator('label', { has: page.getByRole('radio', { name }) })
+    .locator('label', {
+      has: page.locator(
+        `input[type='radio'][value='${formSettings.authType}']`,
+      ),
+    })
     .first() // Since 'Singpass' will match all radio options, pick the first matching one.
     .click({ position: { x: 1, y: 1 } }) // Clicking the center of the sgid button launches the sgid contact form, put this here until we get rid of the link
 
diff --git a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/FieldListDrawer/field-panels/MyInfoPanel.tsx b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/FieldListDrawer/field-panels/MyInfoPanel.tsx
index 341abababf..abc879eab1 100644
--- a/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/FieldListDrawer/field-panels/MyInfoPanel.tsx
+++ b/frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/FieldListDrawer/field-panels/MyInfoPanel.tsx
@@ -1,9 +1,14 @@
-import { useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
 import { Droppable } from 'react-beautiful-dnd'
 import { Link as ReactLink } from 'react-router-dom'
 import { Box, Text } from '@chakra-ui/react'
 
-import { AdminFormDto, FormAuthType, FormResponseMode } from '~shared/types'
+import {
+  AdminFormDto,
+  FormAuthType,
+  FormResponseMode,
+  MyInfoAttribute,
+} from '~shared/types'
 
 import { GUIDE_EMAIL_MODE } from '~constants/links'
 import { ADMINFORM_SETTINGS_SINGPASS_SUBROUTE } from '~constants/routes'
@@ -30,6 +35,33 @@ import { DraggableMyInfoFieldListOption } from '../FieldListOption'
 
 import { FieldSection } from './FieldSection'
 
+const SGID_SUPPORTED: Set<MyInfoAttribute> = new Set([
+  MyInfoAttribute.Name,
+  MyInfoAttribute.DateOfBirth,
+  MyInfoAttribute.PassportNumber,
+  MyInfoAttribute.PassportExpiryDate,
+  // This is disabled due to MyInfo and sgID-MyInfo not using the same
+  // phone number formats.
+  // MyInfo phone numbers support country code, while sgID-MyInfo does not.
+  // MyInfoAttribute.MobileNo,
+
+  // FRM-1189: This is disabled due to slight different formatting.
+  // We format the Myinfo response by separates lines in addresses with comma
+  // Whereas sgID separates each line with newline.
+  // This should be enabled in future work
+  // MyInfoAttribute.RegisteredAddress,
+])
+
+/**
+ * If sgID is used, checks if the corresponding
+ * MyInfo field is supported by sgID.
+ */
+const sgIDUnSupported = (
+  form: AdminFormDto | undefined,
+  fieldType: MyInfoAttribute,
+): boolean =>
+  form?.authType === FormAuthType.SGID_MyInfo && !SGID_SUPPORTED.has(fieldType)
+
 export const MyInfoFieldPanel = () => {
   const { data: form, isLoading } = useCreateTabForm()
   // myInfo should be disabled if
@@ -38,12 +70,21 @@ export const MyInfoFieldPanel = () => {
   // 3. # of myInfo fields >= 30
   const isMyInfoDisabled = useMemo(
     () =>
-      form?.responseMode !== FormResponseMode.Email ||
-      form?.authType !== FormAuthType.MyInfo ||
-      (form ? form.form_fields.filter(isMyInfo).length >= 30 : true),
+      form
+        ? form.form_fields.filter(isMyInfo).length >= 30 ||
+          form.responseMode !== FormResponseMode.Email ||
+          (form.authType !== FormAuthType.MyInfo &&
+            form.authType !== FormAuthType.SGID_MyInfo)
+        : true,
     [form],
   )
   const isDisabled = isMyInfoDisabled || isLoading
+  const isDisabledCheck = useCallback(
+    (fieldType: MyInfoAttribute): boolean => {
+      return isDisabled || sgIDUnSupported(form, fieldType)
+    },
+    [form, isDisabled],
+  )
   const { user } = useUser()
 
   return (
@@ -56,7 +97,7 @@ export const MyInfoFieldPanel = () => {
               {CREATE_MYINFO_PERSONAL_FIELDS_ORDERED.map((fieldType, index) => (
                 <DraggableMyInfoFieldListOption
                   index={index}
-                  isDisabled={isDisabled}
+                  isDisabled={isDisabledCheck(fieldType)}
                   key={index}
                   fieldType={fieldType}
                 />
@@ -73,7 +114,7 @@ export const MyInfoFieldPanel = () => {
               {CREATE_MYINFO_CONTACT_FIELDS_ORDERED.map((fieldType, index) => (
                 <DraggableMyInfoFieldListOption
                   index={index}
-                  isDisabled={isDisabled}
+                  isDisabled={isDisabledCheck(fieldType)}
                   key={index}
                   fieldType={fieldType}
                 />
@@ -91,7 +132,7 @@ export const MyInfoFieldPanel = () => {
                 (fieldType, index) => (
                   <DraggableMyInfoFieldListOption
                     index={index}
-                    isDisabled={isDisabled}
+                    isDisabled={isDisabledCheck(fieldType)}
                     key={index}
                     fieldType={fieldType}
                   />
@@ -109,7 +150,7 @@ export const MyInfoFieldPanel = () => {
               {CREATE_MYINFO_MARRIAGE_FIELDS_ORDERED.map((fieldType, index) => (
                 <DraggableMyInfoFieldListOption
                   index={index}
-                  isDisabled={isDisabled}
+                  isDisabled={isDisabledCheck(fieldType)}
                   key={index}
                   fieldType={fieldType}
                 />
@@ -128,7 +169,7 @@ export const MyInfoFieldPanel = () => {
                   (fieldType, index) => (
                     <DraggableMyInfoFieldListOption
                       index={index}
-                      isDisabled={isDisabled}
+                      isDisabled={isDisabledCheck(fieldType)}
                       key={index}
                       fieldType={fieldType}
                     />
@@ -154,7 +195,8 @@ const MyInfoText = ({
   responseMode,
   form_fields,
 }: MyInfoTextProps): JSX.Element => {
-  const isMyInfoDisabled = authType !== FormAuthType.MyInfo
+  const isMyInfoDisabled =
+    authType !== FormAuthType.MyInfo && authType !== FormAuthType.SGID_MyInfo
   const numMyInfoFields = useMemo(
     () => form_fields.filter((ff) => isMyInfo(ff)).length,
     [form_fields],
@@ -178,7 +220,10 @@ const MyInfoText = ({
 
   return (
     <Text>
-      {`Only 30 MyInfo fields are allowed in Email mode (${numMyInfoFields}/30).`}{' '}
+      {authType === FormAuthType.SGID_MyInfo
+        ? 'Some MyInfo fields are not yet supported in your selected authentication type. '
+        : null}
+      {`Only 30 MyInfo fields are allowed in Email mode (${numMyInfoFields}/30). `}
       <Link isExternal href={GUIDE_EMAIL_MODE}>
         Learn more
       </Link>
diff --git a/frontend/src/features/admin-form/settings/components/AuthSettingsSection/AuthSettingsSection.tsx b/frontend/src/features/admin-form/settings/components/AuthSettingsSection/AuthSettingsSection.tsx
index f90c3b20f7..f824086b98 100644
--- a/frontend/src/features/admin-form/settings/components/AuthSettingsSection/AuthSettingsSection.tsx
+++ b/frontend/src/features/admin-form/settings/components/AuthSettingsSection/AuthSettingsSection.tsx
@@ -6,28 +6,22 @@ import {
   useMemo,
   useState,
 } from 'react'
-import { Box, Flex, Icon, Skeleton } from '@chakra-ui/react'
+import { Box, Flex, Skeleton, Spacer, Text } from '@chakra-ui/react'
 
 import { FormAuthType, FormSettings, FormStatus } from '~shared/types/form'
 
-import { BxsHelpCircle } from '~assets/icons/BxsHelpCircle'
-import { OGP_SGID } from '~constants/links'
+import { GUIDE_SPCP_ESRVCID } from '~constants/links'
 import InlineMessage from '~components/InlineMessage'
 import Link from '~components/Link'
 import Radio from '~components/Radio'
-import Tooltip from '~components/Tooltip'
+import { Tag } from '~components/Tag'
 
 import { useAdminForm } from '~features/admin-form/common/queries'
 import { isMyInfo } from '~features/myinfo/utils'
 
 import { useMutateFormSettings } from '../../mutations'
 
-import {
-  AUTHTYPE_TO_TEXT,
-  CP_TOOLTIP,
-  SGID_TOOLTIP,
-  STORAGE_MODE_AUTHTYPES,
-} from './constants'
+import { AUTHTYPE_TO_TEXT, STORAGE_MODE_AUTHTYPES } from './constants'
 import { EsrvcIdBox } from './EsrvcIdBox'
 
 const esrvcidRequired = (authType: FormAuthType) => {
@@ -131,14 +125,31 @@ export const AuthSettingsSection = ({
 
   return (
     <Box>
+      <Text
+        textStyle="subhead-1"
+        color="secondary.500"
+        marginBottom="40px"
+        marginTop="40px"
+      >
+        Authenticate respondents by NRIC.{' '}
+        <Link
+          textStyle="subhead-1"
+          href={GUIDE_SPCP_ESRVCID}
+          isExternal
+          // Needed for link to open since there are nested onClicks
+          onClickCapture={(e) => e.stopPropagation()}
+        >
+          Learn more about Singpass authentication
+        </Link>
+      </Text>
       {isFormPublic ? (
-        <InlineMessage mb="1.25rem">
+        <InlineMessage marginBottom="16px">
           To change authentication method, close your form to new responses.
         </InlineMessage>
       ) : containsMyInfoFields ? (
-        <InlineMessage mb="1.25rem">
-          Authentication method cannot be changed without first removing MyInfo
-          fields. You can still update your e-service ID.
+        <InlineMessage marginBottom="16px">
+          To change authentication method, remove existing Myinfo fields on your
+          form. You can still update your e-service ID.
         </InlineMessage>
       ) : null}
       <Radio.RadioGroup
@@ -150,36 +161,17 @@ export const AuthSettingsSection = ({
           <Fragment key={authType}>
             <Box onClick={handleOptionClick(authType)}>
               <Radio value={authType} isDisabled={isDisabled(authType)}>
-                <Flex align="center">
+                <Flex>
                   {text}
-                  {authType === FormAuthType.SGID ? (
+                  {authType === FormAuthType.SGID ||
+                  authType === FormAuthType.SGID_MyInfo ? (
                     <>
-                      <Tooltip
-                        label={SGID_TOOLTIP}
-                        placement="top"
-                        textAlign="center"
-                      >
-                        <Icon as={BxsHelpCircle} aria-hidden marginX="0.5rem" />
-                      </Tooltip>
-                      <Link
-                        href={OGP_SGID}
-                        isExternal
-                        // Needed for link to open since there are nested onClicks
-                        onClickCapture={(e) => e.stopPropagation()}
-                      >
-                        Contact us to find out more
-                      </Link>
+                      <Spacer w="16px" />
+                      <Tag size="sm" variant="subtle">
+                        Free
+                      </Tag>
                     </>
                   ) : null}
-                  {authType === FormAuthType.CP ? (
-                    <Tooltip
-                      label={CP_TOOLTIP}
-                      placement="top"
-                      textAlign="center"
-                    >
-                      <Icon as={BxsHelpCircle} aria-hidden ml="0.5rem" />
-                    </Tooltip>
-                  ) : null}
                 </Flex>
               </Radio>
             </Box>
diff --git a/frontend/src/features/admin-form/settings/components/AuthSettingsSection/EsrvcIdBox.tsx b/frontend/src/features/admin-form/settings/components/AuthSettingsSection/EsrvcIdBox.tsx
index 7052a1d8f2..c7bf034e6f 100644
--- a/frontend/src/features/admin-form/settings/components/AuthSettingsSection/EsrvcIdBox.tsx
+++ b/frontend/src/features/admin-form/settings/components/AuthSettingsSection/EsrvcIdBox.tsx
@@ -7,16 +7,14 @@ import {
   InputGroup,
   InputRightElement,
   Stack,
+  Text,
   VisuallyHidden,
 } from '@chakra-ui/react'
 
 import { FormAuthType, FormSettings } from '~shared/types/form'
 
-import { GUIDE_SPCP_ESRVCID } from '~constants/links'
-import { useMdComponents } from '~hooks/useMdComponents'
 import FormErrorMessage from '~components/FormControl/FormErrorMessage'
 import Input from '~components/Input'
-import { MarkdownText } from '~components/MarkdownText'
 import Spinner from '~components/Spinner'
 
 import { useMutateFormSettings } from '../../mutations'
@@ -47,15 +45,6 @@ export const EsrvcIdBox = ({
     mode: 'onChange',
   })
 
-  const mdComponents = useMdComponents({
-    styles: {
-      text: {
-        textStyle: 'body-2',
-        color: 'secondary.400',
-      },
-    },
-  })
-
   const onSubmit = handleSubmit(({ esrvcId }) => {
     if (esrvcId.trim() === initialEsrvcId) return
     return mutateFormEsrvcId.mutate(esrvcId.trim(), {
@@ -74,22 +63,27 @@ export const EsrvcIdBox = ({
   const renderedHelperText = useMemo(() => {
     switch (settings.authType) {
       case FormAuthType.SP:
-        return `Find out [how to get your Singpass e-service ID](${GUIDE_SPCP_ESRVCID}).`
       case FormAuthType.CP:
-        return `Corppass now uses Singpass to authenticate corporate users. You will still need a separate **Corppass e-service ID**. Find out [how to get your Corppass e-service ID](${GUIDE_SPCP_ESRVCID}).`
       case FormAuthType.MyInfo:
-        return `Find out [how to get your MyInfo e-service ID](${GUIDE_SPCP_ESRVCID}).`
+        return 'Contact spcp.transoffice@accenture.com for your e-service ID'
       default:
         return ''
     }
   }, [settings.authType])
 
+  const placeHolder = useMemo(
+    () =>
+      `Enter ${
+        settings.authType === FormAuthType.CP ? 'Corppass' : 'Singpass'
+      } e-service ID`,
+    [settings.authType],
+  )
   return (
     <form onSubmit={onSubmit} onBlur={handleBlur}>
       <Stack ml="2.75rem" mb="1.25rem">
-        <MarkdownText components={mdComponents}>
+        <Text textStyle="body-2" color="secondary.400">
           {renderedHelperText}
-        </MarkdownText>
+        </Text>
         <VisuallyHidden>
           <FormLabel htmlFor="esrvcId">e-service ID:</FormLabel>
         </VisuallyHidden>
@@ -111,7 +105,7 @@ export const EsrvcIdBox = ({
                 })}
                 isDisabled={isDisabled}
                 isReadOnly={mutateFormEsrvcId.isLoading}
-                placeholder="Enter Singpass e-service ID"
+                placeholder={placeHolder}
               />
             </InputGroup>
             <FormErrorMessage>{errors.esrvcId?.message}</FormErrorMessage>
diff --git a/frontend/src/features/admin-form/settings/components/AuthSettingsSection/constants.ts b/frontend/src/features/admin-form/settings/components/AuthSettingsSection/constants.ts
index 220a6f3300..6a4357d815 100644
--- a/frontend/src/features/admin-form/settings/components/AuthSettingsSection/constants.ts
+++ b/frontend/src/features/admin-form/settings/components/AuthSettingsSection/constants.ts
@@ -9,29 +9,21 @@ export type StorageFormAuthType =
 
 export const STORAGE_MODE_AUTHTYPES: Record<StorageFormAuthType, string> = {
   [FormAuthType.NIL]: 'None',
+  [FormAuthType.SGID]: 'Singpass App-only Login',
   [FormAuthType.SP]: 'Singpass',
-  [FormAuthType.SGID]: 'Singpass App-only Login (Free)',
   [FormAuthType.CP]: 'Singpass (Corporate)',
 }
 
 // Not using STORAGE_MODE_AUTHTYPES due to wanting a different order.
 export const EMAIL_MODE_AUTHTYPES: Record<EmailFormAuthType, string> = {
   [FormAuthType.NIL]: 'None',
+  [FormAuthType.SGID]: 'Singpass App-only Login',
+  [FormAuthType.SGID_MyInfo]: 'Singpass App-only with Myinfo',
   [FormAuthType.SP]: 'Singpass',
-  [FormAuthType.SGID]: 'Singpass App-only Login (Free)',
-  [FormAuthType.MyInfo]: 'Singpass with MyInfo',
+  [FormAuthType.MyInfo]: 'Singpass with Myinfo',
   [FormAuthType.CP]: 'Singpass (Corporate)',
 }
 export const AUTHTYPE_TO_TEXT = {
   [FormResponseMode.Email]: EMAIL_MODE_AUTHTYPES,
   [FormResponseMode.Encrypt]: STORAGE_MODE_AUTHTYPES,
 }
-
-export const SGID_TOOLTIP = `Free Singpass authentication via Singpass app QR\
-  code login. Respondents must have the Singpass mobile app installed to log in\
-  and submit responses. Password login is not supported. Form admin will receive\
-  respondent's NRIC.`
-
-export const CP_TOOLTIP = `Corppass no longer has its own login page, and now\
-  uses Singpass to authenticate corporate users. You will still need a separate\
-  Corppass e-service ID.`
diff --git a/frontend/src/features/public-form/components/FormAuth/FormAuth.tsx b/frontend/src/features/public-form/components/FormAuth/FormAuth.tsx
index 4bd3f32c30..c495abd56d 100644
--- a/frontend/src/features/public-form/components/FormAuth/FormAuth.tsx
+++ b/frontend/src/features/public-form/components/FormAuth/FormAuth.tsx
@@ -42,6 +42,7 @@ export const FormAuth = ({ authType }: FormAuthProps): JSX.Element => {
             'Corporate entity login is required for this form.\nYour Singpass ID and corporate Entity ID will be included with your form submission.',
         }
       case FormAuthType.SGID:
+      case FormAuthType.SGID_MyInfo:
         return {
           authType: 'Singpass app',
           helpText:
diff --git a/package-lock.json b/package-lock.json
index c0905a8068..bc8373a891 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "@opengovsg/formsg-sdk": "^0.10.0",
         "@opengovsg/myinfo-gov-client": "^4.1.1",
         "@opengovsg/ng-file-upload": "^12.2.15",
-        "@opengovsg/sgid-client": "1.0.4",
+        "@opengovsg/sgid-client": "^1.0.4",
         "@sentry/browser": "^7.51.2",
         "@sentry/integrations": "^6.19.7",
         "@stablelib/base64": "^1.0.1",
@@ -5135,7 +5135,8 @@
     },
     "node_modules/@opengovsg/sgid-client": {
       "version": "1.0.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@opengovsg/sgid-client/-/sgid-client-1.0.4.tgz",
+      "integrity": "sha512-4FJ7i87S5tP48T+NlTZ4QXNPpAG3eDAg5koHL+twXZsY20e3oW36QpWePbh+ctS893+z0cYvoGWd+/JfnTx2jA==",
       "dependencies": {
         "jose": "4.9.2",
         "node-rsa": "1.1.1",
@@ -32486,6 +32487,8 @@
     },
     "@opengovsg/sgid-client": {
       "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@opengovsg/sgid-client/-/sgid-client-1.0.4.tgz",
+      "integrity": "sha512-4FJ7i87S5tP48T+NlTZ4QXNPpAG3eDAg5koHL+twXZsY20e3oW36QpWePbh+ctS893+z0cYvoGWd+/JfnTx2jA==",
       "requires": {
         "jose": "4.9.2",
         "node-rsa": "1.1.1",
diff --git a/package.json b/package.json
index 82583d5c8e..11b1982f2d 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "@opengovsg/formsg-sdk": "^0.10.0",
     "@opengovsg/myinfo-gov-client": "^4.1.1",
     "@opengovsg/ng-file-upload": "^12.2.15",
-    "@opengovsg/sgid-client": "1.0.4",
+    "@opengovsg/sgid-client": "^1.0.4",
     "@sentry/browser": "^7.51.2",
     "@sentry/integrations": "^6.19.7",
     "@stablelib/base64": "^1.0.1",

From 335637cdcf5a90afb9e9ec422ae635d5fafccccf Mon Sep 17 00:00:00 2001
From: Ken Jin <119096102+kenjin-work@users.noreply.github.com>
Date: Wed, 26 Jul 2023 11:15:55 +0800
Subject: [PATCH 07/10] chore: lint and update commands in README (#6567)

* chore: lint and update commands in README

* nit: remove unused ignore

---------

Co-authored-by: LinHuiqing <huiqing@open.gov.sg>
---
 README.md                 |  4 ++--
 shared/types/form/form.ts | 10 +++++-----
 shared/types/response.ts  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 541882a909..ce8f23e1a3 100755
--- a/README.md
+++ b/README.md
@@ -197,7 +197,7 @@ npm run test:frontend
 #### End-to-end tests
 
 ```bash
-npm run test-e2e
+npm run test:e2e-v2
 ```
 
 will build both the frontend and backend then run our end-to-end tests. The tests are located at [`__tests__/e2e`](./__tests__/e2e). You will need to stop the Docker dev container to be able to run the end-to-end tests.
@@ -205,7 +205,7 @@ will build both the frontend and backend then run our end-to-end tests. The test
 If you do not need to rebuild the frontend and backend, you can run
 
 ```bash
-npm run test-e2e-ci
+npx playwright test
 ```
 
 #### Cross-browser testing
diff --git a/shared/types/form/form.ts b/shared/types/form/form.ts
index 2451a6feb9..58f7bf1f5f 100644
--- a/shared/types/form/form.ts
+++ b/shared/types/form/form.ts
@@ -179,7 +179,7 @@ export type PublicStorageFormDto = Merge<
     StorageFormDto,
     // Arrays like typeof list have numeric index signatures, so their number key
     // yields the union of all numerically-indexed properties.
-    (typeof STORAGE_PUBLIC_FORM_FIELDS)[number]
+    typeof STORAGE_PUBLIC_FORM_FIELDS[number]
   >,
   PublicFormBase
 >
@@ -189,7 +189,7 @@ export type PublicEmailFormDto = Merge<
     EmailFormDto,
     // Arrays like typeof list have numeric index signatures, so their number key
     // yields the union of all numerically-indexed properties.
-    (typeof EMAIL_PUBLIC_FORM_FIELDS)[number]
+    typeof EMAIL_PUBLIC_FORM_FIELDS[number]
   >,
   PublicFormBase
 >
@@ -198,11 +198,11 @@ export type PublicFormDto = PublicStorageFormDto | PublicEmailFormDto
 
 export type EmailFormSettings = Pick<
   EmailFormDto,
-  (typeof EMAIL_FORM_SETTINGS_FIELDS)[number]
+  typeof EMAIL_FORM_SETTINGS_FIELDS[number]
 >
 export type StorageFormSettings = Pick<
   StorageFormDto,
-  (typeof STORAGE_FORM_SETTINGS_FIELDS)[number]
+  typeof STORAGE_FORM_SETTINGS_FIELDS[number]
 >
 
 export type FormSettings = EmailFormSettings | StorageFormSettings
@@ -240,7 +240,7 @@ export type AdminFormViewDto = {
 
 export type AdminDashboardFormMetaDto = Pick<
   AdminFormDto,
-  (typeof ADMIN_FORM_META_FIELDS)[number]
+  typeof ADMIN_FORM_META_FIELDS[number]
 >
 
 export type DuplicateFormBodyDto = {
diff --git a/shared/types/response.ts b/shared/types/response.ts
index 25f36fadca..ef2b258301 100644
--- a/shared/types/response.ts
+++ b/shared/types/response.ts
@@ -1,6 +1,6 @@
 import type { Opaque } from 'type-fest'
 import { z } from 'zod'
-import { BasicField, MyInfoAttribute, MyInfoChildAttributes } from './field'
+import { BasicField, MyInfoAttribute } from './field'
 
 const ResponseBase = z.object({
   myInfo: z.never().optional(),

From 64271b278b8ff835e86323f40d698deda9a7e79c Mon Sep 17 00:00:00 2001
From: Lin Huiqing <37061143+LinHuiqing@users.noreply.github.com>
Date: Wed, 26 Jul 2023 17:26:47 +0800
Subject: [PATCH 08/10] feat: rm bot protection for GSIB users (#6568)

* feat: rm bot protection against GSIB respondents

* fix: use enableCaptcha var

* fix: enableCaptcha conditional

* chore: move comment position
---
 .../src/features/public-form/PublicFormProvider.tsx   | 11 +++++++----
 .../email-submission/email-submission.controller.ts   |  9 +++++++--
 .../encrypt-submission.controller.ts                  |  9 +++++++--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/frontend/src/features/public-form/PublicFormProvider.tsx b/frontend/src/features/public-form/PublicFormProvider.tsx
index 545020a875..1e0a06d7b1 100644
--- a/frontend/src/features/public-form/PublicFormProvider.tsx
+++ b/frontend/src/features/public-form/PublicFormProvider.tsx
@@ -135,9 +135,12 @@ export const PublicFormProvider = ({
     }
   }, [submissionData])
 
+  // Only load catpcha if enabled on form and the user is not on GSIB
+  const enableCaptcha = data && data.form.hasCaptcha && !data.isIntranetUser
+
   const {
     data: { captchaPublicKey, turnstileSiteKey, useFetchForSubmissions } = {},
-  } = useEnv(/* enabled= */ !!data?.form.hasCaptcha)
+  } = useEnv(/* enabled= */ enableCaptcha)
 
   // Feature flag to control turnstile captcha rollout
   // defaults to false
@@ -156,7 +159,7 @@ export const PublicFormProvider = ({
     getTurnstileResponse,
     containerID: turnstileContainerID,
   } = useTurnstile({
-    sitekey: data?.form.hasCaptcha ? turnstileSiteKey : undefined,
+    sitekey: enableCaptcha ? turnstileSiteKey : undefined,
     enableUsage: enableTurnstileFeatureFlag,
   })
 
@@ -165,7 +168,7 @@ export const PublicFormProvider = ({
     getCaptchaResponse,
     containerId: recaptchaContainerID,
   } = useRecaptcha({
-    sitekey: data?.form.hasCaptcha ? captchaPublicKey : undefined,
+    sitekey: enableCaptcha ? captchaPublicKey : undefined,
     enableUsage: !enableTurnstileFeatureFlag,
   })
 
@@ -592,7 +595,7 @@ export const PublicFormProvider = ({
         isAuthRequired,
         captchaContainerId: containerID,
         expiryInMs,
-        isLoading: isLoading || (!!data?.form.hasCaptcha && !hasLoaded),
+        isLoading: isLoading || (!!enableCaptcha && !hasLoaded),
         isPaymentEnabled,
         isPreview: false,
         setNumVisibleFields,
diff --git a/src/app/modules/submission/email-submission/email-submission.controller.ts b/src/app/modules/submission/email-submission/email-submission.controller.ts
index d3adf4f526..1c66230ffe 100644
--- a/src/app/modules/submission/email-submission/email-submission.controller.ts
+++ b/src/app/modules/submission/email-submission/email-submission.controller.ts
@@ -113,8 +113,13 @@ const submitEmailModeForm: ControllerHandler<
           }),
       )
       .andThen((form) => {
-        // Check the captcha
-        if (form.hasCaptcha) {
+        // Check if respondent is a GSIB user
+        const isIntranetUser = FormService.checkIsIntranetFormAccess(
+          getRequestIp(req),
+          form,
+        )
+        // Check the captcha, provided user is not on GSIB
+        if (!isIntranetUser && form.hasCaptcha) {
           switch (req.query.captchaType) {
             case CaptchaTypes.Turnstile: {
               return TurnstileService.verifyTurnstileResponse(
diff --git a/src/app/modules/submission/encrypt-submission/encrypt-submission.controller.ts b/src/app/modules/submission/encrypt-submission/encrypt-submission.controller.ts
index 054707b4ea..89fd723cd4 100644
--- a/src/app/modules/submission/encrypt-submission/encrypt-submission.controller.ts
+++ b/src/app/modules/submission/encrypt-submission/encrypt-submission.controller.ts
@@ -148,8 +148,13 @@ const submitEncryptModeForm: ControllerHandler<
       })
     }
   }
-  // Check captcha
-  if (form.hasCaptcha) {
+  // Check if respondent is a GSIB user
+  const isIntranetUser = FormService.checkIsIntranetFormAccess(
+    getRequestIp(req),
+    form,
+  )
+  // Check captcha, provided user is not on GSIB
+  if (!isIntranetUser && form.hasCaptcha) {
     switch (req.query.captchaType) {
       case CaptchaTypes.Turnstile: {
         const turnstileResult = await TurnstileService.verifyTurnstileResponse(

From cfee040ec01c9048f5ff76ceca0eed827f6ed9d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jul 2023 19:59:15 +0000
Subject: [PATCH 09/10] chore(deps-dev): bump @types/lodash from 4.14.195 to
 4.14.196 in /shared (#6570)

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.14.195 to 4.14.196.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 shared/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/shared/package-lock.json b/shared/package-lock.json
index fdc8cf9ce2..39a5553d2a 100644
--- a/shared/package-lock.json
+++ b/shared/package-lock.json
@@ -102,9 +102,9 @@
       "dev": true
     },
     "node_modules/@types/lodash": {
-      "version": "4.14.195",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.195.tgz",
-      "integrity": "sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==",
+      "version": "4.14.196",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.196.tgz",
+      "integrity": "sha512-22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ==",
       "dev": true
     },
     "node_modules/@types/semver": {
@@ -957,9 +957,9 @@
       "dev": true
     },
     "@types/lodash": {
-      "version": "4.14.195",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.195.tgz",
-      "integrity": "sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==",
+      "version": "4.14.196",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.196.tgz",
+      "integrity": "sha512-22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ==",
       "dev": true
     },
     "@types/semver": {

From c69b1ce2a1313e0e49d1b94636af2815dc26e2c3 Mon Sep 17 00:00:00 2001
From: LinHuiqing <huiqing@open.gov.sg>
Date: Thu, 27 Jul 2023 09:02:30 +0800
Subject: [PATCH 10/10] chore: bump version to v6.68.0

---
 CHANGELOG.md               | 33 +++++++++++++++++++--------------
 frontend/package-lock.json |  4 ++--
 frontend/package.json      |  2 +-
 package-lock.json          |  6 +++---
 package.json               |  4 ++--
 5 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08dad0f49c..686e718090 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,29 @@ 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.68.0](https://github.com/opengovsg/FormSG/compare/v6.67.1...v6.68.0)
+
+- chore(deps-dev): bump @types/lodash from 4.14.195 to 4.14.196 in /shared [`#6570`](https://github.com/opengovsg/FormSG/pull/6570)
+- feat: rm bot protection for GSIB users [`#6568`](https://github.com/opengovsg/FormSG/pull/6568)
+- chore: lint and update commands in README [`#6567`](https://github.com/opengovsg/FormSG/pull/6567)
+- feat: MyInfo over sgID (frontend) [`#6447`](https://github.com/opengovsg/FormSG/pull/6447)
+- chore: rm redundant type assertion in url validation [`#6566`](https://github.com/opengovsg/FormSG/pull/6566)
+- feat: updated uen validator (ref stdnum) and tests cases  [`#6534`](https://github.com/opengovsg/FormSG/pull/6534)
+- fix: subtle bugs in MyInfo Child and UI copyedits [`#6562`](https://github.com/opengovsg/FormSG/pull/6562)
+- feat: react router params validator for mongo ids [`#6561`](https://github.com/opengovsg/FormSG/pull/6561)
+- build: merge v6.67.1 into develop [`#6559`](https://github.com/opengovsg/FormSG/pull/6559)
+- build: release v6.67.1 [`#6557`](https://github.com/opengovsg/FormSG/pull/6557)
+- fix: github warning about unused import [`#6558`](https://github.com/opengovsg/FormSG/pull/6558)
+
 #### [v6.67.1](https://github.com/opengovsg/FormSG/compare/v6.67.0...v6.67.1)
 
+> 20 July 2023
+
 - fix: paynow payout being ignored [`#6556`](https://github.com/opengovsg/FormSG/pull/6556)
 - build: release v6.67.0 [`#6555`](https://github.com/opengovsg/FormSG/pull/6555)
+- chore: bump version to 6.67.1 [`b641094`](https://github.com/opengovsg/FormSG/commit/b641094d40a67a888e3a8ac967a43f9d1732bd49)
 
-#### [v6.67.0](https://github.com/opengovsg/FormSG/compare/v6.66.1...v6.67.0)
+#### [v6.67.0](https://github.com/opengovsg/FormSG/compare/v6.66.0...v6.67.0)
 
 > 20 July 2023
 
@@ -19,20 +36,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - build: release v6.66.0 [`#6550`](https://github.com/opengovsg/FormSG/pull/6550)
 - feat: MyInfo Children compound fields beta [`#6523`](https://github.com/opengovsg/FormSG/pull/6523)
 - ci: adjust timeouts for playwright pipe [`#6551`](https://github.com/opengovsg/FormSG/pull/6551)
-- fix: use proof-of-payment for payment receipt/invoice [`#6549`](https://github.com/opengovsg/FormSG/pull/6549)
-- build(deps-dev): bump word-wrap from 1.2.3 to 1.2.4 in /frontend [`#6548`](https://github.com/opengovsg/FormSG/pull/6548)
-- fix(deps): bump word-wrap from 1.2.3 to 1.2.4 [`#6547`](https://github.com/opengovsg/FormSG/pull/6547)
-- build(deps): bump winston-cloudwatch to v6.2.0 [`#6545`](https://github.com/opengovsg/FormSG/pull/6545)
-- chore: bump version to v6.66.0 [`0233ba8`](https://github.com/opengovsg/FormSG/commit/0233ba8018532d4978d13717fac065f81e2eb515)
 - chore: bump version to v6.67.0 [`6ca03c6`](https://github.com/opengovsg/FormSG/commit/6ca03c68cb162a4ae3af01f172425b3305742ae0)
 
-#### [v6.66.1](https://github.com/opengovsg/FormSG/compare/v6.66.0...v6.66.1)
-
-> 18 July 2023
-
-- revert: build(deps): bump winston-cloudwatch version to 6.2.0 [`#6542`](https://github.com/opengovsg/FormSG/pull/6542)
-- chore: bump version to v6.66.0 [`b3a9818`](https://github.com/opengovsg/FormSG/commit/b3a9818762e334bc7126c029cdba63156bac85ed)
-
 #### [v6.66.0](https://github.com/opengovsg/FormSG/compare/v6.65.0...v6.66.0)
 
 > 19 July 2023
@@ -405,7 +410,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix: only return previous payment id [`#6210`](https://github.com/opengovsg/FormSG/pull/6210)
 - build: merge release v6.45.0 to develop [`#6205`](https://github.com/opengovsg/FormSG/pull/6205)
 - build: release v6.45.0 [`#6200`](https://github.com/opengovsg/FormSG/pull/6200)
-- chore: bump version to v6.46.0 [`767e7e5`](https://github.com/opengovsg/FormSG/commit/767e7e55c3e8f058963e890b1c249704d6db1459)
+- chore: bump version to v6.46.0 [`87fda0e`](https://github.com/opengovsg/FormSG/commit/87fda0e0ec4c937350ebd013a4a9762f4acee802)
 
 #### [v6.45.0](https://github.com/opengovsg/FormSG/compare/v6.44.1...v6.45.0)
 
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 8bc1a55fd5..60aec3a455 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "form-frontend",
-  "version": "6.67.0",
+  "version": "6.68.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "form-frontend",
-      "version": "6.67.0",
+      "version": "6.68.0",
       "hasInstallScript": true,
       "dependencies": {
         "@chakra-ui/react": "^1.8.6",
diff --git a/frontend/package.json b/frontend/package.json
index 20b768ace6..f8cbc954ce 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.67.0",
+  "version": "6.68.0",
   "homepage": ".",
   "private": true,
   "dependencies": {
diff --git a/package-lock.json b/package-lock.json
index bc8373a891..b65119898a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "FormSG",
-  "version": "6.67.1",
+  "version": "6.68.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "FormSG",
-      "version": "6.67.1",
+      "version": "6.68.0",
       "hasInstallScript": true,
       "dependencies": {
         "@aws-sdk/client-cloudwatch-logs": "^3.347.1",
@@ -48779,4 +48779,4 @@
       "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="
     }
   }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 11b1982f2d..8a309d641d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "6.67.1",
+  "version": "6.68.0",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <formsg@data.gov.sg>"
@@ -285,4 +285,4 @@
       "arch": "x64"
     }
   }
-}
\ No newline at end of file
+}