Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add email validation to access form
Marc Seitz77ea4c213041
diff --git a/components/view/access-form/email-section.tsx b/components/view/access-form/email-section.tsxindex 2c688c27..760d24d4 100644--- a/components/view/access-form/email-section.tsx+++ b/components/view/access-form/email-section.tsx@@ -1,9 +1,11 @@-import { Dispatch, SetStateAction, useEffect } from "react";+import { Dispatch, SetStateAction, useEffect, useRef, useState } from "react";import { Brand, DataroomBrand } from "@prisma/client";+import { useDebouncedCallback } from "use-debounce";import { cn } from "@/lib/utils";import { determineTextColor } from "@/lib/utils/determine-text-color";+import { simpleEmailRegex, validateEmail } from "@/lib/utils/validate-email";import { DEFAULT_ACCESS_FORM_TYPE } from ".";@@ -13,14 +15,18 @@ export default function EmailSection({brand,disableEditEmail,useCustomAccessForm,+ onValidationChange,}: {data: DEFAULT_ACCESS_FORM_TYPE;setData: Dispatch<SetStateAction<DEFAULT_ACCESS_FORM_TYPE>>;brand?: Partial<Brand> | Partial<DataroomBrand> | null;disableEditEmail?: boolean;useCustomAccessForm?: boolean;+ onValidationChange: (isValid: boolean) => void;}) {const { email } = data;+ const [emailError, setEmailError] = useState<string | null>(null);+ const [isDirty, setIsDirty] = useState(false);useEffect(() => {// Load email from localStorage when the component mounts@@ -33,12 +39,55 @@ export default function EmailSection({}}, [setData]);+ const handleInvalid = (e: React.InvalidEvent<HTMLInputElement>) => {+ e.preventDefault(); // Prevent default browser validation popup+ setEmailError("Please enter a valid email address");+ };++ const debouncedValidation = useDebouncedCallback(+ (value: string) => {+ const isValid = !value || validateEmail(value);+ if (isDirty && value && !isValid) {+ setEmailError("Please enter a valid email address");+ } else {+ setEmailError(null);+ }+ // Notify parent component about validation status+ onValidationChange?.(isValid);+ },+ 500, // 500ms delay+ );+const handleEmailChange = (e: React.ChangeEvent<HTMLInputElement>) => {const newEmail = e.target.value.toLowerCase();- // Store the new email in localStorage- window.localStorage.setItem("papermark.email", newEmail);+ setEmailError(null); // Clear error when typing++ debouncedValidation(newEmail);+// Update the statesetData({ ...data, email: newEmail });+ // Store in localStorage+ window.localStorage.setItem("papermark.email", newEmail);++ // Optional: Clear error if input becomes valid+ if (e.target.validity.valid) {+ setEmailError(null);+ }+ };++ const handleBlur = (e: React.FocusEvent<HTMLInputElement>) => {+ setIsDirty(true);+ const value = e.target.value;+ const isValid = !value || validateEmail(value);+ if (value && !isValid) {+ setEmailError("Please enter a valid email address");+ }+ onValidationChange?.(isValid);+ };++ const handleFocus = () => {+ // Optionally clear error when user focuses the input to type again+ setEmailError(null);};return (@@ -63,7 +112,11 @@ export default function EmailSection({autoCorrect="off"autoComplete="email"autoFocus- className="flex w-full rounded-md border-0 bg-black py-1.5 text-gray-500 shadow-sm ring-1 ring-inset ring-gray-600 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-gray-300 sm:text-sm sm:leading-6"+ required+ className={cn(+ "flex w-full rounded-md border-0 bg-black py-1.5 text-gray-500 shadow-sm ring-1 ring-inset ring-gray-600 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-gray-300 sm:text-sm sm:leading-6",+ emailError && isDirty && "ring-red-500",+ )}style={{backgroundColor:brand && brand.accentColor ? brand.accentColor : "black",@@ -76,10 +129,28 @@ export default function EmailSection({value={email || ""}placeholder="Enter email"onChange={handleEmailChange}+ onInvalid={handleInvalid}+ onBlur={handleBlur}+ onFocus={handleFocus}disabled={disableEditEmail}- aria-invalid="true"+ pattern={simpleEmailRegex.source}data-1p-ignore+ aria-invalid={emailError ? "true" : "false"}+ aria-describedby={emailError ? "email-error" : undefined}/>+ {emailError && (+ <p+ id="email-error"+ className="mt-1 text-sm text-red-500"+ style={{+ color: brand?.accentColor+ ? determineTextColor(brand.accentColor)+ : "rgb(239 68 68)",+ }}+ >+ {emailError}+ </p>+ )}<p className="text-sm text-gray-500">{useCustomAccessForm? "This data will be shared with the content provider."diff --git a/components/view/access-form/index.tsx b/components/view/access-form/index.tsxindex 60af984c..30c3f346 100644--- a/components/view/access-form/index.tsx+++ b/components/view/access-form/index.tsx@@ -1,7 +1,7 @@import Image from "next/image";import Link from "next/link";-import { useEffect } from "react";+import { useEffect, useState } from "react";import { Brand, DataroomBrand } from "@prisma/client";@@ -59,6 +59,8 @@ export default function AccessForm({disableEditEmail?: boolean;useCustomAccessForm?: boolean;}) {+ const [isEmailValid, setIsEmailValid] = useState(true);+useEffect(() => {const userEmail = email;if (userEmail) {@@ -69,6 +71,16 @@ export default function AccessForm({}}, [email]);+ const isFormValid = () => {+ if (requireEmail) {+ if (!data.email || !isEmailValid) return false;+ }+ if (requirePassword && !data.password) return false;+ if (requireAgreement && !data.hasConfirmedAgreement) return false;+ if (requireAgreement && requireName && !data.name) return false;+ return true;+ };+return (<divclassName="flex h-dvh flex-col justify-between pb-4 pt-12"@@ -125,6 +137,7 @@ export default function AccessForm({{...{ data, setData, brand }}disableEditEmail={disableEditEmail}useCustomAccessForm={useCustomAccessForm}+ onValidationChange={setIsEmailValid}/>) : null}{requirePassword ? (@@ -142,12 +155,7 @@ export default function AccessForm({<div className="flex justify-center"><Buttontype="submit"- disabled={- (requireEmail && !data.email) ||- (requirePassword && !data.password) ||- (requireAgreement && !data.hasConfirmedAgreement) ||- (requireAgreement && requireName && !data.name)- }+ disabled={!isFormValid()}className="w-1/3 min-w-fit bg-white text-gray-950 hover:bg-white/90"loading={isLoading}style={{diff --git a/lib/utils/validate-email.ts b/lib/utils/validate-email.tsnew file mode 100644index 00000000..44e618be--- /dev/null+++ b/lib/utils/validate-email.ts@@ -0,0 +1,11 @@+// RFC 5322 compliant regex+export const fullyCompliantEmailRegex =+ /^(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/;++// Simple email regex+export const simpleEmailRegex =+ /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z]{2,})+$/;++export const validateEmail = (email: string) => {+ return simpleEmailRegex.test(email.toLowerCase());+};diff --git a/pages/api/views-dataroom.ts b/pages/api/views-dataroom.tsindex 42431ae3..591f06d9 100644--- a/pages/api/views-dataroom.ts+++ b/pages/api/views-dataroom.ts@@ -18,6 +18,7 @@ import { CustomUser, WatermarkConfigSchema } from "@/lib/types";import { checkPassword, decryptEncrpytedPassword, log } from "@/lib/utils";import { generateOTP } from "@/lib/utils/generate-otp";import { getIpAddress } from "@/lib/utils/ip";+import { validateEmail } from "@/lib/utils/validate-email";import { authOptions } from "./auth/[...nextauth]";@@ -138,6 +139,12 @@ export default async function handle(res.status(400).json({ message: "Email is required." });return;}++ // validate email+ if (!validateEmail(email)) {+ res.status(400).json({ message: "Invalid email address." });+ return;+ }}// Check if password is required for visiting the linkdiff --git a/pages/api/views.ts b/pages/api/views.tsindex 127bc7a2..554d78e0 100644--- a/pages/api/views.ts+++ b/pages/api/views.ts@@ -15,6 +15,7 @@ import { CustomUser, WatermarkConfigSchema } from "@/lib/types";import { checkPassword, decryptEncrpytedPassword, log } from "@/lib/utils";import { generateOTP } from "@/lib/utils/generate-otp";import { getIpAddress } from "@/lib/utils/ip";+import { validateEmail } from "@/lib/utils/validate-email";import { authOptions } from "./auth/[...nextauth]";@@ -120,6 +121,12 @@ export default async function handle(res.status(400).json({ message: "Email is required." });return;}++ // validate email+ if (!validateEmail(email)) {+ res.status(400).json({ message: "Invalid email address." });+ return;+ }}// Check if password is required for visiting the link