chore: change checks to nullish just in case

Author: kevinkim-ogp

packages/backend/src/apps/gathersg/__tests__/auth/schema.test.ts

@@ -1,5 +1,4 @@
 import { describe, expect, it } from 'vitest'
-import type { SafeParseError } from 'zod'
 
 import schema from '../../auth/schema'
 
@@ -96,12 +95,16 @@ describe('gathersg auth schema', () => {
         },
       })
       expect(result.success).toBe(false)
-      if (!result.success) {
-        const { issues } = (result as SafeParseError<unknown>).error
-        expect(
-          issues.some((i) => i.message.includes('createdBy.email is required')),
-        ).toBe(true)
-      }
+    })
+
+    it('rejects createdBy with email null when not FormSG', () => {
+      const result = schema.safeParse({
+        createdBy: {
+          name: 'Regular User',
+          email: null,
+        },
+      })
+      expect(result.success).toBe(false)
     })
 
     it('rejects when both updatedBy and createdBy exist but updatedBy has no email', () => {
@@ -117,6 +120,20 @@ describe('gathersg auth schema', () => {
       expect(result.success).toBe(false)
     })
 
+    it('rejects when both updatedBy and createdBy exist but updatedBy email is null', () => {
+      const result = schema.safeParse({
+        updatedBy: {
+          name: 'Updater',
+          email: null,
+        },
+        createdBy: {
+          email: '[email protected]',
+          name: 'Creator',
+        },
+      })
+      expect(result.success).toBe(false)
+    })
+
     it('rejects empty object (neither updatedBy nor createdBy)', () => {
       const result = schema.safeParse({})
       expect(result.success).toBe(false)
@@ -156,6 +173,19 @@ describe('gathersg auth schema', () => {
       expect(result.success).toBe(false)
     })
 
+    it('rejects FormSG createdBy with submissionId null', () => {
+      const result = schema.safeParse({
+        createdBy: {
+          name: 'FormSG',
+        },
+        formsg: {
+          formId: 'form-123',
+          submissionId: null,
+        },
+      })
+      expect(result.success).toBe(false)
+    })
+
     it('rejects FormSG createdBy with empty formId', () => {
       const result = schema.safeParse({
         createdBy: {

packages/backend/src/apps/gathersg/auth/schema.ts

@@ -16,8 +16,8 @@ const schema = z
       .nullish(),
     createdBy: z
       .object({
-        email: z.string().min(1).optional(),
-        name: z.string().min(1).optional(),
+        email: z.string().min(1).nullish(),
+        name: z.string().min(1).nullish(),
       })
       .nullish(),
     formsg: z