Skip to content

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

refactor: send document data only upon successful view

Marc Seitz7cbb76cf0b2a
diff --git a/pages/api/links/[id]/index.ts b/pages/api/links/[id]/index.ts
index c8cc7a06..f22ad35d 100644
--- a/pages/api/links/[id]/index.ts
+++ b/pages/api/links/[id]/index.ts
@@ -22,7 +22,7 @@ export default async function handle(
expiresAt: true,
emailProtected: true,
password: true,
- document: { select: { id: true, name: true, file: true } },
+ document: { select: { id: true } },
},
});
diff --git a/pages/api/views.ts b/pages/api/views.ts
index 29d9c6ef..8e93e560 100644
--- a/pages/api/views.ts
+++ b/pages/api/views.ts
@@ -63,9 +63,16 @@ export default async function handle(
viewerEmail: email,
documentId: documentId,
},
+ include: {
+ document: {
+ select: {
+ file: true
+ }
+ }
+ }
});
- res.status(200).json({ message: "View recorded", viewId: newView.id });
+ res.status(200).json({ message: "View recorded", viewId: newView.id, file: newView.document.file });
} catch (error) {
log(`Failed to record view for ${linkId}. Error: \n\n ${error}`);
res.status(500).json({ message: (error as Error).message });
diff --git a/pages/view/[linkId].tsx b/pages/view/[linkId].tsx
index 828d41db..89bc6e34 100644
--- a/pages/view/[linkId].tsx
+++ b/pages/view/[linkId].tsx
@@ -1,11 +1,11 @@
import React, { useEffect, useRef, useState } from "react";
-import EmailForm from "@/components/EmailForm";
import { getExtension } from "@/lib/utils";
import { useLink } from "@/lib/swr/use-link";
import ErrorPage from "next/error";
import PDFViewer from "@/components/PDFViewer";
import AccessForm from "@/components/view/access-form";
import { useSession } from "next-auth/react";
+
import { toast } from "sonner";
export const DEFAULT_ACCESS_FORM_DATA = {
@@ -18,13 +18,19 @@ export type DEFAULT_ACCESS_FORM_TYPE = {
password: string | null;
};
+type DEFAULT_DOCUMENT_VIEW_TYPE = {
+ viewId: string;
+ file: string;
+}
+
export default function DocumentView() {
const { link, error } = useLink();
const { data: session } = useSession();
const [submitted, setSubmitted] = useState<boolean>(false);
- const [viewId, setViewId] = useState<string>("");
+ // const [viewId, setViewId] = useState<string>("");
const hasInitiatedSubmit = useRef(false);
+ const [viewData, setViewData] = useState<DEFAULT_DOCUMENT_VIEW_TYPE>({viewId: "", file: ""})
const [data, setData] = useState<DEFAULT_ACCESS_FORM_TYPE>(
DEFAULT_ACCESS_FORM_DATA
@@ -48,6 +54,7 @@ export default function DocumentView() {
return <div>Loading...</div>;
}
+
const { document, expiresAt, emailProtected, password: linkPassword } = link;
// Check if link is expired
@@ -70,8 +77,8 @@ export default function DocumentView() {
});
if (response.ok) {
- const { viewId } = await response.json();
- setViewId(viewId);
+ const { viewId, file } = await response.json() as { viewId: string, file: string};
+ setViewData({ viewId, file });
setSubmitted(true);
} else {
const { message } = await response.json();
@@ -85,7 +92,6 @@ export default function DocumentView() {
};
if ((!submitted && emailProtected) || (!submitted && linkPassword)) {
- // return <EmailForm onSubmitHandler={handleSubmit} data={data} setData={setData} />;
return (
<AccessForm
onSubmitHandler={handleSubmit}
@@ -108,7 +114,7 @@ export default function DocumentView() {
}
// get the file extension
- const extension = getExtension(document.file);
+ const extension = getExtension(viewData.file);
if (
extension.includes(".docx") ||
@@ -122,7 +128,7 @@ export default function DocumentView() {
<div className="h-screen bg-gray-900">
<iframe
className="w-full h-full"
- src={`https://view.officeapps.live.com/op/embed.aspx?src=${document.file}`}
+ src={`https://view.officeapps.live.com/op/embed.aspx?src=${viewData.file}`}
></iframe>
</div>
);
@@ -136,15 +142,15 @@ export default function DocumentView() {
) {
return (
<div className="h-screen bg-gray-900">
- <img className="w-full h-full" src={document.file} />
+ <img className="w-full h-full" src={viewData.file} />
</div>
);
}
return (
<div className="bg-gray-950">
<PDFViewer
- file={document.file}
- viewId={viewId}
+ file={viewData.file}
+ viewId={viewData.viewId}
linkId={link.id}
documentId={document.id}
/>