Merge pull request #604 from trycompai/lewis/comp-trust-portal-improvements

[dev] [carhartlewis] lewis/comp-trust-portal-improvements

Author: Marfuen

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/check-dns-record.ts

@@ -160,8 +160,8 @@ export const checkDnsRecordAction = authActionClient
 				});
 			});
 
-		revalidatePath("/settings/trust-portal");
-		revalidateTag(`organization_${ctx.session.activeOrganizationId}`);
+		revalidatePath(`/${activeOrgId}/settings/trust-portal`);
+		revalidateTag(`organization_${activeOrgId}`);
 
 		return {
 			success: true,

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

@@ -29,17 +29,32 @@ export const customDomainAction = authActionClient
 		}
 
 		try {
+			const currentDomain = await db.trust.findUnique({
+				where: { organizationId: activeOrganizationId },
+			});
+
+			// Always set domainVerified to false when domain changes
+			const domainVerified =
+				currentDomain?.domain === domain
+					? currentDomain.domainVerified
+					: false;
+
 			await db.trust.upsert({
 				where: { organizationId: activeOrganizationId },
-				update: { domain },
-				create: { organizationId: activeOrganizationId, domain },
+				update: { domain, domainVerified },
+				create: {
+					organizationId: activeOrganizationId,
+					domain,
+					domainVerified: false,
+				},
 			});
 
-			revalidatePath("/settings/trust-portal");
+			revalidatePath(`/${activeOrganizationId}/settings/trust-portal`);
 			revalidateTag(`organization_${activeOrganizationId}`);
 
 			return {
 				success: true,
+				needsVerification: !domainVerified,
 			};
 		} catch (error) {
 			console.error(error);

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/trust-portal-switch.ts

@@ -9,6 +9,7 @@ import { z } from "zod";
 
 const trustPortalSwitchSchema = z.object({
 	enabled: z.boolean(),
+	contactEmail: z.string().email().optional(),
 });
 
 export const trustPortalSwitchAction = authActionClient
@@ -21,7 +22,7 @@ export const trustPortalSwitchAction = authActionClient
 		},
 	})
 	.action(async ({ parsedInput, ctx }) => {
-		const { enabled } = parsedInput;
+		const { enabled, contactEmail } = parsedInput;
 		const { activeOrganizationId } = ctx.session;
 
 		if (!activeOrganizationId) {
@@ -31,14 +32,18 @@ export const trustPortalSwitchAction = authActionClient
 		try {
 			await db.trust.upsert({
 				where: { organizationId: activeOrganizationId },
-				update: { status: enabled ? "published" : "draft" },
+				update: {
+					status: enabled ? "published" : "draft",
+					contactEmail: contactEmail ?? null,
+				},
 				create: {
 					organizationId: activeOrganizationId,
 					status: enabled ? "published" : "draft",
+					contactEmail: contactEmail ?? null,
 				},
 			});
 
-			revalidatePath("/settings/trust-portal");
+			revalidatePath(`/${activeOrganizationId}/settings/trust-portal`);
 			revalidateTag(`organization_${activeOrganizationId}`);
 
 			return {

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/update-trust-portal-frameworks.ts

@@ -0,0 +1,61 @@
+"use server";
+
+import { auth } from "@/utils/auth";
+import { headers } from "next/headers";
+import { db } from "@comp/db";
+import { revalidatePath, revalidateTag } from "next/cache";
+
+interface UpdateTrustPortalFrameworksParams {
+	orgId: string;
+	soc2?: boolean;
+	iso27001?: boolean;
+	gdpr?: boolean;
+	soc2Status?: "started" | "in_progress" | "compliant";
+	iso27001Status?: "started" | "in_progress" | "compliant";
+	gdprStatus?: "started" | "in_progress" | "compliant";
+}
+
+export async function updateTrustPortalFrameworks({
+	orgId,
+	soc2,
+	iso27001,
+	gdpr,
+	soc2Status,
+	iso27001Status,
+	gdprStatus,
+}: UpdateTrustPortalFrameworksParams) {
+	const session = await auth.api.getSession({
+		headers: await headers(),
+	});
+
+	if (!session?.session.activeOrganizationId) {
+		throw new Error("Not authenticated");
+	}
+
+	const trustPortal = await db.trust.findUnique({
+		where: {
+			organizationId: orgId,
+		},
+	});
+
+	if (!trustPortal) {
+		throw new Error("Trust portal not found");
+	}
+
+	await db.trust.update({
+		where: {
+			organizationId: orgId,
+		},
+		data: {
+			soc2: soc2 ?? trustPortal.soc2,
+			iso27001: iso27001 ?? trustPortal.iso27001,
+			gdpr: gdpr ?? trustPortal.gdpr,
+			soc2_status: soc2Status ?? trustPortal.soc2_status,
+			iso27001_status: iso27001Status ?? trustPortal.iso27001_status,
+			gdpr_status: gdprStatus ?? trustPortal.gdpr_status,
+		},
+	});
+
+	revalidatePath(`/${orgId}/settings/trust-portal`);
+	revalidateTag(`organization_${orgId}`);
+}