Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
fix: if no email present, then don't record viewer
Marc Seitzd62b1979ab37
diff --git a/components/view/dataroom/dataroom-view.tsx b/components/view/dataroom/dataroom-view.tsxindex daa2367b..9756efcd 100644--- a/components/view/dataroom/dataroom-view.tsx+++ b/components/view/dataroom/dataroom-view.tsx@@ -84,16 +84,16 @@ export default function DataroomView({},body: JSON.stringify({...data,- email: data.email || verifiedEmail || userEmail,+ email: data.email ?? verifiedEmail ?? userEmail ?? null,linkId: link.id,documentId: documentData?.id,documentName: documentData?.name,// ownerId: documentData?.ownerId,- userId: userId || null,+ userId: userId ?? null,documentVersionId: documentData?.documentVersionId,hasPages: documentData?.hasPages,- token: token || null,- verifiedEmail: verifiedEmail || null,+ token: token ?? null,+ verifiedEmail: verifiedEmail ?? null,dataroomId: dataroom?.id,linkType: linkType,dataroomViewId: viewData.dataroomViewId ?? null,@@ -120,7 +120,7 @@ export default function DataroomView({dataroomId: dataroom?.id,linkType: linkType,viewerId: viewId,- viewerEmail: data.email || verifiedEmail || userEmail,+ viewerEmail: data.email ?? verifiedEmail ?? userEmail,});setViewData((prev) => ({viewId,diff --git a/pages/api/views-dataroom.ts b/pages/api/views-dataroom.tsindex 81dfe01b..a856260c 100644--- a/pages/api/views-dataroom.ts+++ b/pages/api/views-dataroom.ts@@ -203,32 +203,39 @@ export default async function handle(}let viewer: { id: string } | null = null;- // find or create a viewer- console.time("find-viewer");- viewer = await prisma.viewer.findUnique({- where: {- dataroomId_email: {- email: email,- dataroomId: dataroomId!,- },- },- select: { id: true },- });- console.timeEnd("find-viewer");-- if (!viewer) {- console.time("create-viewer");- viewer = await prisma.viewer.create({- data: {- email: email,- dataroomId: dataroomId!,- verified: isEmailVerified,+ if (email) {+ // find or create a viewer+ console.time("find-viewer");+ viewer = await prisma.viewer.findUnique({+ where: {+ dataroomId_email: {+ email: email,+ dataroomId: dataroomId!,+ },},select: { id: true },});- console.timeEnd("create-viewer");+ console.timeEnd("find-viewer");++ if (!viewer) {+ console.time("create-viewer");+ viewer = await prisma.viewer.create({+ data: {+ email: email,+ dataroomId: dataroomId!,+ verified: isEmailVerified,+ },+ select: { id: true },+ });+ console.timeEnd("create-viewer");+ }}+ // what's the difference between || and ?? on the viewer.id assignment?+ // viewer?.id ?? undefined+ // viewer?.id || undefined+ // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Nullish_coalescing_operator+if (viewType === "DATAROOM_VIEW") {try {console.time("create-view");@@ -239,7 +246,7 @@ export default async function handle(verified: isEmailVerified,dataroomId: dataroomId,viewType: "DATAROOM_VIEW",- viewerId: viewer.id,+ viewerId: viewer?.id ?? undefined,},select: { id: true },});@@ -275,7 +282,7 @@ export default async function handle(dataroomViewId: dataroomViewId,dataroomId: dataroomId,viewType: "DOCUMENT_VIEW",- viewerId: viewer.id,+ viewerId: viewer?.id ?? undefined,},select: { id: true },});