Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: return proper error message for adding domains
Marc Seitzc87ed3dd921a
diff --git a/components/domains/add-domain-modal.tsx b/components/domains/add-domain-modal.tsxindex fcc47713..2af4e3c8 100644--- a/components/domains/add-domain-modal.tsx+++ b/components/domains/add-domain-modal.tsx@@ -45,10 +45,10 @@ export function AddDomainModal({});if (!response.ok) {- const error = await response.json();+ const { message } = await response.json();setLoading(false);setOpen(false);- toast.error(error);+ toast.error(message);return;}diff --git a/pages/api/domains/index.ts b/pages/api/domains/index.tsindex 3bbc5ef1..f2d64762 100644--- a/pages/api/domains/index.ts+++ b/pages/api/domains/index.ts@@ -6,6 +6,7 @@ import { CustomUser } from "@/lib/types";import { log } from "@/lib/utils";import { addDomainToVercel, validDomainRegex } from "@/lib/domains";import { identifyUser, trackAnalytics } from "@/lib/analytics";+import { Prisma } from "@prisma/client";export default async function handle(req: NextApiRequest,@@ -51,12 +52,14 @@ export default async function handle(// TODO: Add check for if the domain already exists on another userconst validDomain = validDomainRegex.test(domain);if (validDomain !== true) {- return res.status(422).json("Invalid domain");+ return res.status(422).json({ message: "Invalid domain" });}// Don't allow papermark.io domainsif (domain.includes("papermark.io")) {- return res.status(422).json("Invalid domain")+ return res+ .status(422)+ .json({ message: "Papermark domains cannot be custom domains" });}// console.log("Valid domain", domain);@@ -77,11 +80,23 @@ export default async function handle(res.status(201).json(response);} catch (error) {- log(`Failed to add domain. Error: \n\n ${error}`);- res.status(500).json({- message: "Internal Server Error",- error: (error as Error).message,- });+ log(`Failed to add domain: ${domain}. Error: \n\n ${error}`);+ // Handle unique constraint error+ if (+ error instanceof Prisma.PrismaClientKnownRequestError &&+ error.code === "P2002"+ ) {+ return res.status(422).json({+ message:+ "This domain already exists. Please choose a different domain.",+ });+ }+ // Handle other errors+ res+ .status(500)+ .json({+ message: "An unexpected error occurred. Please try again later.",+ });}} else {// We only allow GET and POST requests