feat: removed packages for now + new auto org creation

Author: Rieranthony

apps/api/src/db/queries/organization.ts

@@ -6,7 +6,9 @@ import {
   type OrganizationSelect,
   type OrganizationInsert,
   type Database,
+  auth,
 } from "@repo/database";
+import { generateSlugFromEmailDomain } from "@api/utils/organisation";
 
 // Create organization
 export async function createOrganization(
@@ -105,7 +107,46 @@ export async function getOrganizationsForUser(
     .from(organization)
     .innerJoin(member, eq(member.organizationId, organization.id))
     .where(eq(member.userId, params.userId))
-    .orderBy(desc(member.createdAt));
+    .orderBy(desc(member.createdAt))
+    .$withCache();
+
+  return organizations;
+}
+
+export async function getOrganizationsForUserOrCreateDefault(
+  db: Database,
+  params: {
+    userId: string;
+    userEmail: string;
+    userName: string;
+  }
+) {
+  const organizations = await getOrganizationsForUser(db, {
+    userId: params.userId,
+  });
+
+  // If the user has no organizations, create a default one
+  if (organizations.length === 0) {
+    const { slug, organizationName } = await generateSlugFromEmailDomain(db, {
+      email: params.userEmail,
+    });
+
+    const newOrganization = await auth.api.createOrganization({
+      body: {
+        name: organizationName,
+        slug,
+        userId: params.userId,
+      },
+    });
+
+    return [
+      {
+        organization: newOrganization,
+        role: "owner",
+        joinedAt: new Date(),
+      },
+    ];
+  }
 
   return organizations;
 }

apps/api/src/utils/organisation.ts

@@ -0,0 +1,171 @@
+import { Database, organization } from "@repo/database";
+import { eq } from "drizzle-orm";
+import { customAlphabet } from "nanoid";
+
+// list of forbidden words for organization names
+const FORBIDDEN_SLUGS = [
+  "origami",
+  "admin",
+  "api",
+  "origami-chat",
+  "org",
+  "select",
+  "website",
+  "app",
+  "web",
+  "www",
+  "blog",
+  "docs",
+  "help",
+  "support",
+  "contact",
+  "about",
+  "terms",
+  "privacy",
+  "security",
+  "login",
+  "register",
+  "dashboard",
+  "settings",
+  "profile",
+  "account",
+  "billing",
+  "feature",
+  "features",
+  "page",
+  "pages",
+];
+
+// Most popular email domains that B2B customers might use
+// These are considered "popular" domains where we should generate random slugs
+const POPULAR_EMAIL_DOMAINS = [
+  // Consumer email providers
+  "gmail.com",
+  "yahoo.com",
+  "hotmail.com",
+  "outlook.com",
+  "icloud.com",
+  "me.com",
+  "mac.com",
+  "protonmail.com",
+  "proton.me",
+  "tutanota.com",
+  "zoho.com",
+  "yandex.com",
+  "yandex.ru",
+  "aol.com",
+  "gmx.com",
+  "gmx.net",
+  "gmx.de",
+  "t-online.de",
+  "web.de",
+  "mail.com",
+  "mail.ru",
+  "qq.com",
+  "163.com",
+  "126.com",
+  "sina.com",
+  "naver.com",
+  "daum.net",
+  "rediffmail.com",
+
+  // Popular business email providers (where companies often use generic domains)
+  "google.com", // Google Workspace but on google.com domain
+  "microsoft.com",
+  "office365.com",
+  "live.com",
+  "msn.com",
+  "windowslive.com",
+
+  // Other popular free providers
+  "fastmail.com",
+  "hey.com",
+  "superhuman.com",
+];
+
+// URL-friendly alphabet for slug generation (lowercase letters and numbers)
+const SLUG_ALPHABET = "ORIGAMIorigami0123456789";
+const SLUG_LENGTH = 8;
+
+// Create nanoId generator for slugs
+const generateNanoSlugId = customAlphabet(SLUG_ALPHABET, SLUG_LENGTH);
+
+export function isForbiddenSlug(slug: string): boolean {
+  return FORBIDDEN_SLUGS.includes(slug.toLowerCase());
+}
+
+export function isPopularEmailDomain(email: string): boolean {
+  const domain = email.split("@")[1]?.toLowerCase();
+  return domain ? POPULAR_EMAIL_DOMAINS.includes(domain) : false;
+}
+
+export function generateSlugFromName(name: string): string {
+  // remove all non-alphanumeric characters and convert to lowercase
+  let slug = name.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
+
+  // if empty after cleaning, generate random slug
+  if (!slug) {
+    return generateNanoSlugId();
+  }
+
+  // if the slug is in the forbidden words list, add a random number to the end
+  if (isForbiddenSlug(slug)) {
+    slug = `${slug}-${Math.floor(Math.random() * 1000000)}`;
+  }
+
+  return slug;
+}
+
+export async function generateSlugFromEmailDomain(
+  db: Database,
+  params: {
+    email: string;
+  }
+): Promise<{ slug: string; organizationName: string }> {
+  const domain = params.email.split("@")[1]?.toLowerCase();
+
+  if (!domain) {
+    const slug = generateNanoSlugId();
+
+    return { slug, organizationName: slug.replace(/-/g, " ") };
+  }
+
+  // If this is a popular email domain, generate a random slug instead
+  if (isPopularEmailDomain(params.email)) {
+    const slug = generateNanoSlugId();
+
+    return { slug, organizationName: slug.replace(/-/g, " ") };
+  }
+
+  // Remove everything after the first dot and clean the domain
+  let slug = domain
+    .split(".")[0]
+    .replace(/[^a-zA-Z0-9]/g, "")
+    .toLowerCase();
+
+  // if empty after cleaning, generate random slug
+  if (!slug) {
+    const slug = generateNanoSlugId();
+
+    return { slug, organizationName: slug.replace(/-/g, " ") };
+  }
+
+  // if the slug is in the forbidden words list, add a random number to the end
+  if (isForbiddenSlug(slug)) {
+    slug = `${slug}-${generateNanoSlugId()}`;
+  }
+
+  // check if the slug is already taken
+  const existingOrganization = await db.query.organization.findFirst({
+    where: eq(organization.slug, slug),
+  });
+
+  if (existingOrganization) {
+    return {
+      slug: generateNanoSlugId(),
+      organizationName: existingOrganization.name,
+    };
+  }
+
+  return { slug, organizationName: slug.replace(/-/g, " ") };
+}

apps/origami-web/package.json

@@ -24,6 +24,7 @@
     "better-auth": "^1.2.9",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
+    "drizzle-orm": "0.44.0",
     "fumadocs-core": "^15.5.1",
     "fumadocs-mdx": "^11.6.7",
     "fumadocs-ui": "^15.5.1",

…web/src/app/(withAuth)/auth/TestTRPC.tsx …ithAuth)/[organisationSlug]/TestTRPC.tsxapps/origami-web/src/app/(withAuth)/auth/TestTRPC.tsx renamed to apps/origami-web/src/app/(withAuth)/[organisationSlug]/TestTRPC.tsx apps/origami-web/src/app/(withAuth)/auth/TestTRPC.tsx renamed to apps/origami-web/src/app/(withAuth)/[organisationSlug]/TestTRPC.tsx

@@ -8,5 +8,5 @@ export default function TestTRPC() {
 
   const { data, isLoading } = useQuery(trpc.user.me.queryOptions());
 
-  return <div>{data?.email}</div>;
+  return <div>{data?.email} houla</div>;
 }

apps/origami-web/src/app/(withAuth)/[organisationSlug]/page.tsx

@@ -0,0 +1,26 @@
+import { ensurePageAuth } from "@/lib/auth/server";
+import TestTRPC from "./TestTRPC";
+import { db } from "@database/database";
+import { getOrganizationsForUserOrCreateDefault } from "@api/db/queries/organization";
+
+export default async function Auth() {
+  const { user } = await ensurePageAuth();
+
+  // If the user lands on this page and is not a member of any organization, we create a default one for them
+  const orgs = await getOrganizationsForUserOrCreateDefault(db, {
+    userId: user?.id,
+    userEmail: user?.email,
+    userName: user?.name,
+  });
+
+  // Redirect to the active organization
+
+  return (
+    <div className="flex flex-col items-center justify-center h-screen">
+      <h1 className="text-4xl font-bold">Origami</h1>
+      <p>You're signed-in as {user?.email}</p>
+
+      <TestTRPC />
+    </div>
+  );
+}

apps/origami-web/src/app/(withAuth)/auth/page.tsx

@@ -0,0 +1,27 @@
+import { ensurePageAuth } from "@/lib/auth/server";
+import { db } from "@database/database";
+import { getOrganizationsForUserOrCreateDefault } from "@api/db/queries/organization";
+import { notFound, redirect } from "next/navigation";
+
+export default async function Auth() {
+  const { user } = await ensurePageAuth();
+
+  // If the user lands on this page and is not a member of any organization, we create a default one for them
+  const orgs = await getOrganizationsForUserOrCreateDefault(db, {
+    userId: user?.id,
+    userEmail: user?.email,
+    userName: user?.name,
+  });
+
+  const orgToRedirectTo = orgs?.[0]?.organization;
+
+  // This should never happen, but just in case
+  if (!orgToRedirectTo) {
+    console.error(`ERROR: User ${user?.id} has no organizations found`);
+
+    notFound();
+  }
+
+  // Redirect to the active organization
+  redirect(`/${orgToRedirectTo.slug}`);
+}