Skip to content

[comp] Production Deploy #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carhartlewis merged 3 commits into from
May 11, 2025
Merged

[comp] Production Deploy #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27369ea
feat(trust): enhance DNS verification and state management in TrustPo…
carhartlewis May 11, 2025
af296f1
Merge branch 'main' into lewis/comp-trust-center-custom-domains-fixes
carhartlewis May 11, 2025
e1df926
Merge pull request #571 from trycompai/lewis/comp-trust-center-custom…
carhartlewis May 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions .../app/[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/check-dns-record.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ export const checkDnsRecordAction = authActionClient
Array.isArray(record.txt) &&
record.txt.length > 0
) {
return record.txt.includes(expectedTxtValue);
return record.txt.some(
(txt: string) => txt === expectedTxtValue,
);
}
return false;
});
Expand All @@ -103,13 +105,19 @@ export const checkDnsRecordAction = authActionClient
const isVerified = isCnameVerified && isTxtVerified;

if (!isVerified) {
throw new Error(
"Error verifying DNS records. Please ensure both CNAME and TXT records are correctly configured, or wait a few minutes and try again.",
);
return {
success: false,
isCnameVerified,
isTxtVerified,
error: "Error verifying DNS records. Please ensure both CNAME and TXT records are correctly configured, or wait a few minutes and try again.",
};
}

if (!env.VERCEL_PROJECT_ID) {
throw new Error("Vercel project ID is not set.");
return {
success: false,
error: "Vercel project ID is not set.",
};
}

const isExistingRecord = await vercel.projects.getProjectDomains({
Expand Down Expand Up @@ -157,5 +165,7 @@ export const checkDnsRecordAction = authActionClient

return {
success: true,
isCnameVerified,
isTxtVerified,
};
});
99 changes: 94 additions & 5 deletions ...[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/components/TrustPortalDomain.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
AlertCircle,
CheckCircle,
} from "lucide-react";
import React from "react";
import React, { useEffect, useState } from "react";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@comp/ui/tooltip";

const trustPortalDomainSchema = z.object({
Expand All @@ -57,6 +57,15 @@ export function TrustPortalDomain({
orgId: string;
}) {
const t = useI18n();
const [isCnameVerified, setIsCnameVerified] = useState(false);
const [isTxtVerified, setIsTxtVerified] = useState(false);

useEffect(() => {
const isCnameVerified = localStorage.getItem(`${initialDomain}-isCnameVerified`);
const isTxtVerified = localStorage.getItem(`${initialDomain}-isTxtVerified`);
setIsCnameVerified(isCnameVerified === "true");
setIsTxtVerified(isTxtVerified === "true");
}, []);

const updateCustomDomain = useAction(customDomainAction, {
onSuccess: (data) => {
Expand All @@ -69,7 +78,28 @@ export function TrustPortalDomain({

const checkDnsRecord = useAction(checkDnsRecordAction, {
onSuccess: (data) => {
toast.success("DNS record verified.");
if (data?.data?.error) {
toast.error(data.data.error);

if (data.data?.isCnameVerified) {
setIsCnameVerified(true);
localStorage.setItem(`${initialDomain}-isCnameVerified`, "true");
}
if (data.data?.isTxtVerified) {
setIsTxtVerified(true);
localStorage.setItem(`${initialDomain}-isTxtVerified`, "true");
}
} else {
if (data.data?.isCnameVerified) {
setIsCnameVerified(true);
localStorage.removeItem(`${initialDomain}-isTxtVerified`);
}
if (data.data?.isTxtVerified) {
setIsTxtVerified(true);
localStorage.removeItem(`${initialDomain}-isCnameVerified`);
}
toast.success("DNS record verified.");
}
},
onError: (error) => {
toast.error("DNS record verification failed, check the records are valid or try again later.");
Expand Down Expand Up @@ -174,17 +204,25 @@ export function TrustPortalDomain({
{form.watch("domain") === initialDomain && !domainVerified && (
<div className="space-y-2 pt-2">
<div className="rounded-md border">
<div className="w-full text-sm">
<table className="w-full hidden md:table">
<div className="text-sm">
<table className="hidden lg:table w-full">
<thead>
<tr className="[&_th]:px-3 [&_th]:py-2 [&_th]:text-left">
<th>Verified</th>
<th>Type</th>
<th>Name</th>
<th>Value</th>
</tr>
</thead>
<tbody>
<tr className="border-t [&_td]:px-3 [&_td]:py-2">
<td>
{isCnameVerified ? (
<CheckCircle className="h-4 w-4 text-green-500" />
) : (
<AlertCircle className="h-4 w-4 text-amber-500" />
)}
</td>
<td>CNAME</td>
<td>
<div className="flex items-center justify-between gap-2">
Expand Down Expand Up @@ -223,6 +261,13 @@ export function TrustPortalDomain({
</td>
</tr>
<tr className="border-t [&_td]:px-3 [&_td]:py-2">
<td>
{isTxtVerified ? (
<CheckCircle className="h-4 w-4 text-green-500" />
) : (
<AlertCircle className="h-4 w-4 text-amber-500" />
)}
</td>
<td>TXT</td>
<td>
<div className="flex items-center justify-between gap-2">
Expand Down Expand Up @@ -265,7 +310,7 @@ export function TrustPortalDomain({
</tbody>
</table>

<div className="md:hidden space-y-4 p-4">
<div className="lg:hidden space-y-4 p-4">
<div>
<div className="font-medium mb-1">Type:</div>
<div>CNAME</div>
Expand Down Expand Up @@ -307,6 +352,50 @@ export function TrustPortalDomain({
</Button>
</div>
</div>
<div className="border-b" />
<div>
<div className="font-medium mb-1">Type:</div>
<div>TXT</div>
</div>
<div>
<div className="font-medium mb-1">Name:</div>
<div className="flex items-center justify-between gap-2">
<span className="min-w-0 break-words">
@
</span>
<Button
variant="ghost"
size="icon"
type="button"
onClick={() => handleCopy(`compai-domain-verification=${orgId}`, "Name")}
className="h-6 w-6 flex-shrink-0"
>
<ClipboardCopy className="h-4 w-4" />
</Button>
</div>
</div>
<div>
<div className="font-medium mb-1">Value:</div>
<div className="flex items-center justify-between gap-2">
<span className="min-w-0 break-words">
compai-domain-verification={orgId}
</span>
<Button
variant="ghost"
size="icon"
type="button"
onClick={() =>
handleCopy(
`compai-domain-verification=${orgId}`,
"Value",
)
}
className="h-6 w-6 flex-shrink-0"
>
<ClipboardCopy className="h-4 w-4" />
</Button>
</div>
</div>
</div>
</div>
</div>
Expand Down
Loading