use tldts for domain extraction

Author: ameer2468

apps/web/app/(org)/dashboard/settings/organization/components/CustomDomainDialog/VerifyStep.tsx

@@ -5,6 +5,7 @@ import { useEffect, useState } from "react";
 import { toast } from "sonner";
 import { useDashboardContext } from "@/app/(org)/dashboard/Contexts";
 import type { DomainConfig, DomainVerification } from "./types";
+import { parse } from "tldts";
 
 interface VerifyStepProps {
 	domain: string;
@@ -54,14 +55,25 @@ const VerifyStep = ({
 		return [];
 	};
 
-	const isSubdomain = (domain: string): boolean => {
-		domain = domain.replace(/^https?:\/\//, "");
-		domain = domain.split("/")[0] ?? "";
-		if (!domain) return false;
-		const parts: string[] = domain.split(".");
-		return parts.length > 2;
+	const isSubdomain = (raw: string): boolean => {
+		// Normalize and extract host (no scheme, path, port, or trailing dot)
+		const input =
+			raw
+				.trim()
+				.replace(/^https?:\/\//i, "")
+				.split("/")[0] ?? "";
+		if (!input) return false;
+		const host = (input.replace(/\.$/, "").split(":")[0] || "").toLowerCase();
+		try {
+			// Prefer PSL-backed parsing for correctness (e.g., co.uk, com.au)
+			const { subdomain } = parse(host);
+			return Boolean(subdomain);
+		} catch {
+			// Fallback: conservative heuristic
+			const parts = host.split(".");
+			return parts.length > 2;
+		}
 	};
-
 	const recommendedAValues = getRecommendedAValues();
 
 	// Check if DNS records are already correctly configured
@@ -72,7 +84,7 @@ const VerifyStep = ({
 		recommendedCnames.length > 0 &&
 		recommendedCnames.some((rec) => currentCnames.includes(rec.value));
 	const showARecord =
-		recommendedARecord && !aRecordConfigured && !isSubdomain(domain);
+		recommendedAValues.length > 0 && !aRecordConfigured && !isSubdomain(domain);
 	const showCNAMERecord = hasRecommendedCNAME && !cnameConfigured;
 	const showTXTRecord = hasTXTVerification && !isVerified;
 

apps/web/package.json

@@ -113,6 +113,7 @@
 		"subtitles-parser-vtt": "^0.1.0",
 		"tailwind-merge": "^2.6.0",
 		"tailwindcss-animate": "^1.0.7",
+		"tldts": "^7.0.11",
 		"uuid": "^9.0.1",
 		"zod": "^3.25.76"
 	},