fix(gmail): use shared contract for edit-draft route

Author: waleedlatif1

apps/sim/app/api/tools/gmail/edit-draft/route.ts

@@ -1,10 +1,10 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { z } from 'zod'
+import { gmailEditDraftContract } from '@/lib/api/contracts/google-tools'
+import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { RawFileInputArraySchema } from '@/lib/uploads/utils/file-schemas'
 import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils'
 import { downloadFileFromStorage } from '@/lib/uploads/utils/file-utils.server'
 import {
@@ -19,20 +19,6 @@ export const dynamic = 'force-dynamic'
 
 const logger = createLogger('GmailEditDraftAPI')
 
-const GmailEditDraftSchema = z.object({
-  accessToken: z.string().min(1, 'Access token is required'),
-  draftId: z.string().min(1, 'Draft ID is required'),
-  to: z.string().min(1, 'Recipient email is required'),
-  subject: z.string().optional().nullable(),
-  body: z.string().min(1, 'Email body is required'),
-  contentType: z.enum(['text', 'html']).optional().nullable(),
-  threadId: z.string().optional().nullable(),
-  replyToMessageId: z.string().optional().nullable(),
-  cc: z.string().optional().nullable(),
-  bcc: z.string().optional().nullable(),
-  attachments: RawFileInputArraySchema.optional().nullable(),
-})
-
 export const POST = withRouteHandler(async (request: NextRequest) => {
   const requestId = generateRequestId()
 
@@ -55,8 +41,9 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       { userId: authResult.userId }
     )
 
-    const body = await request.json()
-    const validatedData = GmailEditDraftSchema.parse(body)
+    const parsed = await parseRequest(gmailEditDraftContract, request, {})
+    if (!parsed.success) return parsed.response
+    const validatedData = parsed.data.body
 
     logger.info(`[${requestId}] Updating Gmail draft`, {
       draftId: validatedData.draftId,
@@ -180,18 +167,6 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       },
     })
   } catch (error) {
-    if (error instanceof z.ZodError) {
-      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
-      return NextResponse.json(
-        {
-          success: false,
-          error: 'Invalid request data',
-          details: error.errors,
-        },
-        { status: 400 }
-      )
-    }
-
     logger.error(`[${requestId}] Error updating Gmail draft:`, error)
 
     return NextResponse.json(

apps/sim/lib/api/contracts/google-tools.ts

@@ -33,6 +33,10 @@ export const gmailMailBodySchema = z.object({
   attachments: RawFileInputArraySchema.optional().nullable(),
 })
 
+export const gmailEditDraftBodySchema = gmailMailBodySchema.extend({
+  draftId: z.string().min(1, 'Draft ID is required'),
+})
+
 export const googleDriveUploadBodySchema = z.object({
   accessToken: googleAccessTokenSchema,
   fileName: z.string().min(1, 'File name is required'),
@@ -86,6 +90,13 @@ export const gmailDraftContract = defineRouteContract({
   response: { mode: 'json', schema: toolJsonResponseSchema },
 })
 
+export const gmailEditDraftContract = defineRouteContract({
+  method: 'POST',
+  path: '/api/tools/gmail/edit-draft',
+  body: gmailEditDraftBodySchema,
+  response: { mode: 'json', schema: toolJsonResponseSchema },
+})
+
 export const gmailMarkReadContract = defineRouteContract({
   method: 'POST',
   path: '/api/tools/gmail/mark-read',
@@ -153,6 +164,7 @@ export type GmailAddLabelBody = ContractBodyInput<typeof gmailAddLabelContract>
 export type GmailArchiveBody = ContractBodyInput<typeof gmailArchiveContract>
 export type GmailDeleteBody = ContractBodyInput<typeof gmailDeleteContract>
 export type GmailDraftBody = ContractBodyInput<typeof gmailDraftContract>
+export type GmailEditDraftBody = ContractBodyInput<typeof gmailEditDraftContract>
 export type GmailMarkReadBody = ContractBodyInput<typeof gmailMarkReadContract>
 export type GmailMarkUnreadBody = ContractBodyInput<typeof gmailMarkUnreadContract>
 export type GmailMoveBody = ContractBodyInput<typeof gmailMoveContract>
@@ -169,6 +181,7 @@ export type GmailAddLabelResponse = ContractJsonResponse<typeof gmailAddLabelCon
 export type GmailArchiveResponse = ContractJsonResponse<typeof gmailArchiveContract>
 export type GmailDeleteResponse = ContractJsonResponse<typeof gmailDeleteContract>
 export type GmailDraftResponse = ContractJsonResponse<typeof gmailDraftContract>
+export type GmailEditDraftResponse = ContractJsonResponse<typeof gmailEditDraftContract>
 export type GmailMarkReadResponse = ContractJsonResponse<typeof gmailMarkReadContract>
 export type GmailMarkUnreadResponse = ContractJsonResponse<typeof gmailMarkUnreadContract>
 export type GmailMoveResponse = ContractJsonResponse<typeof gmailMoveContract>

scripts/check-api-validation-contracts.ts

@@ -9,8 +9,8 @@ const QUERY_HOOKS_DIR = path.join(ROOT, 'apps/sim/hooks/queries')
 const SELECTOR_HOOKS_DIR = path.join(ROOT, 'apps/sim/hooks/selectors')
 
 const BASELINE = {
-  totalRoutes: 715,
-  zodRoutes: 715,
+  totalRoutes: 716,
+  zodRoutes: 716,
   nonZodRoutes: 0,
 } as const