Skip to content

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

fix: pass documentId through chart data and add rate limiting to thumbnail API

Marc Seitz1c7022ff3cef
diff --git a/components/charts/bar-chart-tooltip.tsx b/components/charts/bar-chart-tooltip.tsx
index 258e536e..13e7dafb 100644
--- a/components/charts/bar-chart-tooltip.tsx
+++ b/components/charts/bar-chart-tooltip.tsx
@@ -11,16 +11,19 @@ const CustomTooltip = ({
payload: any;
active: boolean | undefined;
}) => {
- const router = useRouter(); // Call useRouter at the top level
- const documentId = router.query.id as string;
+ const router = useRouter();
+ const routerDocumentId = router.query.id as string;
- // Default pageNumber to 0 or a sensible default if payload is not available
const pageNumber =
payload && payload.length > 0 ? parseInt(payload[0].payload.pageNumber) : 0;
- // Default versionNumber to 0 or a sensible default if payload is not available
+ const documentId =
+ payload && payload.length > 0 && payload[0].payload.documentId
+ ? (payload[0].payload.documentId as string)
+ : routerDocumentId;
+
const versionNumber =
- payload && payload.length > 0
+ payload && payload.length > 0 && !isNaN(parseInt(payload[0].payload.versionNumber))
? parseInt(payload[0].payload.versionNumber)
: 1;
const { data, error } = useDocumentThumbnail(
diff --git a/components/charts/bar-chart.tsx b/components/charts/bar-chart.tsx
index 109c0de5..1fd9ea80 100644
--- a/components/charts/bar-chart.tsx
+++ b/components/charts/bar-chart.tsx
@@ -24,13 +24,18 @@ const renameDummyDurationKey = (data: Data[]): TransformedData[] => {
}, [] as TransformedData[]);
};
-const renameSumDurationKey = (data: SumData[], versionNumber?: number) => {
+const renameSumDurationKey = (
+ data: SumData[],
+ versionNumber?: number,
+ documentId?: string,
+) => {
return data.map((item) => {
return {
...item,
"Time spent per page": item.sum_duration,
sum_duration: undefined,
- versionNumber: versionNumber,
+ versionNumber: versionNumber ?? 1,
+ documentId: documentId,
};
});
};
@@ -64,16 +69,18 @@ export default function BarChartComponent({
isSum = false,
isDummy = false,
versionNumber,
+ documentId,
}: {
data: any;
isSum?: boolean;
isDummy?: boolean;
versionNumber?: number;
+ documentId?: string;
}) {
const [, setValue] = useState<any>(null);
if (isSum) {
- const renamedData = renameSumDurationKey(data, versionNumber);
+ const renamedData = renameSumDurationKey(data, versionNumber, documentId);
return (
<BarChart
diff --git a/pages/api/jobs/get-thumbnail.ts b/pages/api/jobs/get-thumbnail.ts
index 6e7c1a97..9e090599 100644
--- a/pages/api/jobs/get-thumbnail.ts
+++ b/pages/api/jobs/get-thumbnail.ts
@@ -3,6 +3,8 @@ import { NextApiRequest, NextApiResponse } from "next";
import { getServerSession } from "next-auth";
import { getFileForDocumentPage } from "@/lib/documents/get-file-helper";
+import { ratelimit } from "@/lib/redis";
+import { CustomUser } from "@/lib/types";
import { authOptions } from "../auth/[...nextauth]";
@@ -10,7 +12,6 @@ export default async function handle(
req: NextApiRequest,
res: NextApiResponse,
) {
- // We only allow GET requests
if (req.method !== "GET") {
res.status(405).json({ message: "Method Not Allowed" });
return;
@@ -21,6 +22,13 @@ export default async function handle(
return res.status(401).end("Unauthorized");
}
+ const { success } = await ratelimit(150, "1 m").limit(
+ `get-thumbnail:${(session.user as CustomUser).id}`,
+ );
+ if (!success) {
+ return res.status(429).json({ message: "Too many requests" });
+ }
+
const { documentId, pageNumber, versionNumber } = req.query as {
documentId: string;
pageNumber: string;