fix(trust-portal): enhance error handling for domain ownership checks

Author: tofikwest

apps/app/src/app/(app)/[orgId]/trust/portal-settings/actions/custom-domain.ts

@@ -124,52 +124,72 @@ export const customDomainAction = authActionClient
 
         // Check for 409 domain_already_in_use - domain exists on our project with pending verification
         if (vercelError.statusCode === 409 && vercelError.body) {
+          // Parse error body separately to avoid catching db/revalidation errors
+          let errorBody: { error?: { code?: string; projectId?: string; domain?: { verified?: boolean; verification?: Array<{ value?: string }> } } } | null = null;
           try {
-            const errorBody = JSON.parse(vercelError.body);
-            const errorData = errorBody?.error;
-
-            if (
-              errorData?.code === 'domain_already_in_use' &&
-              errorData?.projectId === env.TRUST_PORTAL_PROJECT_ID
-            ) {
-              // Domain already exists on our project - extract verification info and save it
-              const domainInfo = errorData.domain;
-              const vercelVerification = domainInfo?.verification?.[0]?.value || null;
-              const isVercelDomain = domainInfo?.verified === false;
-
-              console.log(
-                `Domain ${domain} already exists on project, extracting verification info:`,
-                vercelVerification,
-              );
-
-              await db.trust.upsert({
-                where: { organizationId: activeOrganizationId },
-                update: {
-                  domain,
-                  domainVerified: false,
-                  isVercelDomain,
-                  vercelVerification,
-                },
-                create: {
-                  organizationId: activeOrganizationId,
-                  domain,
-                  domainVerified: false,
-                  isVercelDomain,
-                  vercelVerification,
-                },
-              });
-
-              revalidatePath(`/${activeOrganizationId}/trust`);
-              revalidatePath(`/${activeOrganizationId}/trust/portal-settings`);
-              revalidateTag(`organization_${activeOrganizationId}`, 'max');
+            errorBody = JSON.parse(vercelError.body);
+          } catch (parseError) {
+            console.error('Failed to parse Vercel error body:', parseError);
+          }
 
+          const errorData = errorBody?.error;
+
+          if (
+            errorData?.code === 'domain_already_in_use' &&
+            errorData?.projectId === env.TRUST_PORTAL_PROJECT_ID
+          ) {
+            // Check if another organization already owns this domain in our database
+            const existingDomainOwner = await db.trust.findFirst({
+              where: {
+                domain,
+                organizationId: { not: activeOrganizationId },
+              },
+              select: { organizationId: true },
+            });
+
+            if (existingDomainOwner) {
               return {
-                success: true,
-                needsVerification: true,
+                success: false,
+                error: 'Domain is already in use by another organization',
               };
             }
-          } catch (parseError) {
-            console.error('Failed to parse Vercel error body:', parseError);
+
+            // Domain already exists on our project - extract verification info and save it
+            const domainInfo = errorData.domain;
+            const vercelVerification = domainInfo?.verification?.[0]?.value || null;
+            // Default to true since we're in the pending verification handler
+            const isVercelDomain = domainInfo?.verified !== true;
+
+            console.log(
+              `Domain ${domain} already exists on project, extracting verification info:`,
+              vercelVerification,
+            );
+
+            await db.trust.upsert({
+              where: { organizationId: activeOrganizationId },
+              update: {
+                domain,
+                domainVerified: false,
+                isVercelDomain,
+                vercelVerification,
+              },
+              create: {
+                organizationId: activeOrganizationId,
+                domain,
+                domainVerified: false,
+                isVercelDomain,
+                vercelVerification,
+              },
+            });
+
+            revalidatePath(`/${activeOrganizationId}/trust`);
+            revalidatePath(`/${activeOrganizationId}/trust/portal-settings`);
+            revalidateTag(`organization_${activeOrganizationId}`, 'max');
+
+            return {
+              success: true,
+              needsVerification: true,
+            };
           }
         }