Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat(view-dataroom): delete and remove email auth token
Marc Seitz9776db71b5bd
diff --git a/components/view/DataroomViewer.tsx b/components/view/DataroomViewer.tsxindex 7b1dc9a6..12579c7d 100644--- a/components/view/DataroomViewer.tsx+++ b/components/view/DataroomViewer.tsx@@ -1,6 +1,6 @@import Link from "next/link";-import { useState } from "react";+import { useEffect, useState } from "react";import React from "react";import { Brand, Dataroom, DataroomBrand, DataroomFolder } from "@prisma/client";@@ -32,6 +32,7 @@ import DocumentCard from "./dataroom/document-card";import FolderCard from "./dataroom/folder-card";import DataroomNav from "./dataroom/nav-dataroom";import Nav from "./nav";+import { useRouter } from "next/router";type DataroomDocument = {dataroomDocumentId: string;@@ -53,6 +54,7 @@ export default function DataroomViewer({dataroom,setViewType,setDocumentData,+ setDataroomVerified,}: {brand: Partial<DataroomBrand>;viewId: string;@@ -71,14 +73,39 @@ export default function DataroomViewer({documentVersionNumber: number;} | null>>;+ setDataroomVerified: React.Dispatch<React.SetStateAction<boolean>>;}) {+ const router = useRouter();const [folderId, setFolderId] = useState<string | null>(null);const { documents, folders } = dataroom as {documents: DataroomDocument[];folders: DataroomFolder[];};- console.log("dataroom", dataroom);+ useEffect(() => {+ // Remove token and email query parameters on component mount+ const removeQueryParams = () => {+ const currentQuery = { ...router.query };++ if (!currentQuery.token && !currentQuery.email) return;++ setDataroomVerified(true);+ delete currentQuery.token;+ delete currentQuery.email;++ router.replace(+ {+ pathname: router.pathname,+ query: currentQuery,+ },+ undefined,+ { shallow: true },+ );+ };++ removeQueryParams();+ }, []); // Run once on mount+return (<><DataroomNav brand={brand} viewId={viewId} dataroom={dataroom} />diff --git a/components/view/dataroom/dataroom-view.tsx b/components/view/dataroom/dataroom-view.tsxindex 798706a9..9bcdb620 100644--- a/components/view/dataroom/dataroom-view.tsx+++ b/components/view/dataroom/dataroom-view.tsx@@ -66,6 +66,7 @@ export default function DataroomView({);const [verificationRequested, setVerificationRequested] =useState<boolean>(false);+ const [dataroomVerified, setDataroomVerified] = useState<boolean>(false);const [documentData, setDocumentData] = useState<{id: string;name: string;@@ -98,6 +99,7 @@ export default function DataroomView({hasPages: documentData?.hasPages,token: token ?? null,verifiedEmail: verifiedEmail ?? null,+ dataroomVerified: dataroomVerified,dataroomId: dataroom?.id,linkType: linkType,dataroomViewId: viewData.dataroomViewId ?? null,diff --git a/pages/api/views-dataroom.ts b/pages/api/views-dataroom.tsindex 255f5ad0..ea55474a 100644--- a/pages/api/views-dataroom.ts+++ b/pages/api/views-dataroom.ts@@ -32,6 +32,7 @@ export default async function handle(token,ownerId,verifiedEmail,+ dataroomVerified,linkType,dataroomViewId,viewType,@@ -47,6 +48,7 @@ export default async function handle(token: string | null;ownerId: string | null;verifiedEmail: string | null;+ dataroomVerified: boolean | undefined;linkType: string;dataroomViewId?: string;viewType: "DATAROOM_VIEW" | "DOCUMENT_VIEW";@@ -152,7 +154,7 @@ export default async function handle(}// Check if email verification is required for visiting the link- if (link.emailAuthenticated && !token) {+ if (link.emailAuthenticated && !token && !dataroomVerified) {const token = newId("email");const expiresAt = new Date();expiresAt.setHours(expiresAt.getHours() + 1); // token expires in 1 hour@@ -182,7 +184,7 @@ export default async function handle(}let isEmailVerified: boolean = false;- if (link.emailAuthenticated && token) {+ if (link.emailAuthenticated && token && !dataroomVerified) {const verification = await prisma.verificationToken.findUnique({where: {token: token,@@ -201,6 +203,17 @@ export default async function handle(return;}+ // delete the token after verification+ await prisma.verificationToken.delete({+ where: {+ token: token,+ },+ });++ isEmailVerified = true;+ }++ if (link.emailAuthenticated && dataroomVerified) {isEmailVerified = true;}