Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add preview mode for links
Marc Seitze289af44c719
diff --git a/components/NotionPage.tsx b/components/NotionPage.tsxindex 07295d56..fa890c9d 100644--- a/components/NotionPage.tsx+++ b/components/NotionPage.tsx@@ -29,10 +29,11 @@ export const NotionPage = ({brand,dataroomId,setDocumentData,+ isPreview,}: {recordMap: ExtendedRecordMap;rootPageId?: string;- viewId: string;+ viewId?: string;linkId: string;documentId: string;versionNumber: number;@@ -40,6 +41,7 @@ export const NotionPage = ({brand?: Partial<Brand> | Partial<DataroomBrand> | null;dataroomId?: string;setDocumentData?: React.Dispatch<React.SetStateAction<TDocumentData | null>>;+ isPreview?: boolean;}) => {const [pageNumber, setPageNumber] = useState<number>(1); // start on first pageconst [maxScrollPercentage, setMaxScrollPercentage] = useState<number>(0);@@ -74,6 +76,8 @@ export const NotionPage = ({}, []);async function trackPageView(duration: number = 0) {+ if (isPreview) return;+await fetch("/api/record_view", {method: "POST",body: JSON.stringify({diff --git a/components/links/links-table.tsx b/components/links/links-table.tsxindex 1bc77d7c..f18aa046 100644--- a/components/links/links-table.tsx+++ b/components/links/links-table.tsx@@ -4,7 +4,7 @@ import { useState } from "react";import { useTeam } from "@/context/team-context";import { DocumentVersion } from "@prisma/client";-import { Settings2Icon } from "lucide-react";+import { EyeIcon, Settings2Icon } from "lucide-react";import { toast } from "sonner";import { mutate } from "swr";@@ -106,6 +106,30 @@ export default function LinksTable({}, 0);};+ const handlePreviewLink = async (link: LinkWithViews) => {+ if (link.domainId && plan === "free") {+ toast.error("You need to upgrade to preview this link");+ return;+ }++ const response = await fetch(`/api/links/${link.id}/preview`, {+ method: "POST",+ headers: {+ "Content-Type": "application/json",+ },+ });++ if (!response.ok) {+ toast.error("Failed to generate preview link");+ return;+ }++ const { previewToken } = await response.json();+ const previewLink = `https://${process.env.NEXT_PUBLIC_ROOT_DOMAIN}/view/${link.id}?previewToken=${previewToken}`;++ window.open(previewLink, "_blank");+ };+const handleDuplicateLink = async (link: LinkWithViews) => {setIsLoading(true);@@ -186,8 +210,6 @@ export default function LinksTable({const hasFreePlan = plan === "free";- console.log("links", links);-return (<><div className="w-full">@@ -274,16 +296,25 @@ export default function LinksTable({</button>)}</div>- <Button- variant="link"- size="icon"- className="group h-7 w-8"- onClick={() => handleEditLink(link)}- title="Edit link"- >- <span className="sr-only">Edit link</span>- <Settings2Icon className="h-5 w-5 text-gray-400 group-hover:text-gray-500" />- </Button>+ <Button+ variant={"link"}+ size={"icon"}+ className="group h-7 w-8"+ onClick={() => handlePreviewLink(link)}+ >+ <span className="sr-only">Preview link</span>+ <EyeIcon className="h-5 w-5 text-gray-400 group-hover:text-gray-500" />+ </Button>+ <Button+ variant="link"+ size="icon"+ className="group h-7 w-8"+ onClick={() => handleEditLink(link)}+ title="Edit link"+ >+ <span className="sr-only">Edit link</span>+ <Settings2Icon className="h-5 w-5 text-gray-400 group-hover:text-gray-500" />+ </Button></TableCell><TableCell><CollapsibleTriggerdiff --git a/components/view/DataroomViewer.tsx b/components/view/DataroomViewer.tsxindex d6ef46ee..6ec2e9c6 100644--- a/components/view/DataroomViewer.tsx+++ b/components/view/DataroomViewer.tsx@@ -55,9 +55,10 @@ export default function DataroomViewer({setViewType,setDocumentData,setDataroomVerified,+ isPreview,}: {brand: Partial<DataroomBrand>;- viewId: string;+ viewId?: string;linkId: string;dataroomViewId: string;dataroom: any;@@ -67,6 +68,7 @@ export default function DataroomViewer({>;setDocumentData: React.Dispatch<React.SetStateAction<TDocumentData | null>>;setDataroomVerified: React.Dispatch<React.SetStateAction<boolean>>;+ isPreview?: boolean;}) {const router = useRouter();const [folderId, setFolderId] = useState<string | null>(null);@@ -107,6 +109,7 @@ export default function DataroomViewer({viewId={viewId}dataroom={dataroom}allowDownload={allowDownload}+ isPreview={isPreview}/><divstyle={{ height: "calc(100vh - 64px)" }}diff --git a/components/view/PagesViewerNew.tsx b/components/view/PagesViewerNew.tsxindex 593c7c92..eb2020a6 100644--- a/components/view/PagesViewerNew.tsx+++ b/components/view/PagesViewerNew.tsx@@ -35,7 +35,7 @@ const DEFAULT_PRELOADED_IMAGES_NUM = 5;const trackPageView = async (data: {linkId: string;documentId: string;- viewId: string;+ viewId?: string;duration: number;pageNumber: number;versionNumber: number;@@ -43,6 +43,7 @@ const trackPageView = async (data: {setViewedPages?: React.Dispatch<React.SetStateAction<{ pageNumber: number; duration: number }[]>>;+ isPreview?: boolean;}) => {data.setViewedPages &&data.setViewedPages((prevViewedPages) =>@@ -52,6 +53,10 @@ const trackPageView = async (data: {: page,),);++ // If the view is a preview, do not track the view+ if (data.isPreview) return;+await fetch("/api/record_view", {method: "POST",body: JSON.stringify(data),@@ -81,11 +86,12 @@ export default function PagesViewer({feedback,isVertical = false,viewerEmail,+ isPreview,}: {pages: { file: string; pageNumber: string; embeddedLinks: string[] }[];linkId: string;documentId: string;- viewId: string;+ viewId?: string;assistantEnabled?: boolean;allowDownload: boolean;feedbackEnabled: boolean;@@ -104,6 +110,7 @@ export default function PagesViewer({} | null;isVertical?: boolean;viewerEmail?: string;+ isPreview?: boolean;}) {const router = useRouter();const { status: sessionStatus } = useSession();@@ -181,6 +188,7 @@ export default function PagesViewer({versionNumber,dataroomId,setViewedPages,+ isPreview,});}}@@ -207,6 +215,7 @@ export default function PagesViewer({versionNumber,dataroomId,setViewedPages,+ isPreview,});}}, [pageNumber, numPages]);@@ -224,6 +233,7 @@ export default function PagesViewer({versionNumber,dataroomId,setViewedPages,+ isPreview,});}};@@ -245,10 +255,9 @@ export default function PagesViewer({useEffect(() => {// Remove token and email query parameters on component mount- const removeQueryParams = () => {+ const removeQueryParams = (queries: string[]) => {const currentQuery = { ...router.query };- delete currentQuery.token;- delete currentQuery.email;+ queries.map((query) => delete currentQuery[query]);router.replace({@@ -261,7 +270,7 @@ export default function PagesViewer({};if (!dataroomId && router.query.token) {- removeQueryParams();+ removeQueryParams(["token", "email"]);}}, []); // Run once on mount@@ -309,6 +318,7 @@ export default function PagesViewer({versionNumber,dataroomId,setViewedPages,+ isPreview,});setPageNumber(currentPage);pageNumberRef.current = currentPage;@@ -330,6 +340,7 @@ export default function PagesViewer({versionNumber,dataroomId,setViewedPages,+ isPreview,});setPageNumber(currentPage);pageNumberRef.current = currentPage;@@ -354,6 +365,7 @@ export default function PagesViewer({versionNumber,dataroomId,setViewedPages,+ isPreview,});setPageNumber(currentPage);pageNumberRef.current = currentPage;@@ -375,6 +387,7 @@ export default function PagesViewer({versionNumber,dataroomId,setViewedPages,+ isPreview,});setPageNumber(currentPage);pageNumberRef.current = currentPage;@@ -452,6 +465,7 @@ export default function PagesViewer({versionNumber,dataroomId,setViewedPages,+ isPreview,});if (isVertical) {@@ -500,6 +514,7 @@ export default function PagesViewer({versionNumber,dataroomId,setViewedPages,+ isPreview,});if (isVertical) {@@ -602,6 +617,7 @@ export default function PagesViewer({documentRefs={pinchRefs}isVertical={isVertical}isMobile={isMobile}+ isPreview={isPreview}/><divstyle={{ height: "calc(100dvh - 64px)" }}diff --git a/components/view/dataroom/dataroom-view.tsx b/components/view/dataroom/dataroom-view.tsxindex 228d274c..c703b36f 100644--- a/components/view/dataroom/dataroom-view.tsx+++ b/components/view/dataroom/dataroom-view.tsx@@ -46,7 +46,8 @@ export type TDocumentData = {};export type DEFAULT_DOCUMENT_VIEW_TYPE = {- viewId: string;+ viewId?: string;+ isPreview?: boolean;dataroomViewId?: string;file?: string | null;pages?:@@ -66,6 +67,7 @@ export default function DataroomView({token,verifiedEmail,useAdvancedExcelViewer,+ previewToken,}: {link: LinkWithDataroom;userEmail: string | null | undefined;@@ -75,6 +77,7 @@ export default function DataroomView({token?: string;verifiedEmail?: string;useAdvancedExcelViewer?: boolean;+ previewToken?: string;}) {const {linkType,@@ -130,6 +133,7 @@ export default function DataroomView({dataroomViewId: viewData.dataroomViewId ?? null,viewType: viewType,useAdvancedExcelViewer,+ previewToken,}),});@@ -140,8 +144,15 @@ export default function DataroomView({setVerificationRequested(true);setIsLoading(false);} else {- const { viewId, file, pages, notionData, sheetData, fileType } =- fetchData as DEFAULT_DOCUMENT_VIEW_TYPE;+ const {+ viewId,+ file,+ pages,+ notionData,+ sheetData,+ fileType,+ isPreview,+ } = fetchData as DEFAULT_DOCUMENT_VIEW_TYPE;plausible("dataroomViewed"); // track the eventanalytics.identify(userEmail ?? verifiedEmail ?? data.email ?? undefined,@@ -163,6 +174,7 @@ export default function DataroomView({notionData,sheetData,fileType,+ isPreview,}));setSubmitted(true);setVerificationRequested(false);@@ -269,6 +281,7 @@ export default function DataroomView({<NotionPagerecordMap={viewData.notionData.recordMap}viewId={viewData.viewId}+ isPreview={viewData.isPreview}linkId={link.id}documentId={documentData.id}documentName={documentData.name}@@ -283,6 +296,7 @@ export default function DataroomView({<ExcelViewerlinkId={link.id}viewId={viewData.viewId}+ isPreview={viewData.isPreview}documentId={documentData.id}documentName={documentData.name}versionNumber={documentData.documentVersionNumber}@@ -297,6 +311,7 @@ export default function DataroomView({<AdvancedExcelViewerlinkId={link.id}viewId={viewData.viewId}+ isPreview={viewData.isPreview}documentId={documentData.id}documentName={documentData.name}versionNumber={documentData.documentVersionNumber}@@ -312,6 +327,7 @@ export default function DataroomView({<PagesViewerNewpages={viewData.pages}viewId={viewData.viewId}+ isPreview={viewData.isPreview}linkId={link.id}documentId={documentData.id}documentName={documentData.name}@@ -334,6 +350,7 @@ export default function DataroomView({<DataroomViewerbrand={brand!}viewId={viewData.viewId}+ isPreview={viewData.isPreview}linkId={link.id}dataroomViewId={viewData.dataroomViewId!}dataroom={dataroom}diff --git a/components/view/dataroom/nav-dataroom.tsx b/components/view/dataroom/nav-dataroom.tsxindex 6c088303..6e12d8af 100644--- a/components/view/dataroom/nav-dataroom.tsx+++ b/components/view/dataroom/nav-dataroom.tsx@@ -36,6 +36,7 @@ export default function DataroomNav({isDataroom,setDocumentData,dataroom,+ isPreview,}: {pageNumber?: number;numPages?: number;@@ -49,11 +50,12 @@ export default function DataroomNav({isDataroom?: boolean;setDocumentData?: React.Dispatch<React.SetStateAction<TDocumentData | null>>;dataroom?: any;+ isPreview?: boolean;}) {const [loading, setLoading] = useState<boolean>(false);const downloadDataroom = async () => {- if (!allowDownload || type === "notion") return;+ if (!allowDownload || type === "notion" || isPreview) return;setLoading(true);try {toast.promise(diff --git a/components/view/document-view.tsx b/components/view/document-view.tsxindex e59c702a..0ac2647f 100644--- a/components/view/document-view.tsx+++ b/components/view/document-view.tsx@@ -27,13 +27,14 @@ type SheetData = {};export type DEFAULT_DOCUMENT_VIEW_TYPE = {- viewId: string;+ viewId?: string;file?: string | null;pages?:| { file: string; pageNumber: string; embeddedLinks: string[] }[]| null;sheetData?: SheetData[] | null;fileType?: string;+ isPreview?: boolean;};export default function DocumentView({@@ -48,6 +49,7 @@ export default function DocumentView({showPoweredByBanner,showAccountCreationSlide,useAdvancedExcelViewer,+ previewToken,}: {link: LinkWithDocument;userEmail: string | null | undefined;@@ -63,6 +65,7 @@ export default function DocumentView({showPoweredByBanner?: boolean;showAccountCreationSlide?: boolean;useAdvancedExcelViewer?: boolean;+ previewToken?: string;}) {const {document,@@ -107,6 +110,7 @@ export default function DocumentView({token: token ?? null,verifiedEmail: verifiedEmail ?? null,useAdvancedExcelViewer,+ previewToken,}),});@@ -117,7 +121,7 @@ export default function DocumentView({setVerificationRequested(true);setIsLoading(false);} else {- const { viewId, file, pages, sheetData, fileType } =+ const { viewId, file, pages, sheetData, fileType, isPreview } =fetchData as DEFAULT_DOCUMENT_VIEW_TYPE;plausible("documentViewed"); // track the eventanalytics.identify(@@ -130,7 +134,7 @@ export default function DocumentView({viewerId: viewId,viewerEmail: data.email ?? verifiedEmail ?? userEmail,});- setViewData({ viewId, file, pages, sheetData, fileType });+ setViewData({ viewId, file, pages, sheetData, fileType, isPreview });setSubmitted(true);setVerificationRequested(false);setIsLoading(false);diff --git a/components/view/nav.tsx b/components/view/nav.tsxindex 426adc10..6cfd18ef 100644--- a/components/view/nav.tsx+++ b/components/view/nav.tsx@@ -56,6 +56,7 @@ export default function Nav({documentRefs,isVertical,isMobile,+ isPreview,}: {pageNumber?: number;numPages?: number;@@ -72,9 +73,10 @@ export default function Nav({documentRefs?: MutableRefObject<(ReactZoomPanPinchContentRef | null)[]>;isVertical?: boolean;isMobile?: boolean;+ isPreview?: boolean;}) {const downloadFile = async () => {- if (!allowDownload || type === "notion") return;+ if (!allowDownload || type === "notion" || isPreview) return;try {const response = await fetch(`/api/links/download`, {method: "POST",diff --git a/components/view/view-data.tsx b/components/view/view-data.tsxindex c88c9000..410845cb 100644--- a/components/view/view-data.tsx+++ b/components/view/view-data.tsx@@ -46,6 +46,7 @@ export default function ViewData({recordMap={notionData.recordMap}// rootPageId={notionData.rootNotionPageId}viewId={viewData.viewId}+ isPreview={viewData.isPreview}linkId={link.id}documentId={document.id}versionNumber={document.versions[0].versionNumber}@@ -55,6 +56,7 @@ export default function ViewData({<ExcelViewerlinkId={link.id}viewId={viewData.viewId}+ isPreview={viewData.isPreview}documentId={document.id}documentName={document.name}versionNumber={document.versions[0].versionNumber}@@ -65,6 +67,7 @@ export default function ViewData({<AdvancedExcelViewerlinkId={link.id}viewId={viewData.viewId}+ isPreview={viewData.isPreview}documentId={document.id}documentName={document.name}versionNumber={document.versions[0].versionNumber}@@ -76,6 +79,7 @@ export default function ViewData({<PagesViewerNewpages={viewData.pages}viewId={viewData.viewId}+ isPreview={viewData.isPreview}linkId={link.id}documentId={document.id}assistantEnabled={document.assistantEnabled}@@ -95,6 +99,7 @@ export default function ViewData({<PDFViewerfile={viewData.file}viewId={viewData.viewId}+ isPreview={viewData.isPreview}linkId={link.id}documentId={document.id}name={document.name}diff --git a/components/view/viewer/advanced-excel-viewer.tsx b/components/view/viewer/advanced-excel-viewer.tsxindex c04cff6f..7840d83d 100644--- a/components/view/viewer/advanced-excel-viewer.tsx+++ b/components/view/viewer/advanced-excel-viewer.tsx@@ -8,12 +8,16 @@ import Nav from "../nav";const trackPageView = async (data: {linkId: string;documentId: string;- viewId: string;+ viewId?: string;duration: number;pageNumber: number;versionNumber: number;dataroomId?: string;+ isPreview?: boolean;}) => {+ // If the view is a preview, do not track the view+ if (data.isPreview) return;+await fetch("/api/record_view", {method: "POST",body: JSON.stringify(data),@@ -34,9 +38,10 @@ export default function AdvancedExcelViewer({brand,dataroomId,setDocumentData,+ isPreview,}: {linkId: string;- viewId: string;+ viewId?: string;documentId: string;documentName: string;versionNumber: number;@@ -45,6 +50,7 @@ export default function AdvancedExcelViewer({brand?: Partial<Brand> | Partial<DataroomBrand> | null;dataroomId?: string;setDocumentData?: React.Dispatch<React.SetStateAction<TDocumentData | null>>;+ isPreview?: boolean;}) {const [pageNumber, setPageNumber] = useState<number>(1); // start on first pageconst [maxScrollPercentage, setMaxScrollPercentage] = useState<number>(0);@@ -70,6 +76,7 @@ export default function AdvancedExcelViewer({pageNumber,versionNumber,dataroomId,+ isPreview,});}}@@ -88,6 +95,7 @@ export default function AdvancedExcelViewer({pageNumber,versionNumber,dataroomId,+ isPreview,}); // Also capture duration if component unmounts while visible}document.removeEventListener("visibilitychange", handleVisibilityChange);diff --git a/components/view/viewer/excel-viewer.tsx b/components/view/viewer/excel-viewer.tsxindex 5535b127..ec304f7d 100644--- a/components/view/viewer/excel-viewer.tsx+++ b/components/view/viewer/excel-viewer.tsx@@ -22,12 +22,16 @@ type SheetData = {const trackPageView = async (data: {linkId: string;documentId: string;- viewId: string;+ viewId?: string;duration: number;pageNumber: number;versionNumber: number;dataroomId?: string;+ isPreview?: boolean;}) => {+ // If the view is a preview, do not track the view+ if (data.isPreview) return;+await fetch("/api/record_view", {method: "POST",body: JSON.stringify(data),@@ -49,7 +53,7 @@ export default function ExcelViewer({setDocumentData,}: {linkId: string;- viewId: string;+ viewId?: string;documentId: string;documentName: string;versionNumber: number;@@ -57,6 +61,7 @@ export default function ExcelViewer({brand?: Partial<Brand> | Partial<DataroomBrand> | null;dataroomId?: string;setDocumentData?: React.Dispatch<React.SetStateAction<TDocumentData | null>>;+ isPreview?: boolean;}) {const [availableWidth, setAvailableWidth] = useState<number>(200);const [availableHeight, setAvailableHeight] = useState<number>(200);@@ -222,11 +227,11 @@ export default function ExcelViewer({/><divstyle={{ height: "calc(100dvh - 64px)" }}- className="mx-2 flex h-screen flex-col sm:mx-6 lg:mx-8"+ className="mx-2 flex h-dvh flex-col sm:mx-6 lg:mx-8"ref={containerRef}><div className="" ref={hotRef}></div>- <div className="flex max-w-fit divide-x divide-gray-200 overflow-x-scroll whitespace-nowrap rounded-b-sm bg-[#f0f0f0] px-1 ">+ <div className="flex max-w-fit divide-x divide-gray-200 overflow-x-scroll whitespace-nowrap rounded-b-sm bg-[#f0f0f0] px-1">{sheetData.map((sheet, index) => (<div className="px-1" key={sheet.sheetName}><Buttondiff --git a/lib/id-helper.ts b/lib/id-helper.tsindex 3d1a4f2e..8a484893 100644--- a/lib/id-helper.ts+++ b/lib/id-helper.ts@@ -39,4 +39,5 @@ export const newId = new IdGenerator({doc: "doc",page: "page",dataroom: "dr",+ preview: "preview",}).id;diff --git a/pages/api/links/[id]/preview.ts b/pages/api/links/[id]/preview.tsnew file mode 100644index 00000000..84163b38--- /dev/null+++ b/pages/api/links/[id]/preview.ts@@ -0,0 +1,43 @@+import { NextApiRequest, NextApiResponse } from "next";++import { getServerSession } from "next-auth/next";++import { newId } from "@/lib/id-helper";+import prisma from "@/lib/prisma";+import { CustomUser } from "@/lib/types";++import { authOptions } from "../../auth/[...nextauth]";++export default async function handle(+ req: NextApiRequest,+ res: NextApiResponse,+) {+ if (req.method === "POST") {+ // POST /api/links/:id/preview+ const session = await getServerSession(req, res, authOptions);+ if (!session) {+ return res.status(401).end("Unauthorized");+ }++ const { id } = req.query as { id: string };++ // Create a new preview token+ const previewToken = newId("preview");+ const expiresAt = new Date();+ expiresAt.setMinutes(expiresAt.getMinutes() + 20); // previewToken expires in 20 minutes++ await prisma.verificationToken.create({+ data: {+ token: previewToken,+ identifier: `preview:${id}:${(session.user as CustomUser).id}`,+ expires: expiresAt,+ },+ });++ return res.status(200).json({ previewToken });+ } else {+ // We only allow POST requests+ res.setHeader("Allow", ["POST"]);+ return res.status(405).end(`Method ${req.method} Not Allowed`);+ }+}diff --git a/pages/api/views-dataroom.ts b/pages/api/views-dataroom.tsindex dee4487b..42936e59 100644--- a/pages/api/views-dataroom.ts+++ b/pages/api/views-dataroom.ts@@ -1,6 +1,7 @@import { NextApiRequest, NextApiResponse } from "next";import { waitUntil } from "@vercel/functions";+import { getServerSession } from "next-auth/next";import { parsePageId } from "notion-utils";import { record } from "zod";@@ -11,8 +12,11 @@ import { newId } from "@/lib/id-helper";import notion from "@/lib/notion";import prisma from "@/lib/prisma";import { parseSheet } from "@/lib/sheet";+import { CustomUser } from "@/lib/types";import { checkPassword, decryptEncrpytedPassword, log } from "@/lib/utils";+import { authOptions } from "./auth/[...nextauth]";+export const config = {// in order to enable `waitUntil` functionsupportsResponseStreaming: true,@@ -73,6 +77,11 @@ export default async function handle(useAdvancedExcelViewer: boolean;};+ // previewToken is used to determine if the view is a preview and therefore should not be recorded+ const { previewToken } = data as {+ previewToken?: string;+ };+// Fetch the link to verify the settingsconst link = await prisma.link.findUnique({where: {@@ -245,8 +254,48 @@ export default async function handle(isEmailVerified = true;}+ // Check if the view is a preview+ let isPreview: boolean = false;+ if (previewToken) {+ const session = await getServerSession(req, res, authOptions);+ if (!session) {+ return res+ .status(401)+ .json({ message: "You need to be logged in to preview the link." });+ }+ const verification = await prisma.verificationToken.findUnique({+ where: {+ token: previewToken,+ identifier: `preview:${linkId}:${(session.user as CustomUser).id}`,+ },+ });++ if (!verification) {+ res.status(401).json({+ message: "Unauthorized access.",+ });+ return;+ }++ // Check the token's expiration date+ if (Date.now() > verification.expires.getTime()) {+ res.status(401).json({ message: "Preview access expired" });+ return;+ }++ // TODO: delete previewToken+ // delete the token after verification+ // await prisma.verificationToken.delete({+ // where: {+ // token: previewToken,+ // },+ // });++ isPreview = true;+ }+let viewer: { id: string } | null = null;- if (email) {+ if (email && !isPreview) {// find or create a viewerconsole.time("find-viewer");viewer = await prisma.viewer.findUnique({@@ -281,39 +330,43 @@ export default async function handle(if (viewType === "DATAROOM_VIEW") {try {- console.time("create-view");- const newDataroomView = await prisma.view.create({- data: {- linkId: linkId,- viewerEmail: email,- viewerName: name,- verified: isEmailVerified,- dataroomId: dataroomId,- viewType: "DATAROOM_VIEW",- viewerId: viewer?.id ?? undefined,- ...(link.enableAgreement &&- link.agreementId &&- hasConfirmedAgreement && {- agreementResponse: {- create: {- agreementId: link.agreementId,+ let newDataroomView: { id: string } | null = null;+ if (!isPreview) {+ console.time("create-view");+ newDataroomView = await prisma.view.create({+ data: {+ linkId: linkId,+ viewerEmail: email,+ viewerName: name,+ verified: isEmailVerified,+ dataroomId: dataroomId,+ viewType: "DATAROOM_VIEW",+ viewerId: viewer?.id ?? undefined,+ ...(link.enableAgreement &&+ link.agreementId &&+ hasConfirmedAgreement && {+ agreementResponse: {+ create: {+ agreementId: link.agreementId,+ },},- },- }),- },- select: { id: true },- });- console.timeEnd("create-view");+ }),+ },+ select: { id: true },+ });+ console.timeEnd("create-view");- if (link.enableNotification) {- console.time("sendemail");- waitUntil(sendNotification({ viewId: newDataroomView.id }));- console.timeEnd("sendemail");+ if (link.enableNotification) {+ console.time("sendemail");+ waitUntil(sendNotification({ viewId: newDataroomView.id }));+ console.timeEnd("sendemail");+ }}const returnObject = {message: "Dataroom View recorded",- viewId: newDataroomView.id,+ viewId: !isPreview && newDataroomView ? newDataroomView.id : undefined,+ isPreview: isPreview ? true : undefined,file: undefined,pages: undefined,notionData: undefined,@@ -331,31 +384,34 @@ export default async function handle(}try {- console.time("create-view");- const newView = await prisma.view.create({- data: {- linkId: linkId,- viewerEmail: email,- viewerName: name,- documentId: documentId,- verified: isEmailVerified,- dataroomViewId: dataroomViewId,- dataroomId: dataroomId,- viewType: "DOCUMENT_VIEW",- viewerId: viewer?.id ?? undefined,- ...(link.enableAgreement &&- link.agreementId &&- hasConfirmedAgreement && {- agreementResponse: {- create: {- agreementId: link.agreementId,+ let newView: { id: string } | null = null;+ if (!isPreview) {+ console.time("create-view");+ newView = await prisma.view.create({+ data: {+ linkId: linkId,+ viewerEmail: email,+ viewerName: name,+ documentId: documentId,+ verified: isEmailVerified,+ dataroomViewId: dataroomViewId,+ dataroomId: dataroomId,+ viewType: "DOCUMENT_VIEW",+ viewerId: viewer?.id ?? undefined,+ ...(link.enableAgreement &&+ link.agreementId &&+ hasConfirmedAgreement && {+ agreementResponse: {+ create: {+ agreementId: link.agreementId,+ },},- },- }),- },- select: { id: true },- });- console.timeEnd("create-view");+ }),+ },+ select: { id: true },+ });+ console.timeEnd("create-view");+ }// if document version has pages, then return pages// otherwise, check if notion document,@@ -438,7 +494,8 @@ export default async function handle(const returnObject = {message: "View recorded",- viewId: newView.id,+ viewId: !isPreview && newView ? newView.id : undefined,+ isPreview: isPreview ? true : undefined,file:(documentVersion && documentVersion.type === "pdf") ||(documentVersion && useAdvancedExcelViewer)diff --git a/pages/api/views.ts b/pages/api/views.tsindex 27ece11d..5cc7f252 100644--- a/pages/api/views.ts+++ b/pages/api/views.ts@@ -1,6 +1,7 @@import { NextApiRequest, NextApiResponse } from "next";import { waitUntil } from "@vercel/functions";+import { getServerSession } from "next-auth/next";import sendNotification from "@/lib/api/notification-helper";import { sendVerificationEmail } from "@/lib/emails/send-email-verification";@@ -8,8 +9,11 @@ import { getFile } from "@/lib/files/get-file";import { newId } from "@/lib/id-helper";import prisma from "@/lib/prisma";import { parseSheet } from "@/lib/sheet";+import { CustomUser } from "@/lib/types";import { checkPassword, decryptEncrpytedPassword, log } from "@/lib/utils";+import { authOptions } from "./auth/[...nextauth]";+export const config = {// in order to enable `waitUntil` functionsupportsResponseStreaming: true,@@ -60,6 +64,11 @@ export default async function handle(useAdvancedExcelViewer: boolean;};+ // previewToken is used to determine if the view is a preview and therefore should not be recorded+ const { previewToken } = data as {+ previewToken?: string;+ };+// Fetch the link to verify the settingsconst link = await prisma.link.findUnique({where: {@@ -180,9 +189,11 @@ export default async function handle(});// set the default verification url- let verificationUrl: string = `${process.env.NEXT_PUBLIC_BASE_URL}/view/${linkId}/?token=${token}&email=${encodeURIComponent(email)}`;+ let verificationUrl: string =+ `${process.env.NEXT_PUBLIC_BASE_URL}/view/${linkId}/?token=${token}&email=${encodeURIComponent(email)}` ++ (previewToken ? `&previewToken=${previewToken}` : "");- if (link.domainSlug && link.slug) {+ if (link.domainSlug && link.slug && !previewToken) {// if custom domain is enabled, use the custom domainverificationUrl = `https://${link.domainSlug}/${link.slug}/?token=${token}&email=${encodeURIComponent(email)}`;}@@ -228,28 +239,71 @@ export default async function handle(isEmailVerified = true;}- try {- console.time("create-view");- const newView = await prisma.view.create({- data: {- linkId: linkId,- viewerEmail: email,- viewerName: name,- documentId: documentId,- verified: isEmailVerified,- ...(link.enableAgreement &&- link.agreementId &&- hasConfirmedAgreement && {- agreementResponse: {- create: {- agreementId: link.agreementId,- },- },- }),+ // Check if the view is a preview+ let isPreview: boolean = false;+ if (previewToken) {+ const session = await getServerSession(req, res, authOptions);+ if (!session) {+ return res+ .status(401)+ .json({ message: "You need to be logged in to preview the link." });+ }+ const verification = await prisma.verificationToken.findUnique({+ where: {+ token: previewToken,+ identifier: `preview:${linkId}:${(session.user as CustomUser).id}`,},- select: { id: true },});- console.timeEnd("create-view");++ if (!verification) {+ res.status(401).json({+ message: "Unauthorized access.",+ });+ return;+ }++ // Check the token's expiration date+ if (Date.now() > verification.expires.getTime()) {+ res.status(401).json({ message: "Preview access expired" });+ return;+ }++ // TODO: delete previewToken+ // delete the token after verification+ // await prisma.verificationToken.delete({+ // where: {+ // token: previewToken,+ // },+ // });++ isPreview = true;+ }++ try {+ let newView: { id: string } | null = null;+ if (!isPreview) {+ console.time("create-view");+ newView = await prisma.view.create({+ data: {+ linkId: linkId,+ viewerEmail: email,+ viewerName: name,+ documentId: documentId,+ verified: isEmailVerified,+ ...(link.enableAgreement &&+ link.agreementId &&+ hasConfirmedAgreement && {+ agreementResponse: {+ create: {+ agreementId: link.agreementId,+ },+ },+ }),+ },+ select: { id: true },+ });+ console.timeEnd("create-view");+ }// if document version has pages, then return pages// otherwise, return file from document version@@ -317,7 +371,7 @@ export default async function handle(console.timeEnd("get-file");}- if (link.enableNotification) {+ if (link.enableNotification && newView) {console.time("sendemail");waitUntil(sendNotification({ viewId: newView.id }));console.timeEnd("sendemail");@@ -325,7 +379,8 @@ export default async function handle(const returnObject = {message: "View recorded",- viewId: newView.id,+ viewId: !isPreview && newView ? newView.id : undefined,+ isPreview: isPreview ? true : undefined,file:(documentVersion && documentVersion.type === "pdf") ||(documentVersion && useAdvancedExcelViewer)diff --git a/pages/view/[linkId]/index.tsx b/pages/view/[linkId]/index.tsxindex 9b808090..6d137fd6 100644--- a/pages/view/[linkId]/index.tsx+++ b/pages/view/[linkId]/index.tsx@@ -200,9 +200,14 @@ export default function ViewPage({);}- const { token, email: verifiedEmail } = router.query as {+ const {+ token,+ email: verifiedEmail,+ previewToken,+ } = router.query as {token: string;email: string;+ previewToken?: string;};const { linkType, link, brand } = linkData;@@ -279,6 +284,7 @@ export default function ViewPage({showPoweredByBanner={showPoweredByBanner}showAccountCreationSlide={showAccountCreationSlide}useAdvancedExcelViewer={useAdvancedExcelViewer}+ previewToken={previewToken}/></>);@@ -307,6 +313,7 @@ export default function ViewPage({showPoweredByBanner={showPoweredByBanner}showAccountCreationSlide={showAccountCreationSlide}useAdvancedExcelViewer={useAdvancedExcelViewer}+ previewToken={previewToken}/></>);@@ -382,6 +389,7 @@ export default function ViewPage({token={token}verifiedEmail={verifiedEmail}useAdvancedExcelViewer={useAdvancedExcelViewer}+ previewToken={previewToken}/></>);@@ -407,6 +415,7 @@ export default function ViewPage({isProtected={false}brand={brand}useAdvancedExcelViewer={useAdvancedExcelViewer}+ previewToken={previewToken}/></>);diff --git a/pages/view/domains/[domain]/[slug]/index.tsx b/pages/view/domains/[domain]/[slug]/index.tsxindex 216b509f..cd339a31 100644--- a/pages/view/domains/[domain]/[slug]/index.tsx+++ b/pages/view/domains/[domain]/[slug]/index.tsx@@ -203,9 +203,14 @@ export default function ViewPage({);}- const { token, email: verifiedEmail } = router.query as {+ const {+ token,+ email: verifiedEmail,+ previewToken,+ } = router.query as {token: string;email: string;+ previewToken?: string;};const { linkType, link, brand } = linkData;@@ -280,6 +285,7 @@ export default function ViewPage({verifiedEmail={verifiedEmail}showAccountCreationSlide={showAccountCreationSlide}useAdvancedExcelViewer={useAdvancedExcelViewer}+ previewToken={previewToken}/></>);@@ -307,6 +313,7 @@ export default function ViewPage({brand={brand}showAccountCreationSlide={showAccountCreationSlide}useAdvancedExcelViewer={useAdvancedExcelViewer}+ previewToken={previewToken}/></>);@@ -382,6 +389,7 @@ export default function ViewPage({token={token}verifiedEmail={verifiedEmail}useAdvancedExcelViewer={useAdvancedExcelViewer}+ previewToken={previewToken}/></>);@@ -407,6 +415,7 @@ export default function ViewPage({isProtected={false}brand={brand}useAdvancedExcelViewer={useAdvancedExcelViewer}+ previewToken={previewToken}/></>);