Skip to content

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

feat: add request list uploads

Marc Seitz77d9841aae97
diff --git a/components/ui/fade-scroll-area.tsx b/components/ui/fade-scroll-area.tsx
new file mode 100644
index 00000000..c8eaa918
--- /dev/null
+++ b/components/ui/fade-scroll-area.tsx
@@ -0,0 +1,87 @@
+import { useEffect, useRef, useState } from "react";
+
+import { cn } from "@/lib/utils";
+
+import { ScrollArea } from "@/components/ui/scroll-area";
+
+const FADE_THRESHOLD_PX = 10;
+
+/**
+ * ScrollArea with top/bottom fade masks that appear when content overflows in
+ * that direction (same affordance as the viewer FAQ section), plus an optional
+ * always-rendered scrollbar. Pair `showScrollbar` with a `pr-2.5`
+ * `contentClassName` to keep content out of the scrollbar gutter.
+ */
+export function FadeScrollArea({
+ className,
+ contentClassName,
+ showScrollbar,
+ children,
+}: {
+ className?: string;
+ contentClassName?: string;
+ showScrollbar?: boolean;
+ children: React.ReactNode;
+}) {
+ const rootRef = useRef<HTMLDivElement>(null);
+ const [showTopFade, setShowTopFade] = useState(false);
+ const [showBottomFade, setShowBottomFade] = useState(false);
+
+ useEffect(() => {
+ const viewport = rootRef.current?.querySelector<HTMLElement>(
+ "[data-radix-scroll-area-viewport]",
+ );
+ if (!viewport) return;
+
+ const update = () => {
+ const { scrollTop, scrollHeight, clientHeight } = viewport;
+ setShowTopFade(scrollTop > FADE_THRESHOLD_PX);
+ setShowBottomFade(
+ scrollTop < scrollHeight - clientHeight - FADE_THRESHOLD_PX,
+ );
+ };
+
+ update();
+ viewport.addEventListener("scroll", update, { passive: true });
+
+ // Re-check when the viewport resizes or its content grows/shrinks
+ // (rows load async, filters change the list length).
+ const observer = new ResizeObserver(update);
+ observer.observe(viewport);
+ if (viewport.firstElementChild) {
+ observer.observe(viewport.firstElementChild);
+ }
+
+ return () => {
+ viewport.removeEventListener("scroll", update);
+ observer.disconnect();
+ };
+ }, []);
+
+ return (
+ <div className={cn("relative min-h-0", className)}>
+ <ScrollArea
+ ref={rootRef}
+ className="h-full"
+ showScrollbar={showScrollbar}
+ >
+ <div className={contentClassName}>{children}</div>
+ </ScrollArea>
+
+ <div
+ aria-hidden
+ className={cn(
+ "pointer-events-none absolute inset-x-0 top-0 z-10 h-8 bg-gradient-to-b from-background via-background/60 to-transparent transition-opacity duration-200",
+ showTopFade ? "opacity-100" : "opacity-0",
+ )}
+ />
+ <div
+ aria-hidden
+ className={cn(
+ "pointer-events-none absolute inset-x-0 bottom-0 z-10 h-8 bg-gradient-to-t from-background via-background/60 to-transparent transition-opacity duration-200",
+ showBottomFade ? "opacity-100" : "opacity-0",
+ )}
+ />
+ </div>
+ );
+}
diff --git a/components/view/dataroom/dataroom-view.tsx b/components/view/dataroom/dataroom-view.tsx
index b69af236..909b2978 100644
--- a/components/view/dataroom/dataroom-view.tsx
+++ b/components/view/dataroom/dataroom-view.tsx
@@ -3,6 +3,7 @@ import { useRouter } from "next/router";
import React, { useEffect, useRef, useState } from "react";
import { PendingUploadsProvider } from "@/context/pending-uploads-context";
+import { useViewerRequestList } from "@/ee/features/request-lists/lib/swr/use-viewer-request-list";
import { DataroomBrand } from "@prisma/client";
import Cookies from "js-cookie";
import { toast } from "sonner";
@@ -126,6 +127,18 @@ export default function DataroomView({
? brand?.accentColor
: "#ffffff";
+ // Request List uploads land in the same DocumentUpload table as voluntary
+ // visitor uploads, so track the viewer's uploads whenever either feature can
+ // produce them — even when the link's generic visitor-upload toggle is off.
+ const { enabled: requestListEnabled } = useViewerRequestList({
+ linkId: link.id,
+ dataroomId: dataroom?.id,
+ viewerId: viewData.viewerId,
+ isPreview: viewData.isPreview,
+ });
+ const trackViewerUploads =
+ !!viewData.enableVisitorUpload || requestListEnabled;
+
const handleSubmission = async (): Promise<void> => {
setIsLoading(true);
const response = await fetch("/api/views-dataroom", {
@@ -308,8 +321,8 @@ export default function DataroomView({
if (submitted) {
return (
<PendingUploadsProvider
- linkId={viewData.enableVisitorUpload ? link.id : undefined}
- dataroomId={viewData.enableVisitorUpload ? dataroom?.id : undefined}
+ linkId={trackViewerUploads ? link.id : undefined}
+ dataroomId={trackViewerUploads ? dataroom?.id : undefined}
>
<div
className="flex min-h-screen flex-col bg-white"
diff --git a/components/view/viewer/dataroom-viewer.tsx b/components/view/viewer/dataroom-viewer.tsx
index d6ddd163..fac2c808 100644
--- a/components/view/viewer/dataroom-viewer.tsx
+++ b/components/view/viewer/dataroom-viewer.tsx
@@ -1028,8 +1028,12 @@ export default function DataroomViewer({
</div>
) : null}
- {/* Tabs: Documents / My Uploads */}
- {viewData?.enableVisitorUpload && hasUploads && (
+ {/* Tabs: Documents / My Uploads. Request List uploads
+ also land here, so show the tab when either visitor
+ upload or a request list is available. */}
+ {(viewData?.enableVisitorUpload ||
+ requestListEnabled) &&
+ hasUploads && (
<div
className="mt-4 flex items-center gap-1 border-b"
style={{
diff --git a/components/viewer-upload-component.tsx b/components/viewer-upload-component.tsx
index 76bd9dbf..6fc61d59 100644
--- a/components/viewer-upload-component.tsx
+++ b/components/viewer-upload-component.tsx
@@ -1,9 +1,9 @@
import { useRef, useState } from "react";
+import { usePendingUploads } from "@/context/pending-uploads-context";
import { FileUp } from "lucide-react";
import { toast } from "sonner";
-import { usePendingUploads } from "@/context/pending-uploads-context";
import { DocumentData } from "@/lib/documents/create-document";
import { newId } from "@/lib/id-helper";
import { cn } from "@/lib/utils";
@@ -15,11 +15,15 @@ export function ViewerUploadComponent({
viewerData,
teamId,
folderId,
+ taskId,
onUploadSuccess,
}: {
viewerData: { id: string; linkId: string; dataroomId?: string };
teamId: string;
folderId?: string;
+ /** When set, the upload fulfills a Request List task (links it to the task
+ * and auto-submits the request). */
+ taskId?: string;
onUploadSuccess?: () => void;
}) {
const [uploads, setUploads] = useState<
@@ -123,6 +127,7 @@ export function ViewerUploadComponent({
documentData,
dataroomId: viewerData.dataroomId,
folderId: folderId,
+ taskId: taskId,
}),
});
@@ -143,7 +148,11 @@ export function ViewerUploadComponent({
result.document.fileType,
);
- // Update pending upload with real document data
+ // Update pending upload with real document data. Crucially, reconcile the
+ // folder with the destination the server actually chose: forced
+ // destinations (per-task `uploadFolderId` or the link's upload allow-list)
+ // can differ from the client-guessed `folderId`, so trust the server so
+ // the file shows under its real folder — not stuck in Home.
if (pendingId) {
updatePendingUpload(pendingId, {
status: needsProcessing ? "processing" : "complete",
@@ -151,6 +160,7 @@ export function ViewerUploadComponent({
dataroomDocumentId: result.document.dataroomDocumentId,
documentVersionId: result.document.documentVersionId,
fileType: result.document.fileType,
+ folderId: result.document.folderId ?? null,
});
}
@@ -180,6 +190,7 @@ export function ViewerUploadComponent({
onUploadRejected={(rejected) => setRejectedFiles(rejected)}
viewerData={viewerData}
teamId={teamId}
+ taskId={taskId}
>
{isUploading ? (
<div className="min-w-0 space-y-3">
@@ -194,10 +205,7 @@ export function ViewerUploadComponent({
{upload.fileName}
</p>
<div className="mt-1.5 flex items-center gap-2">
- <Progress
- value={upload.progress}
- className="h-1.5 flex-1"
- />
+ <Progress value={upload.progress} className="h-1.5 flex-1" />
<span className="shrink-0 text-xs tabular-nums text-muted-foreground">
{upload.progress}%
</span>
diff --git a/components/viewer-upload-zone.tsx b/components/viewer-upload-zone.tsx
index 90b21878..1e978953 100644
--- a/components/viewer-upload-zone.tsx
+++ b/components/viewer-upload-zone.tsx
@@ -23,6 +23,7 @@ export default function ViewerUploadZone({
onUploadRejected,
viewerData,
teamId,
+ taskId,
maxFileSize = 350, // 350 MB default, matches paid admin document limits
disabled = false,
}: {
@@ -39,6 +40,9 @@ export default function ViewerUploadZone({
dataroomId?: string;
};
teamId: string;
+ /** When set, uploads fulfill a Request List task and bypass the link's
+ * generic upload toggle (gated by task assignment server-side). */
+ taskId?: string;
maxFileSize?: number;
disabled?: boolean;
}) {
@@ -97,6 +101,7 @@ export default function ViewerUploadZone({
viewerData,
teamId,
numPages,
+ taskId,
});
const uploadResult = await complete;
@@ -160,7 +165,14 @@ export default function ViewerUploadZone({
toast.error("An error occurred during upload");
}
},
- [onUploadStart, onUploadProgress, onUploadComplete, viewerData, teamId],
+ [
+ onUploadStart,
+ onUploadProgress,
+ onUploadComplete,
+ viewerData,
+ teamId,
+ taskId,
+ ],
);
const { getRootProps, getInputProps, isDragActive } = useDropzone({
diff --git a/lib/files/viewer-tus-upload.ts b/lib/files/viewer-tus-upload.ts
index aa43de5e..f82d0580 100644
--- a/lib/files/viewer-tus-upload.ts
+++ b/lib/files/viewer-tus-upload.ts
@@ -13,6 +13,9 @@ type ViewerUploadParams = {
};
teamId: string;
numPages: number;
+ /** When set, the upload fulfills a Request List task. Task uploads are gated
+ * by assignment rather than the link's generic upload toggle. */
+ taskId?: string;
};
type UploadResult = {
@@ -34,6 +37,7 @@ export function viewerUpload({
viewerData,
teamId,
numPages,
+ taskId,
}: ViewerUploadParams) {
return new Promise<{ upload: tus.Upload; complete: Promise<UploadResult> }>(
(resolve, reject) => {
@@ -44,11 +48,34 @@ export function viewerUpload({
completeResolve = res;
});
+ // Scope resumable uploads to this viewer/link/task so findPreviousUploads()
+ // never reuses an upload created for a different task or viewer. The default
+ // fingerprint only covers file name/type/size, which collides across tasks.
+ const uploadScope = [
+ teamId,
+ viewerData.id,
+ viewerData.linkId,
+ viewerData.dataroomId || "",
+ taskId || "",
+ ].join(":");
+
const upload = new tus.Upload(file, {
endpoint: `${process.env.NEXT_PUBLIC_BASE_URL}/api/file/tus-viewer`,
retryDelays: [0, 3000, 5000, 10000],
uploadDataDuringCreation: true,
removeFingerprintOnSuccess: true,
+ fingerprint: (file, options) =>
+ Promise.resolve(
+ [
+ "tus-viewer",
+ file.name,
+ file.type,
+ file.size,
+ file.lastModified,
+ options.endpoint,
+ uploadScope,
+ ].join("-"),
+ ),
metadata: {
fileName: file.name,
contentType: file.type,
@@ -57,6 +84,7 @@ export function viewerUpload({
viewerId: viewerData.id,
linkId: viewerData.linkId,
dataroomId: viewerData.dataroomId || "",
+ ...(taskId ? { taskId } : {}),
},
chunkSize: 4 * 1024 * 1024,
onError: (error) => {
@@ -100,9 +128,16 @@ export function viewerUpload({
upload
.findPreviousUploads()
.then((previousUploads) => {
- // Found previous uploads so we select the first one.
- if (previousUploads.length) {
- upload.resumeFromPreviousUpload(previousUploads[0]);
+ // Only resume an upload whose stored metadata matches the current
+ // task and viewer, so we never append to another task's upload.
+ const resumable = previousUploads.find(
+ (previous) =>
+ (previous.metadata.taskId || "") === (taskId || "") &&
+ previous.metadata.viewerId === viewerData.id &&
+ previous.metadata.linkId === viewerData.linkId,
+ );
+ if (resumable) {
+ upload.resumeFromPreviousUpload(resumable);
}
upload.start();
diff --git a/package-lock.json b/package-lock.json
index 4988d71d..dc42157d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -69,9 +69,9 @@
"@tiptap/react": "^3.22.5",
"@tiptap/starter-kit": "^3.22.5",
"@tremor/react": "^3.18.7",
- "@trigger.dev/python": "4.5.0",
- "@trigger.dev/react-hooks": "4.5.0",
- "@trigger.dev/sdk": "4.5.0",
+ "@trigger.dev/python": "4.5.3",
+ "@trigger.dev/react-hooks": "4.5.3",
+ "@trigger.dev/sdk": "4.5.3",
"@tus/s3-store": "^1.9.1",
"@tus/server": "^1.10.2",
"@tus/utils": "^0.5.1",
@@ -167,7 +167,7 @@
"devDependencies": {
"@react-email/ui": "^6.3.2",
"@tailwindcss/forms": "^0.5.11",
- "@trigger.dev/build": "4.5.0",
+ "@trigger.dev/build": "4.5.3",
"@trivago/prettier-plugin-sort-imports": "^6.0.2",
"@types/bcryptjs": "^2.4.6",
"@types/cookie": "^0.6.0",
@@ -9232,13 +9232,13 @@
}
},
"node_modules/@trigger.dev/build": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/@trigger.dev/build/-/build-4.5.0.tgz",
- "integrity": "sha512-M7Xy518KN9MYOqQ08MBdar3xybQOdzWsST0zVLc65H1nbM7fG9LvOHyOraX6k8zyacAkLrLHP+MIAfmf5BNUEA==",
+ "version": "4.5.3",
+ "resolved": "https://registry.npmjs.org/@trigger.dev/build/-/build-4.5.3.tgz",
+ "integrity": "sha512-O4DtEgi2DYvopSpSApubrf4xajmarZI619LSB1IA5Bs93icIhkJqqQCQ1SHrh84NxJ46GTdpbUlBfE+jKokkrQ==",
"license": "MIT",
"dependencies": {
"@prisma/config": "^6.10.0",
- "@trigger.dev/core": "4.5.0",
+ "@trigger.dev/core": "4.5.3",
"mlly": "^1.7.1",
"pkg-types": "^1.1.3",
"resolve": "^1.22.8",
@@ -9250,9 +9250,9 @@
}
},
"node_modules/@trigger.dev/core": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/@trigger.dev/core/-/core-4.5.0.tgz",
- "integrity": "sha512-UZ6f96NUOjrRNIvMV7YRR1DHo9E3CUNqeRhHmzfqTsk8mtsOySoxHGhCte8mtsSqE4hvMsGtC8VNlawjKiC0tw==",
+ "version": "4.5.3",
+ "resolved": "https://registry.npmjs.org/@trigger.dev/core/-/core-4.5.3.tgz",
+ "integrity": "sha512-xtVvpQIDKIKWcWW4obdb5pXlhTxVKQL3ZvRlcY8K1LARlNhn++j3j0O1KZN7llVF5Rd7tAGGgkBE7948IGuYXA==",
"license": "MIT",
"dependencies": {
"@bugsnag/cuid": "^3.1.1",
@@ -9490,29 +9490,29 @@
}
},
"node_modules/@trigger.dev/python": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/@trigger.dev/python/-/python-4.5.0.tgz",
- "integrity": "sha512-OGI85vAiPVCAnJMQE38Wznkgv0Yhf3h0iGozsn0qj2LBbQfTaIKOL0ISi+oImKNZzoMwkGUdC5hZn4hCwE0TAg==",
+ "version": "4.5.3",
+ "resolved": "https://registry.npmjs.org/@trigger.dev/python/-/python-4.5.3.tgz",
+ "integrity": "sha512-IDjIXfpF0n4GkJ33QFz/XIbv7+csTs0ZPe4y6r/eNAozbfcO16XgFkqPu/nIipaYHYTiO6Ipa5iyCm+5YTeXrQ==",
"license": "MIT",
"dependencies": {
- "@trigger.dev/core": "4.5.0",
+ "@trigger.dev/core": "4.5.3",
"tinyexec": "^0.3.2"
},
"engines": {
"node": ">=18.20.0"
},
"peerDependencies": {
- "@trigger.dev/build": "^4.5.0",
- "@trigger.dev/sdk": "^4.5.0"
+ "@trigger.dev/build": "^4.5.3",
+ "@trigger.dev/sdk": "^4.5.3"
}
},
"node_modules/@trigger.dev/react-hooks": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/@trigger.dev/react-hooks/-/react-hooks-4.5.0.tgz",
- "integrity": "sha512-wndGE4soPxd1nZazziW6RwUO0l2xQppS2vYRCdDZd6TsZsahYUQ6YepXHEZe0GzPpmL1UEf4VVVUkhcJQ1jwyQ==",
+ "version": "4.5.3",
+ "resolved": "https://registry.npmjs.org/@trigger.dev/react-hooks/-/react-hooks-4.5.3.tgz",
+ "integrity": "sha512-3LDZdQIbUXaLAAyGjKq/JGiBCPQ1kGHp+TSfQWa5aWa5pWaHtZ47t7EIfdvWNCxOmsjNuC2Sf3rPm35Cin3xRQ==",
"license": "MIT",
"dependencies": {
- "@trigger.dev/core": "^4.5.0",
+ "@trigger.dev/core": "^4.5.3",
"swr": "^2.2.5"
},
"engines": {
@@ -9524,14 +9524,14 @@
}
},
"node_modules/@trigger.dev/sdk": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/@trigger.dev/sdk/-/sdk-4.5.0.tgz",
- "integrity": "sha512-6mBTtf3xf/t6c2UoTA3oH+fZ8lHAERejM4i+Ru6YIW14f+/4Conw0s7DUtxRu+9ZWcyv1KAep5KvBqPeD6Mj7Q==",
+ "version": "4.5.3",
+ "resolved": "https://registry.npmjs.org/@trigger.dev/sdk/-/sdk-4.5.3.tgz",
+ "integrity": "sha512-yzeeBk8V1px1fmOMmugXFlbkADyFnh3eJFRVuA3TKyUF4veZ1WgOWX7bzx0wBT5RnyLZmA6at/laXL8NmNmqaA==",
"license": "MIT",
"dependencies": {
"@opentelemetry/api": "1.9.1",
"@opentelemetry/semantic-conventions": "1.41.1",
- "@trigger.dev/core": "4.5.0",
+ "@trigger.dev/core": "4.5.3",
"chalk": "^5.2.0",
"cronstrue": "^2.21.0",
"debug": "^4.3.4",
@@ -13738,9 +13738,9 @@
}
},
"node_modules/es-module-lexer": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.0.tgz",
- "integrity": "sha512-KLdwQm2NvGLDkQDCGvmiQrhkd0JbMzXthwQAUgWjQuQdBLFa3eiBP5arXZyA+f8x+x7OXgud6bq2rxjGtHV2tw==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.1.tgz",
+ "integrity": "sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==",
"license": "MIT"
},
"node_modules/es-object-atoms": {
@@ -16287,9 +16287,9 @@
}
},
"node_modules/import-in-the-middle": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-3.3.0.tgz",
- "integrity": "sha512-v4+k+PLt4z6g2ydEcXhfinTJxfgKJDWOW0v0GZNA5n2qToHFObpH4nGLhJdwnXnX4T14oREx/M62dS9GkpmSbQ==",
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-3.3.1.tgz",
+ "integrity": "sha512-0rymlHSFLwZ0ixx8DaQkoIyZojJPY2a0K2nEYslhKJ6jIYO/m0IcCb7iQsFPmS7WmKwISZiIrv5Icstrw/CmqA==",
"license": "Apache-2.0",
"dependencies": {
"cjs-module-lexer": "^2.2.0",
@@ -23552,9 +23552,9 @@
}
},
"node_modules/systeminformation": {
- "version": "5.31.13",
- "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.13.tgz",
- "integrity": "sha512-iUJXJoKzm4vtLSeT3nwe2s9QjoJAxHg7wYJ0KaQ54Xy2u9jsTq0ULWQQ0+T72FXjX2XnGqubazNx9lUfng7ELw==",
+ "version": "5.31.16",
+ "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.16.tgz",
+ "integrity": "sha512-37NsFaeaqwYxanLgdJAGWj8OXIRgvSBsDXGhlC0uUoHyl9nf4HrNsZjqtQ9Gc99bj9FQpffzYccPVuQ6gpjfqg==",
"license": "MIT",
"os": [
"darwin",
diff --git a/package.json b/package.json
index 77f5fa15..4bfe490e 100644
--- a/package.json
+++ b/package.json
@@ -81,9 +81,9 @@
"@tiptap/react": "^3.22.5",
"@tiptap/starter-kit": "^3.22.5",
"@tremor/react": "^3.18.7",
- "@trigger.dev/python": "4.5.0",
- "@trigger.dev/react-hooks": "4.5.0",
- "@trigger.dev/sdk": "4.5.0",
+ "@trigger.dev/python": "4.5.3",
+ "@trigger.dev/react-hooks": "4.5.3",
+ "@trigger.dev/sdk": "4.5.3",
"@tus/s3-store": "^1.9.1",
"@tus/server": "^1.10.2",
"@tus/utils": "^0.5.1",
@@ -179,7 +179,7 @@
"devDependencies": {
"@react-email/ui": "^6.3.2",
"@tailwindcss/forms": "^0.5.11",
- "@trigger.dev/build": "4.5.0",
+ "@trigger.dev/build": "4.5.3",
"@trivago/prettier-plugin-sort-imports": "^6.0.2",
"@types/bcryptjs": "^2.4.6",
"@types/cookie": "^0.6.0",
@@ -222,4 +222,4 @@
"tar": "7.5.10",
"lodash": "4.18.1"
}
-}
+}
\ No newline at end of file
diff --git a/pages/api/file/tus-viewer/[[...file]].ts b/pages/api/file/tus-viewer/[[...file]].ts
index 16b22c68..b06fbce3 100644
--- a/pages/api/file/tus-viewer/[[...file]].ts
+++ b/pages/api/file/tus-viewer/[[...file]].ts
@@ -1,5 +1,6 @@
import type { NextApiRequest, NextApiResponse } from "next";
+import { isViewerAssigned } from "@/ee/features/request-lists/lib/assignments";
import { MultiRegionS3Store } from "@/ee/features/storage/s3-store";
import { CopyObjectCommand } from "@aws-sdk/client-s3";
import { Server } from "@tus/server";
@@ -25,6 +26,95 @@ const locker = new RedisLocker({
redisClient: lockerRedisClient,
});
+/**
+ * Validates a viewer upload and resolves the team the file belongs to.
+ *
+ * Shared by `namingFunction` and `onUploadCreate` so the same authorization is
+ * enforced when the transfer starts and when the upload record is created.
+ *
+ * Request List task uploads are gated by task assignment rather than the link's
+ * generic `enableUpload` toggle — mirroring `/api/links/[id]/upload` — so a file
+ * required by an assigned UPLOAD task can be sent even when the link/group does
+ * not otherwise allow visitor uploads. Throws when the upload is not permitted.
+ */
+async function resolveViewerUploadTeamId(metadata: {
+ teamId: string;
+ viewerId: string;
+ linkId: string;
+ dataroomId: string;
+ taskId?: string;
+}): Promise<string> {
+ const { teamId, viewerId, linkId, dataroomId, taskId } = metadata;
+
+ if (teamId !== "visitor-upload") {
+ throw new Error("Unauthorized to access this team");
+ }
+
+ const link = await prisma.link.findUnique({
+ where: {
+ id: linkId,
+ dataroomId: dataroomId || null,
+ },
+ select: { teamId: true, enableUpload: true },
+ });
+
+ if (!link || !link.teamId) {
+ throw new Error("Upload not allowed");
+ }
+
+ const viewer = await prisma.viewer.findUnique({
+ where: { id: viewerId },
+ select: {
+ teamId: true,
+ email: true,
+ groups: { select: { groupId: true } },
+ },
+ });
+
+ if (!viewer || viewer.teamId !== link.teamId) {
+ throw new Error("Unauthorized to access this team");
+ }
+
+ const isTaskUpload = typeof taskId === "string" && taskId.length > 0;
+
+ if (!link.enableUpload) {
+ if (!isTaskUpload) {
+ throw new Error("Upload not allowed");
+ }
+
+ const task = await prisma.task.findFirst({
+ where: { id: taskId, dataroomId },
+ select: {
+ type: true,
+ assignments: {
+ select: {
+ email: true,
+ viewerId: true,
+ groupId: true,
+ linkId: true,
+ },
+ },
+ },
+ });
+
+ const assigned =
+ !!task &&
+ task.type === "UPLOAD" &&
+ isViewerAssigned(task.assignments, {
+ viewerId,
+ email: viewer.email ?? null,
+ linkId,
+ groupIds: new Set(viewer.groups.map((g) => g.groupId)),
+ });
+
+ if (!assigned) {
+ throw new Error("Upload not allowed");
+ }
+ }
+
+ return link.teamId;
+}
+
const tusServer = new Server({
// `path` needs to match the route declared by the next file router
path: "/api/file/tus-viewer",
@@ -34,43 +124,26 @@ const tusServer = new Server({
datastore: new MultiRegionS3Store(),
async namingFunction(req, metadata) {
// Extract viewer data from metadata
- const { teamId, fileName, viewerId, linkId, dataroomId } = metadata as {
- teamId: string;
- fileName: string;
- viewerId: string;
- linkId: string;
- dataroomId: string;
- };
+ const { teamId, fileName, viewerId, linkId, dataroomId, taskId } =
+ metadata as {
+ teamId: string;
+ fileName: string;
+ viewerId: string;
+ linkId: string;
+ dataroomId: string;
+ taskId?: string;
+ };
// Validate the viewer exists and has permission
- let teamIdToUse = teamId;
+ let teamIdToUse: string;
try {
- if (teamId !== "visitor-upload") {
- throw new Error("Unauthorized to access this team");
- }
-
- const link = await prisma.link.findUnique({
- where: {
- id: linkId,
- dataroomId: dataroomId || null,
- },
- select: { teamId: true, enableUpload: true },
- });
-
- if (!link || !link.enableUpload || !link.teamId) {
- throw new Error("Upload not allowed");
- }
-
- const viewer = await prisma.viewer.findUnique({
- where: { id: viewerId },
- select: { teamId: true },
+ teamIdToUse = await resolveViewerUploadTeamId({
+ teamId,
+ viewerId,
+ linkId,
+ dataroomId,
+ taskId,
});
-
- if (!viewer || viewer.teamId !== link.teamId) {
- throw new Error("Unauthorized to access this team");
- }
-
- teamIdToUse = link.teamId;
} catch (error) {
console.error("Error validating viewer:", error);
throw new Error("Unauthorized");
@@ -100,42 +173,26 @@ const tusServer = new Server({
},
async onUploadCreate(req, res, upload) {
// Extract viewer data from metadata
- const { teamId, fileName, viewerId, linkId, dataroomId } =
+ const { teamId, viewerId, linkId, dataroomId, taskId } =
upload.metadata as {
teamId: string;
fileName: string;
viewerId: string;
dataroomId: string;
linkId: string;
+ taskId?: string;
};
// Validate the viewer exists and has permission
try {
- if (teamId !== "visitor-upload") {
- throw new Error("Unauthorized to access this team");
- }
-
- const link = await prisma.link.findUnique({
- where: {
- id: linkId,
- dataroomId: dataroomId || null,
- },
- select: { teamId: true, enableUpload: true },
- });
-
- if (!link || !link.enableUpload || !link.teamId) {
- throw new Error("Upload not allowed");
- }
-
- const viewer = await prisma.viewer.findUnique({
- where: { id: viewerId },
- select: { teamId: true },
+ await resolveViewerUploadTeamId({
+ teamId,
+ viewerId,
+ linkId,
+ dataroomId,
+ taskId,
});
- if (!viewer || viewer.teamId !== link.teamId) {
- throw new Error("Unauthorized to access this team");
- }
-
return res;
} catch (error) {
console.error("Error validating viewer:", error);
diff --git a/pages/api/teams/[teamId]/documents/[id]/download.ts b/pages/api/teams/[teamId]/documents/[id]/download.ts
new file mode 100644
index 00000000..f95b5a8f
--- /dev/null
+++ b/pages/api/teams/[teamId]/documents/[id]/download.ts
@@ -0,0 +1,106 @@
+import { NextApiRequest, NextApiResponse } from "next";
+
+import { getServerSession } from "next-auth/next";
+
+import { enforceDocumentMemberScope } from "@/lib/api/rbac/guard";
+import { getFile } from "@/lib/files/get-file";
+import prisma from "@/lib/prisma";
+import { CustomUser } from "@/lib/types";
+import { buildAttachmentDispositionForName, log } from "@/lib/utils";
+import { ensureFileExtension } from "@/lib/utils/get-content-type";
+
+import { authOptions } from "../../../../auth/[...nextauth]";
+
+export default async function handle(
+ req: NextApiRequest,
+ res: NextApiResponse,
+) {
+ if (req.method !== "POST") {
+ res.setHeader("Allow", ["POST"]);
+ return res.status(405).end(`Method ${req.method} Not Allowed`);
+ }
+
+ const session = await getServerSession(req, res, authOptions);
+ if (!session) {
+ return res.status(401).json({ message: "Unauthorized" });
+ }
+
+ const { id: documentId, teamId } = req.query as {
+ id: string;
+ teamId: string;
+ };
+ const userId = (session.user as CustomUser).id;
+
+ // Dataroom-scoped members may only download documents in their assigned rooms.
+ if (await enforceDocumentMemberScope({ userId, teamId, documentId, res })) {
+ return;
+ }
+
+ try {
+ const document = await prisma.document.findUnique({
+ where: { id: documentId, teamId },
+ select: {
+ name: true,
+ team: {
+ select: {
+ users: {
+ where: { userId },
+ select: { userId: true },
+ },
+ },
+ },
+ versions: {
+ where: { isPrimary: true },
+ select: {
+ type: true,
+ file: true,
+ originalFile: true,
+ storageType: true,
+ contentType: true,
+ },
+ take: 1,
+ },
+ },
+ });
+
+ if (!document || document.team.users.length === 0) {
+ return res.status(403).json({ message: "Access denied" });
+ }
+
+ const version = document.versions[0];
+ if (!version) {
+ return res.status(404).json({ message: "Document version not found" });
+ }
+
+ if (version.type === "notion") {
+ return res
+ .status(400)
+ .json({ message: "Notion documents cannot be downloaded." });
+ }
+
+ const desiredFileName = ensureFileExtension({
+ name: document.name,
+ contentType: version.contentType,
+ type: version.type,
+ });
+
+ const downloadUrl = await getFile({
+ type: version.storageType,
+ data: version.originalFile ?? version.file,
+ isDownload: true,
+ responseContentDisposition: desiredFileName
+ ? buildAttachmentDispositionForName(desiredFileName)
+ : undefined,
+ });
+
+ return res.status(200).json({ downloadUrl, fileName: desiredFileName });
+ } catch (error) {
+ log({
+ message: "Error preparing task upload download",
+ type: "error",
+ mention: true,
+ });
+ console.error(error);
+ return res.status(500).json({ message: "Internal server error" });
+ }
+}
diff --git a/prisma/migrations/20260709071336_add_task_id_to_document_upload/migration.sql b/prisma/migrations/20260709071336_add_task_id_to_document_upload/migration.sql
new file mode 100644
index 00000000..f3ad69ab
--- /dev/null
+++ b/prisma/migrations/20260709071336_add_task_id_to_document_upload/migration.sql
@@ -0,0 +1,17 @@
+-- AlterTable
+ALTER TABLE "DocumentUpload" ADD COLUMN "taskId" TEXT;
+
+-- CreateIndex
+CREATE INDEX "DocumentUpload_taskId_idx" ON "DocumentUpload"("taskId");
+
+-- AddForeignKey
+ALTER TABLE "DocumentUpload" ADD CONSTRAINT "DocumentUpload_taskId_fkey" FOREIGN KEY ("taskId") REFERENCES "Task"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AlterTable
+ALTER TABLE "Task" ADD COLUMN "uploadFolderId" TEXT;
+
+-- CreateIndex
+CREATE INDEX "Task_uploadFolderId_idx" ON "Task"("uploadFolderId");
+
+-- AddForeignKey
+ALTER TABLE "Task" ADD CONSTRAINT "Task_uploadFolderId_fkey" FOREIGN KEY ("uploadFolderId") REFERENCES "DataroomFolder"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/prisma/schema/dataroom.prisma b/prisma/schema/dataroom.prisma
index eb80e531..d5444b83 100644
--- a/prisma/schema/dataroom.prisma
+++ b/prisma/schema/dataroom.prisma
@@ -137,11 +137,20 @@ model Task {
teamId String
team Team @relation(fields: [teamId], references: [id], onDelete: Cascade)
+ // Optional destination folder for UPLOAD tasks: visitor files for this request
+ // are forced into this folder. Null = no per-task target (uploads fall back to
+ // the link's upload allow-list / root). SetNull so deleting the folder just
+ // clears the target rather than the task.
+ uploadFolderId String?
+ uploadFolder DataroomFolder? @relation("TaskUploadFolder", fields: [uploadFolderId], references: [id], onDelete: SetNull)
+
createdByUserId String?
createdByUser User? @relation("createdTasks", fields: [createdByUserId], references: [id], onDelete: SetNull)
assignments TaskAssignment[]
activities TaskActivity[]
+ // Files uploaded by visitors to fulfill this task (UPLOAD type).
+ uploads DocumentUpload[]
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
@@ -149,6 +158,7 @@ model Task {
@@index([taskListId])
@@index([dataroomId])
@@index([teamId])
+ @@index([uploadFolderId])
@@index([taskListId, orderIndex])
}
@@ -188,7 +198,7 @@ model TaskActivity {
id String @id @default(cuid())
taskId String
task Task @relation(fields: [taskId], references: [id], onDelete: Cascade)
- type String // CREATED | ASSIGNED | STATUS_CHANGED | COMMENT (validated by Zod)
+ type String // CREATED | ASSIGNED | STATUS_CHANGED | UPLOADED | COMMENT (validated by Zod)
comment String?
fromStatus String?
toStatus String?
@@ -252,6 +262,8 @@ model DataroomFolder {
documents DataroomDocument[]
childFolders DataroomFolder[] @relation("SubFolders")
parentFolder DataroomFolder? @relation("SubFolders", fields: [parentId], references: [id], onDelete: SetNull)
+ // Request-list tasks that force uploads into this folder.
+ uploadTasks Task[] @relation("TaskUploadFolder")
dataroomId String
dataroom Dataroom @relation(fields: [dataroomId], references: [id], onDelete: Cascade)
orderIndex Int?
diff --git a/prisma/schema/document.prisma b/prisma/schema/document.prisma
index 2c08f266..dacc2f82 100644
--- a/prisma/schema/document.prisma
+++ b/prisma/schema/document.prisma
@@ -135,6 +135,11 @@ model DocumentUpload {
dataroomDocumentId String?
dataroomDocument DataroomDocument? @relation(fields: [dataroomDocumentId], references: [id], onDelete: SetNull)
+ // Optional Request List task this upload fulfills. Set when a visitor uploads
+ // directly from an UPLOAD task card so admins can see the file on the request.
+ taskId String?
+ task Task? @relation(fields: [taskId], references: [id], onDelete: SetNull)
+
// Additional metadata
originalFilename String?
fileSize BigInt?
@@ -152,6 +157,7 @@ model DocumentUpload {
@@index([teamId])
@@index([dataroomId])
@@index([dataroomDocumentId])
+ @@index([taskId])
}
model PendingDocumentUpload {