Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: update notion parsing for custom domain
Marc Seitz5bc76742f8b2
diff --git a/components/documents/add-document-modal.tsx b/components/documents/add-document-modal.tsxindex 088fc67c..c190f156 100644--- a/components/documents/add-document-modal.tsx+++ b/components/documents/add-document-modal.tsx@@ -405,19 +405,22 @@ export function AddDocumentModal({}// Try to validate the Notion page URL- let validateNotionPageURL = parsePageId(notionLink);+ let validateNotionPageId = parsePageId(notionLink);// If parsePageId fails, try to get page ID from slug- if (validateNotionPageURL === null) {+ if (validateNotionPageId === null) {try {- validateNotionPageURL = await getNotionPageIdFromSlug(notionLink);+ const pageId = await getNotionPageIdFromSlug(notionLink);+ if (pageId) {+ validateNotionPageId = pageId;+ }} catch (slugError) {toast.error("Please enter a valid Notion link to proceed.");return;}}- if (!validateNotionPageURL) {+ if (!validateNotionPageId) {toast.error("Please enter a valid Notion link to proceed.");return;}diff --git a/lib/notion/utils.ts b/lib/notion/utils.tsindex e59d4e36..8038993b 100644--- a/lib/notion/utils.ts+++ b/lib/notion/utils.ts@@ -75,15 +75,75 @@ export const addSignedUrls: NotionAPI["addSignedUrls"] = async ({}};-export async function getNotionPageIdFromSlug(url: string) {+/**+ * Extracts page ID from custom Notion domain URLs+ * For custom domains, the page ID is typically embedded in the URL slug+ */+export function extractPageIdFromCustomNotionUrl(url: string): string | null {+ try {+ const urlObj = new URL(url);+ const pathname = urlObj.pathname;++ // Look for a 32-character hex string in the pathname (typical Notion page ID format)+ // This usually appears at the end of the slug, often preceded by a dash+ // Use word boundaries to ensure we match exactly 32 characters+ const pageIdMatch = pathname.match(/\b[a-f0-9]{32}\b/i);++ if (pageIdMatch) {+ return pageIdMatch[0];+ }++ return null;+ } catch {+ return null;+ }+}++/**+ * Check if a URL is potentially a custom Notion domain by attempting to extract a page ID+ * and verifying the page exists+ */+export async function isCustomNotionDomain(url: string): Promise<boolean> {+ try {+ const pageId = extractPageIdFromCustomNotionUrl(url);+ if (!pageId) {+ return false;+ }++ // Try to fetch the page to verify it exists and is accessible+ await notion.getPage(pageId);+ return true;+ } catch {+ return false;+ }+}++export async function getNotionPageIdFromSlug(+ url: string,+): Promise<string | null> {// Parse the URL to extract domain and slugconst urlObj = new URL(url);const hostname = urlObj.hostname;+ // First, try to handle custom Notion domains+ if (!hostname.endsWith(".notion.site")) {+ const pageId = extractPageIdFromCustomNotionUrl(url);+ if (pageId) {+ // Verify the page exists before returning the ID+ try {+ await notion.getPage(pageId);+ return pageId;+ } catch {+ throw new Error(`Custom Notion domain page not accessible: ${url}`);+ }+ }+ throw new Error(`Unable to extract page ID from custom domain URL: ${url}`);+ }+// Extract domain from hostname (e.g., "domain" from "domain.notion.site")const domainMatch = hostname.match(/^([^.]+)\.notion\.site$/);if (!domainMatch) {- throw new Error("Invalid Notion site URL format: ${url}");+ throw new Error(`Invalid Notion site URL format: ${url}`);}const spaceDomain = domainMatch[1];@@ -93,8 +153,7 @@ export async function getNotionPageIdFromSlug(url: string) {let slug = urlObj.pathname.substring(1) || "";// Make request to Notion's internal API- const apiUrl =- "https://${spaceDomain}.notion.site/api/v3/getPublicPageDataForDomain";+ const apiUrl = `https://${spaceDomain}.notion.site/api/v3/getPublicPageDataForDomain`;const payload = {type: "block-space",name: "page",@@ -114,7 +173,7 @@ export async function getNotionPageIdFromSlug(url: string) {if (!response.ok) {throw new Error(- "Notion API request failed: ${response.status} ${response.statusText}",+ `Notion API request failed: ${response.status} ${response.statusText}`,);}diff --git a/lib/zod/url-validation.ts b/lib/zod/url-validation.tsindex e9c4d754..6a6be06e 100644--- a/lib/zod/url-validation.ts+++ b/lib/zod/url-validation.ts@@ -1,9 +1,14 @@+import { parsePageId } from "notion-utils";import { z } from "zod";import {SUPPORTED_DOCUMENT_MIME_TYPES,SUPPORTED_DOCUMENT_SIMPLE_TYPES,} from "@/lib/constants";+import {+ getNotionPageIdFromSlug,+ isCustomNotionDomain,+} from "@/lib/notion/utils";import { getSupportedContentType } from "@/lib/utils/get-content-type";/**@@ -82,7 +87,7 @@ const createFilePathValidator = () => {.string().min(1, "File path is required").refine(- (path) => {+ async (path) => {// Case 1: Notion URLs - must start with notion domainsif (path.startsWith("https://")) {try {@@ -102,6 +107,22 @@ const createFilePathValidator = () => {isVercelBlob = hostname.startsWith(process.env.VERCEL_BLOB_HOST);}+ // If it's not a standard Notion domain or Vercel blob, check if it's a custom Notion domain+ if (!isNotionSite && !isValidNotionDomain && !isVercelBlob) {+ try {+ let pageId = parsePageId(path);+ if (!pageId) {+ const pageIdFromSlug = await getNotionPageIdFromSlug(path);+ if (pageIdFromSlug) {+ pageId = pageIdFromSlug;+ }+ }+ return !!pageId;+ } catch {+ return false;+ }+ }+return isNotionSite || isValidNotionDomain || isVercelBlob;} catch {return false;@@ -132,6 +153,65 @@ const createFilePathValidator = () => {// File path validation schemaexport const filePathSchema = createFilePathValidator();+// Dedicated Notion URL validation schema for URL updates+export const notionUrlUpdateSchema = z+ .string()+ .url("Invalid URL format")+ .refine(+ async (url) => {+ try {+ const urlObj = new URL(url);+ const hostname = urlObj.hostname;++ // Valid notion domains+ const validNotionDomains = ["www.notion.so", "notion.so"];+ const isNotionSite = hostname.endsWith(".notion.site");+ const isValidNotionDomain = validNotionDomains.includes(hostname);++ // If it's a standard Notion domain, try to extract page ID+ if (isNotionSite || isValidNotionDomain) {+ let pageId = parsePageId(url);+ if (!pageId) {+ try {+ const pageIdFromSlug = await getNotionPageIdFromSlug(url);+ pageId = pageIdFromSlug || undefined;+ } catch {+ return false;+ }+ }+ return !!pageId;+ }++ // For custom domains, try to extract and validate page ID+ try {+ let pageId = parsePageId(url);+ if (!pageId) {+ const pageIdFromSlug = await getNotionPageIdFromSlug(url);+ pageId = pageIdFromSlug || undefined;+ }+ return !!pageId;+ } catch {+ return false;+ }+ } catch {+ return false;+ }+ },+ {+ message:+ "Must be a valid Notion URL (supports notion.so, notion.site, and custom domains)",+ },+ )+ .refine(+ (url) => {+ // Additional security checks+ return validatePathSecurity(url) && validateUrlSSRFProtection(url);+ },+ {+ message: "URL contains invalid characters or targets internal resources",+ },+ );+// Document upload validation schema with comprehensive type and content validationexport const documentUploadSchema = z.object({@@ -196,7 +276,7 @@ export const documentUploadSchema = z},).refine(- (data) => {+ async (data) => {// Skip storage type validation if not provided (e.g., for Notion files)if (!data.storageType) {// For Notion URLs, storage type is not required@@ -204,11 +284,21 @@ export const documentUploadSchema = ztry {const urlObj = new URL(data.url);const hostname = urlObj.hostname;- return (+ const isStandardNotion =hostname === "www.notion.so" ||hostname === "notion.so" ||- hostname.endsWith(".notion.site")- );+ hostname.endsWith(".notion.site");++ if (isStandardNotion) {+ return true;+ }++ // Check if it's a custom Notion domain+ try {+ return await isCustomNotionDomain(data.url);+ } catch {+ return false;+ }} catch {return false;}@@ -228,11 +318,21 @@ export const documentUploadSchema = ztry {const urlObj = new URL(data.url);const hostname = urlObj.hostname;- return (+ const isStandardNotion =hostname === "www.notion.so" ||hostname === "notion.so" ||- hostname.endsWith(".notion.site")- );+ hostname.endsWith(".notion.site");++ if (isStandardNotion) {+ return true;+ }++ // Check if it's a custom Notion domain+ try {+ return await isCustomNotionDomain(data.url);+ } catch {+ return false;+ }} catch {return false;}diff --git a/pages/api/teams/[teamId]/documents/[id]/update-notion-url.ts b/pages/api/teams/[teamId]/documents/[id]/update-notion-url.tsindex f73d3b72..a79dbd31 100644--- a/pages/api/teams/[teamId]/documents/[id]/update-notion-url.ts+++ b/pages/api/teams/[teamId]/documents/[id]/update-notion-url.ts@@ -5,6 +5,7 @@ import { getServerSession } from "next-auth/next";import prisma from "@/lib/prisma";import { CustomUser } from "@/lib/types";+import { notionUrlUpdateSchema } from "@/lib/zod/url-validation";export default async function handle(req: NextApiRequest,@@ -24,22 +25,14 @@ export default async function handle(teamId: string;id: string;};- const { notionUrl } = req.body as { notionUrl: string };+ const { notionUrl: url } = req.body as { notionUrl: string };- // Basic URL validation- if (!notionUrl || typeof notionUrl !== "string") {- return res.status(400).json({ message: "Valid Notion URL is required" });+ const validationResult = await notionUrlUpdateSchema.safeParseAsync(url);+ if (!validationResult.success) {+ return res.status(400).json({ message: validationResult.error.message });}- // Validate that it's a Notion URL- try {- const url = new URL(notionUrl);- if (!url.hostname.includes("notion.")) {- return res.status(400).json({ message: "Invalid Notion URL" });- }- } catch (error) {- return res.status(400).json({ message: "Invalid URL format" });- }+ const notionUrl = validationResult.data;try {// Check if user has access to the team@@ -83,7 +76,7 @@ export default async function handle(// Preserve any existing query parameters from the old URL (like dark mode)const oldUrl = new URL(documentVersion.file);const newUrl = new URL(notionUrl);-+// Copy over the mode parameter if it existsconst mode = oldUrl.searchParams.get("mode");if (mode) {@@ -101,7 +94,7 @@ export default async function handle(},});- return res.status(200).json({+ return res.status(200).json({message: "Notion URL updated successfully",newUrl: newUrl.toString(),});@@ -109,4 +102,4 @@ export default async function handle(console.error("Error updating Notion URL:", error);return res.status(500).json({ message: "Internal server error" });}-}\ No newline at end of file+}diff --git a/pages/api/teams/[teamId]/documents/[id]/versions/index.ts b/pages/api/teams/[teamId]/documents/[id]/versions/index.tsindex 164992f5..4eba34aa 100644--- a/pages/api/teams/[teamId]/documents/[id]/versions/index.ts+++ b/pages/api/teams/[teamId]/documents/[id]/versions/index.ts@@ -32,7 +32,7 @@ export default async function handle(id: string;};// Validate request body using Zod schema for security- const validationResult = documentUploadSchema.safeParse({+ const validationResult = await documentUploadSchema.safeParseAsync({...req.body,name: `Version ${new Date().toISOString()}`, // Dummy name for validation});diff --git a/pages/api/teams/[teamId]/documents/agreement.ts b/pages/api/teams/[teamId]/documents/agreement.tsindex 1790b964..cd914bf0 100644--- a/pages/api/teams/[teamId]/documents/agreement.ts+++ b/pages/api/teams/[teamId]/documents/agreement.ts@@ -32,7 +32,7 @@ export default async function handle(const userId = (session.user as CustomUser).id;// Validate request body using Zod schema for security- const validationResult = documentUploadSchema.safeParse({+ const validationResult = await documentUploadSchema.safeParseAsync({...req.body,// Ensure type field is provided for validationtype: req.body.type || getExtension(req.body.name),diff --git a/pages/api/teams/[teamId]/documents/index.ts b/pages/api/teams/[teamId]/documents/index.tsindex c6d57eca..68234926 100644--- a/pages/api/teams/[teamId]/documents/index.ts+++ b/pages/api/teams/[teamId]/documents/index.ts@@ -242,7 +242,9 @@ export default async function handle(}// Validate request body using Zod schema for security- const validationResult = documentUploadSchema.safeParse(req.body);+ const validationResult = await documentUploadSchema.safeParseAsync(+ req.body,+ );if (!validationResult.success) {log({