refactor: starter-kitty usage

package.json

@@ -49,7 +49,7 @@
     "@hookform/resolvers": "^3.3.4",
     "@opengovsg/design-system-react": "^1.15.0",
     "@opengovsg/sgid-client": "^2.2.0",
-    "@opengovsg/starter-kitty-validators": "^1.0.1",
+    "@opengovsg/starter-kitty-validators": "^1.2.5",
     "@paralleldrive/cuid2": "^2.2.2",
     "@prisma/client": "^5.7.1",
     "@sendgrid/mail": "^8.1.3",

src/schemas/url.ts

@@ -1,31 +1,21 @@
 import { z } from 'zod'
 import { HOME } from '~/lib/routes'
-import { UrlValidator } from '@opengovsg/starter-kitty-validators'
+import { createUrlSchema } from '@opengovsg/starter-kitty-validators/url'
 import { getBaseUrl } from '~/utils/getBaseUrl'
 
-const baseUrl = getBaseUrl()
-
-const validator = new UrlValidator({
-  baseOrigin: new URL(baseUrl).origin,
-  whitelist: {
-    protocols: ['http', 'https'],
-    hosts: [new URL(baseUrl).host],
-  },
-})
+const baseUrl = new URL(getBaseUrl())
 
 export const callbackUrlSchema = z
   .string()
   .optional()
   .default(HOME)
-  .transform((url, ctx) => {
-    try {
-      return validator.parse(url)
-    } catch (error) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: (error as Error).message,
-      })
-      return z.NEVER
-    }
-  })
-  .catch(new URL(HOME, baseUrl))
+  .pipe(
+    createUrlSchema({
+      baseOrigin: baseUrl.origin,
+      whitelist: {
+        protocols: ['http', 'https'],
+        hosts: [baseUrl.host],
+      },
+    }),
+  )
+  .catch(new URL(HOME, baseUrl.origin))

src/utils/email.ts

@@ -1,5 +1,10 @@
+import { createEmailSchema } from '@opengovsg/starter-kitty-validators/email'
 import isEmail from 'validator/lib/isEmail'
 
+const emailSchema = createEmailSchema({
+  domains: [{ domain: 'gov.sg', includeSubdomains: true }],
+})
+
 export const getEmailDomain = (email?: string) => {
   if (!email) {
     return undefined
@@ -15,6 +20,8 @@ export const getEmailDomain = (email?: string) => {
  */
 export const isGovEmail = (value: unknown) => {
   return (
-    typeof value === 'string' && isEmail(value) && value.endsWith('.gov.sg')
+    typeof value === 'string' &&
+    isEmail(value) &&
+    emailSchema.safeParse(value).success
   )
 }