Merge branch 'main' into lewis/comp-settings-secrets-ui-fix

Author: carhartlewis

apps/api/src/trust-portal/trust-access.service.ts

@@ -104,69 +104,38 @@ export class TrustAccessService {
   }
 
   /**
-   * Create a URL-friendly slug from organization name
+   * Ensure organization has a friendlyUrl, defaulting to organizationId
    */
-  private slugifyOrganizationName(name: string): string {
-    const cleaned = name
-      .trim()
-      .toLowerCase()
-      .replace(/&/g, 'and')
-      .replace(/[^a-z0-9]+/g, '-')
-      .replace(/-+/g, '-')
-      .replace(/^-|-$/g, '');
-
-    return cleaned.slice(0, 60);
-  }
-
-  /**
-   * Ensure organization has a friendlyUrl, create one if missing
-   */
-  private async ensureFriendlyUrl(params: {
-    organizationId: string;
-    organizationName: string;
-  }): Promise<string> {
-    const { organizationId, organizationName } = params;
-
+  private async ensureFriendlyUrl(organizationId: string): Promise<string> {
     const current = await db.trust.findUnique({
       where: { organizationId },
       select: { friendlyUrl: true },
     });
 
     if (current?.friendlyUrl) return current.friendlyUrl;
 
-    const baseCandidate =
-      this.slugifyOrganizationName(organizationName) ||
-      `org-${organizationId.slice(-8)}`;
-
-    for (let i = 0; i < 25; i += 1) {
-      const candidate = i === 0 ? baseCandidate : `${baseCandidate}-${i + 1}`;
-
-      const taken = await db.trust.findUnique({
-        where: { friendlyUrl: candidate },
-        select: { organizationId: true },
+    // Use organizationId as the default friendlyUrl (guaranteed unique)
+    try {
+      await db.trust.upsert({
+        where: { organizationId },
+        update: { friendlyUrl: organizationId },
+        create: { organizationId, friendlyUrl: organizationId, status: 'published' },
       });
-
-      if (taken && taken.organizationId !== organizationId) continue;
-
-      try {
-        await db.trust.upsert({
+      return organizationId;
+    } catch (error: unknown) {
+      if (
+        error instanceof Prisma.PrismaClientKnownRequestError &&
+        error.code === 'P2002'
+      ) {
+        // If somehow there's a conflict, the friendlyUrl already exists
+        const existing = await db.trust.findUnique({
           where: { organizationId },
-          update: { friendlyUrl: candidate },
-          create: { organizationId, friendlyUrl: candidate },
+          select: { friendlyUrl: true },
         });
-        return candidate;
-      } catch (error: unknown) {
-        if (
-          error instanceof Prisma.PrismaClientKnownRequestError &&
-          error.code === 'P2002'
-        ) {
-          continue;
-        }
-        throw error;
+        return existing?.friendlyUrl ?? organizationId;
       }
+      throw error;
     }
-
-    return organizationId;
   }
 
   /**
@@ -176,7 +145,7 @@ export class TrustAccessService {
     organizationId: string;
     organizationName: string;
   }): Promise<string> {
-    const { organizationId, organizationName } = params;
+    const { organizationId } = params;
 
     const trust = await db.trust.findUnique({
       where: { organizationId },
@@ -188,8 +157,7 @@ export class TrustAccessService {
     }
 
     const urlId =
-      trust?.friendlyUrl ||
-      (await this.ensureFriendlyUrl({ organizationId, organizationName }));
+      trust?.friendlyUrl || (await this.ensureFriendlyUrl(organizationId));
 
     return `${this.normalizeUrl(this.TRUST_APP_URL)}/${urlId}`;
   }
@@ -225,8 +193,34 @@ export class TrustAccessService {
       });
     }
 
-    if (!trust || trust.status !== 'published') {
-      throw new NotFoundException('Trust site not found or not published');
+    // If still no trust record but we have an organization, auto-create it
+    if (!trust) {
+      const organization = await db.organization.findUnique({
+        where: { id },
+      });
+
+      if (!organization) {
+        throw new NotFoundException('Trust site not found');
+      }
+
+      // Auto-create trust record with organizationId as friendlyUrl
+      trust = await db.trust.create({
+        data: {
+          organizationId: id,
+          friendlyUrl: id,
+          status: 'published',
+        },
+        include: { organization: true },
+      });
+    }
+
+    // Ensure the trust portal is published (auto-publish if draft)
+    if (trust.status !== 'published') {
+      trust = await db.trust.update({
+        where: { organizationId: trust.organizationId },
+        data: { status: 'published' },
+        include: { organization: true },
+      });
     }
 
     return trust;

apps/app/src/app/(app)/[orgId]/trust/page.tsx

@@ -1,17 +1,19 @@
 import { env } from '@/env.mjs';
 import { auth } from '@/utils/auth';
 import { db } from '@db';
-import { PageHeader, PageLayout } from '@trycompai/design-system';
+import { Button, PageHeader, PageLayout } from '@trycompai/design-system';
+import { Launch } from '@trycompai/design-system/icons';
 import { Prisma } from '@prisma/client';
 import type { Metadata } from 'next';
 import { headers } from 'next/headers';
+import Link from 'next/link';
 import { TrustPortalSwitch } from './portal-settings/components/TrustPortalSwitch';
 
 export default async function TrustPage({ params }: { params: Promise<{ orgId: string }> }) {
   const { orgId } = await params;
 
-  // Fetch portal settings data
-  await ensureFriendlyUrlIfEnabled(orgId);
+  // Ensure Trust record exists with default friendlyUrl
+  await ensureTrustRecord(orgId);
   const trustPortal = await getTrustPortal(orgId);
   const certificateFiles = await fetchComplianceCertificates(orgId);
   const faqs = await fetchOrganizationFaqs(orgId);
@@ -21,13 +23,28 @@ export default async function TrustPage({ params }: { params: Promise<{ orgId: s
     orderBy: { createdAt: 'desc' },
   });
 
+  // Build the public trust portal URL
+  const portalUrl =
+    trustPortal?.domainVerified && trustPortal.domain
+      ? `https://${trustPortal.domain}`
+      : `https://trust.inc/${trustPortal?.friendlyUrl ?? orgId}`;
+
   return (
-    <PageLayout header={<PageHeader title="Portal Settings" />}>
+    <PageLayout
+      header={
+        <PageHeader
+          title="Trust Portal"
+          actions={
+            <Button iconRight={<Launch />}>
+              <Link href={portalUrl} target="_blank" rel="noopener noreferrer">
+                Visit Trust Portal
+              </Link>
+            </Button>
+          }
+        />
+      }
+    >
       <TrustPortalSwitch
-        enabled={trustPortal?.enabled ?? false}
-        slug={trustPortal?.friendlyUrl ?? orgId}
-        domain={trustPortal?.domain ?? ''}
-        domainVerified={trustPortal?.domainVerified ?? false}
         orgId={orgId}
         soc2type1={trustPortal?.soc2type1 ?? false}
         soc2type2={trustPortal?.soc2type2 ?? false}
@@ -85,7 +102,6 @@ const getTrustPortal = async (orgId: string) => {
   });
 
   return {
-    enabled: trustPortal?.status === 'published',
     domain: trustPortal?.domain,
     domainVerified: trustPortal?.domainVerified,
     soc2type1: trustPortal?.soc2type1,
@@ -114,66 +130,32 @@ const getTrustPortal = async (orgId: string) => {
 };
 
 /**
- * Create a URL-friendly slug from organization name
- */
-const slugifyOrganizationName = (name: string): string => {
-  const cleaned = name
-    .trim()
-    .toLowerCase()
-    .replace(/&/g, 'and')
-    .replace(/[^a-z0-9]+/g, '-')
-    .replace(/-+/g, '-')
-    .replace(/^-|-$/g, '');
-
-  return cleaned.slice(0, 60);
-};
-
-/**
- * Ensure friendlyUrl exists for enabled trust portals
- * This auto-heals cases where portal was enabled before friendlyUrl was required
+ * Ensure Trust record exists with friendlyUrl defaulting to organizationId
  */
-const ensureFriendlyUrlIfEnabled = async (organizationId: string): Promise<void> => {
+const ensureTrustRecord = async (organizationId: string): Promise<void> => {
   const trust = await db.trust.findUnique({
     where: { organizationId },
-    select: { status: true, friendlyUrl: true },
+    select: { friendlyUrl: true },
   });
 
-  // Only sync if portal is enabled and friendlyUrl is missing
-  if (!trust || trust.status !== 'published' || trust.friendlyUrl) {
+  // If trust record exists with friendlyUrl, nothing to do
+  if (trust?.friendlyUrl) {
     return;
   }
 
-  const org = await db.organization.findUnique({
-    where: { id: organizationId },
-    select: { name: true },
-  });
-
-  if (!org) return;
-
-  const baseCandidate = slugifyOrganizationName(org.name) || `org-${organizationId.slice(-8)}`;
-
-  for (let i = 0; i < 25; i += 1) {
-    const candidate = i === 0 ? baseCandidate : `${baseCandidate}-${i + 1}`;
-
-    const taken = await db.trust.findUnique({
-      where: { friendlyUrl: candidate },
-      select: { organizationId: true },
+  // Create or update trust record with organizationId as default friendlyUrl
+  try {
+    await db.trust.upsert({
+      where: { organizationId },
+      update: { friendlyUrl: organizationId },
+      create: { organizationId, friendlyUrl: organizationId, status: 'published' },
     });
-
-    if (taken && taken.organizationId !== organizationId) continue;
-
-    try {
-      await db.trust.update({
-        where: { organizationId },
-        data: { friendlyUrl: candidate },
-      });
+  } catch (error: unknown) {
+    if (error instanceof Prisma.PrismaClientKnownRequestError && error.code === 'P2002') {
+      // Conflict on unique constraint - record already exists
       return;
-    } catch (error: unknown) {
-      if (error instanceof Prisma.PrismaClientKnownRequestError && error.code === 'P2002') {
-        continue;
-      }
-      throw error;
     }
+    throw error;
   }
 };