Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

feat: add validation

Marc Seitz5faf7b7be7d6
diff --git a/lib/files/put-file.ts b/lib/files/put-file.ts
index 3fa7e967..eacef6b7 100644
--- a/lib/files/put-file.ts
+++ b/lib/files/put-file.ts
@@ -3,10 +3,12 @@ import { upload } from "@vercel/blob/client";
import { match } from "ts-pattern";
import { newId } from "@/lib/id-helper";
-import {
- getPagesCount,
- getSheetsCount,
-} from "@/lib/utils/get-page-number-count";
+import { getPagesCount } from "@/lib/utils/get-page-number-count";
+import type {
+ MultipartCompleteRequest,
+ MultipartGetPartUrlsRequest,
+ MultipartInitiateRequest,
+} from "@/lib/zod/schemas/multipart";
import { SUPPORTED_DOCUMENT_MIME_TYPES } from "../constants";
@@ -193,11 +195,6 @@ const putFileMultipart = async ({
docId: string;
}) => {
try {
- // Generate a new doc ID if not provided
- if (!docId) {
- docId = newId("doc");
- }
-
// Step 1: Initiate multipart upload
const initiateResponse = await fetch(
`${process.env.NEXT_PUBLIC_BASE_URL}/api/file/s3/multipart`,
@@ -212,7 +209,7 @@ const putFileMultipart = async ({
contentType: file.type,
teamId: teamId,
docId: docId,
- }),
+ } satisfies MultipartInitiateRequest),
},
);
@@ -241,7 +238,7 @@ const putFileMultipart = async ({
uploadId: uploadId,
fileSize: file.size,
partSize: PART_SIZE,
- }),
+ } satisfies MultipartGetPartUrlsRequest),
},
);
@@ -310,7 +307,7 @@ const putFileMultipart = async ({
docId: docId,
uploadId: uploadId,
parts: parts,
- }),
+ } satisfies MultipartCompleteRequest),
},
);
diff --git a/lib/zod/schemas/multipart.ts b/lib/zod/schemas/multipart.ts
new file mode 100644
index 00000000..ae1eb31d
--- /dev/null
+++ b/lib/zod/schemas/multipart.ts
@@ -0,0 +1,55 @@
+import { z } from "zod";
+
+// Schema for multipart upload part
+const MultipartPartSchema = z.object({
+ ETag: z.string().min(1, "ETag is required"),
+ PartNumber: z.number().int().min(1, "PartNumber must be a positive integer"),
+});
+
+// Base schema for common fields
+const MultipartBaseSchema = z.object({
+ fileName: z.string().min(1, "fileName is required"),
+ contentType: z.string().min(1, "contentType is required"),
+ teamId: z.string().min(1, "teamId is required"),
+ docId: z.string().min(1, "docId is required"),
+});
+
+// Schema for initiate action
+const MultipartInitiateSchema = MultipartBaseSchema.extend({
+ action: z.literal("initiate"),
+});
+
+// Schema for get-part-urls action
+const MultipartGetPartUrlsSchema = MultipartBaseSchema.extend({
+ action: z.literal("get-part-urls"),
+ uploadId: z.string().min(1, "uploadId is required for get-part-urls action"),
+ fileSize: z.number().int().min(1, "fileSize must be a positive integer"),
+ partSize: z
+ .number()
+ .int()
+ .min(5 * 1024 * 1024, "partSize must be at least 5MB")
+ .default(10 * 1024 * 1024),
+});
+
+// Schema for complete action
+const MultipartCompleteSchema = MultipartBaseSchema.extend({
+ action: z.literal("complete"),
+ uploadId: z.string().min(1, "uploadId is required for complete action"),
+ parts: z.array(MultipartPartSchema).min(1, "At least one part is required"),
+});
+
+// Union schema for all multipart actions
+export const MultipartUploadSchema = z.discriminatedUnion("action", [
+ MultipartInitiateSchema,
+ MultipartGetPartUrlsSchema,
+ MultipartCompleteSchema,
+]);
+
+// Type exports
+export type MultipartUploadRequest = z.infer<typeof MultipartUploadSchema>;
+export type MultipartPart = z.infer<typeof MultipartPartSchema>;
+export type MultipartInitiateRequest = z.infer<typeof MultipartInitiateSchema>;
+export type MultipartGetPartUrlsRequest = z.infer<
+ typeof MultipartGetPartUrlsSchema
+>;
+export type MultipartCompleteRequest = z.infer<typeof MultipartCompleteSchema>;
diff --git a/pages/api/file/s3/multipart.ts b/pages/api/file/s3/multipart.ts
index 7bcda62d..07c3d83d 100644
--- a/pages/api/file/s3/multipart.ts
+++ b/pages/api/file/s3/multipart.ts
@@ -1,6 +1,7 @@
import { NextApiRequest, NextApiResponse } from "next";
import {
+ AbortMultipartUploadCommand,
CompleteMultipartUploadCommand,
CreateMultipartUploadCommand,
UploadPartCommand,
@@ -14,6 +15,7 @@ import { ONE_HOUR, ONE_SECOND } from "@/lib/constants";
import { getTeamS3ClientAndConfig } from "@/lib/files/aws-client";
import prisma from "@/lib/prisma";
import { CustomUser } from "@/lib/types";
+import { MultipartUploadSchema } from "@/lib/zod/schemas/multipart";
import { authOptions } from "../../auth/[...nextauth]";
@@ -31,27 +33,21 @@ export default async function handler(
}
try {
- const {
- action,
- fileName,
- contentType,
- teamId,
- docId,
- uploadId,
- fileSize,
- partSize = 10 * 1024 * 1024, // Default 10MB chunks
- parts,
- } = req.body as {
- action: "initiate" | "get-part-urls" | "complete";
- fileName: string;
- contentType: string;
- teamId: string;
- docId: string;
- uploadId?: string;
- fileSize?: number;
- partSize?: number;
- parts?: Array<{ ETag: string; PartNumber: number }>;
- };
+ // Validate request body with Zod
+ const validationResult = MultipartUploadSchema.safeParse(req.body);
+
+ if (!validationResult.success) {
+ return res.status(400).json({
+ error: "Invalid request body",
+ details: validationResult.error.issues.map((issue) => ({
+ path: issue.path.join("."),
+ message: issue.message,
+ })),
+ });
+ }
+
+ const data = validationResult.data;
+ const { action, fileName, contentType, teamId, docId } = data;
// Verify team access
const team = await prisma.team.findUnique({
@@ -98,12 +94,12 @@ export default async function handler(
case "get-part-urls": {
// Step 2: Generate pre-signed URLs for each part
- if (!uploadId || !fileSize) {
- return res.status(400).json({
- error: "uploadId and fileSize are required for get-part-urls action",
- });
+ if (data.action !== "get-part-urls") {
+ return res.status(400).json({ error: "Invalid action" });
}
+ const { uploadId, fileSize, partSize } = data;
+
const numParts = Math.ceil(fileSize / partSize);
const urls = await Promise.all(
Array.from({ length: numParts }, async (_, index) => {
@@ -128,12 +124,12 @@ export default async function handler(
case "complete": {
// Step 3: Complete multipart upload
- if (!uploadId || !parts) {
- return res.status(400).json({
- error: "uploadId and parts are required for complete action",
- });
+ if (data.action !== "complete") {
+ return res.status(400).json({ error: "Invalid action" });
}
+ const { uploadId, parts } = data;
+
const completeCommand = new CompleteMultipartUploadCommand({
Bucket: config.bucket,
Key: key,
@@ -159,4 +155,4 @@ export default async function handler(
console.error("Multipart upload error:", error);
return res.status(500).json({ error: "Internal server error" });
}
-}
\ No newline at end of file
+}