Merge pull request #507 from trycompai/main

PROD

Author: Marfuen

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/all/actions/addEmployeeWithoutInvite.ts

@@ -0,0 +1,46 @@
+"use server";
+
+import { auth } from "@/utils/auth";
+import { db } from "@comp/db";
+
+export const addEmployeeWithoutInvite = async ({
+	email,
+	organizationId,
+}: {
+	email: string;
+	organizationId: string;
+}) => {
+	try {
+		let userId = "";
+		const existingUser = await db.user.findUnique({
+			where: {
+				email,
+			},
+		});
+
+		if (!existingUser) {
+			const newUser = await db.user.create({
+				data: {
+					emailVerified: false,
+					email,
+					name: email.split("@")[0],
+				},
+			});
+
+			userId = newUser.id;
+		}
+
+		const member = await auth.api.addMember({
+			body: {
+				userId: existingUser?.id ?? userId,
+				organizationId,
+				role: "employee",
+			},
+		});
+
+		return { success: true, data: member };
+	} catch (error) {
+		console.error("Error adding employee:", error);
+		return { success: false, error: "Failed to add employee" };
+	}
+};

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/all/components/InviteMembersModal.tsx

@@ -34,6 +34,7 @@ import { Input } from "@comp/ui/input";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@comp/ui/tabs";
 import { MultiRoleCombobox } from "./MultiRoleCombobox";
 import { authClient } from "@/utils/auth-client";
+import { addEmployeeWithoutInvite } from "../actions/addEmployeeWithoutInvite";
 
 // --- Constants for Roles ---
 const selectableRoles = [
@@ -110,7 +111,12 @@ export function InviteMembersModal({
 		resolver: zodResolver(formSchema),
 		defaultValues: {
 			mode: "manual",
-			manualInvites: [{ email: "", roles: DEFAULT_ROLES }],
+			manualInvites: [
+				{
+					email: "",
+					roles: DEFAULT_ROLES,
+				},
+			],
 			csvFile: undefined,
 		},
 		mode: "onChange",
@@ -165,15 +171,25 @@ export function InviteMembersModal({
 
 				// Process each invitation sequentially
 				for (const invite of values.manualInvites) {
+					const isEmployeeOnly =
+						invite.roles.length === 1 &&
+						invite.roles[0] === "employee";
 					try {
-						// Use authClient to send the invitation
-						await authClient.organization.inviteMember({
-							email: invite.email,
-							role:
-								invite.roles.length === 1
-									? invite.roles[0]
-									: invite.roles,
-						});
+						if (isEmployeeOnly) {
+							await addEmployeeWithoutInvite({
+								organizationId,
+								email: invite.email,
+							});
+						} else {
+							// Use authClient to send the invitation
+							await authClient.organization.inviteMember({
+								email: invite.email,
+								role:
+									invite.roles.length === 1
+										? invite.roles[0]
+										: invite.roles,
+							});
+						}
 						successCount++;
 					} catch (error) {
 						console.error(

apps/app/src/app/[locale]/(app)/no-access/page.tsx

@@ -0,0 +1,61 @@
+import { OrganizationSwitcher } from "@/components/organization-switcher";
+import { auth } from "@/utils/auth";
+import { db } from "@comp/db";
+import { headers } from "next/headers";
+import Link from "next/link";
+import { redirect } from "next/navigation";
+
+export default async function NoAccess() {
+	const session = await auth.api.getSession({
+		headers: await headers(),
+	});
+
+	if (!session || !session.session.activeOrganizationId) {
+		return redirect("/");
+	}
+
+	const organizations = await db.organization.findMany({
+		where: {
+			members: {
+				some: {
+					userId: session.user.id,
+				},
+			},
+		},
+	});
+
+	const currentOrg = await db.organization.findUnique({
+		where: {
+			id: session.session.activeOrganizationId,
+		},
+	});
+
+	return (
+		<div className="flex flex-col items-center justify-center h-screen bg-foreground/05 gap-4">
+			<h1 className="text-2xl font-bold">Access Denied</h1>
+			<div className="flex flex-col text-center">
+				<p>
+					<b>Employees</b> don't have access to app.trycomp.ai, did
+					you mean to go to{" "}
+					<Link
+						href="https://portal.trycomp.ai"
+						className="underline text-primary"
+					>
+						portal.trycomp.ai
+					</Link>
+					?
+				</p>
+				<p>
+					Please select another organization or contact your
+					organization administrator.
+				</p>
+			</div>
+			<div>
+				<OrganizationSwitcher
+					organizations={organizations}
+					organization={currentOrg}
+				/>
+			</div>
+		</div>
+	);
+}

apps/app/src/app/[locale]/(app)/setup/page.tsx

@@ -35,6 +35,11 @@ export default async function Page() {
 		where: {
 			email: session.user.email,
 			status: "pending",
+			role: {
+				not: {
+					contains: "employee",
+				},
+			},
 		},
 	});
 

apps/app/src/app/[locale]/page.tsx

@@ -1,4 +1,5 @@
 import { auth } from "@/utils/auth";
+import { db } from "@comp/db";
 import { headers } from "next/headers";
 import { redirect } from "next/navigation";
 
@@ -17,5 +18,20 @@ export default async function RootPage() {
 		return redirect("/setup");
 	}
 
+	const member = await db.member.findFirst({
+		where: {
+			organizationId: orgId,
+			userId: session.user.id,
+		},
+	});
+
+	if (member?.role === "employee") {
+		return redirect("/no-access");
+	}
+
+	if (!member) {
+		return redirect("/setup");
+	}
+
 	return redirect(`/${orgId}/implementation`);
 }

yarn.lock

@@ -1420,18 +1420,19 @@
     picocolors "^1.0.0"
     sisteransi "^1.0.5"
 
-"@comp/analytics@packages/analytics":
+"@comp/analytics@^workspace:packages/analytics":
   version "workspace:packages/analytics"
   resolved "workspace:packages/analytics"
   dependencies:
     posthog-js "^1.215.3"
     posthog-node "^4.4.1"
 
-"@comp/app@apps/app", "@comp/app@workspace:*":
+"@comp/app@^workspace:apps/app", "@comp/app@workspace:*":
   version "workspace:apps/app"
   resolved "workspace:apps/app"
   devDependencies:
     "@comp/db" "workspace:*"
+  devDependencies:
     "@trigger.dev/build" "3.3.17"
     "@types/node" "^22.15.2"
     "@types/react" "19.1.2"
@@ -1447,9 +1448,11 @@
     "@aws-sdk/client-s3" "^3.796.0"
     "@aws-sdk/s3-request-presigner" "^3.800.0"
     "@browserbasehq/sdk" "^2.5.0"
+  dependencies:
     "@comp/data" "workspace:*"
     "@comp/db" "workspace:*"
     "@comp/notifications" "workspace:*"
+  dependencies:
     "@date-fns/tz" "^1.2.0"
     "@dnd-kit/core" "^6.3.1"
     "@dnd-kit/modifiers" "^9.0.0"
@@ -1527,25 +1530,27 @@
     yarn "^1.22.22"
     zustand "^5.0.3"
 
-"@comp/data@packages/data", "@comp/data@workspace:*":
+"@comp/data@^workspace:packages/data", "@comp/data@workspace:*":
   version "workspace:packages/data"
   resolved "workspace:packages/data"
   devDependencies:
     "@comp/db" "workspace:*"
+  devDependencies:
     tsup "^8.4.0"
     typescript "^5.8.2"
 
-"@comp/db@packages/db", "@comp/db@workspace:*":
+"@comp/db@^workspace:packages/db", "@comp/db@workspace:*":
   version "workspace:packages/db"
   resolved "workspace:packages/db"
   devDependencies:
     "@comp/tsconfig" "workspace:*"
+  devDependencies:
     typescript "^5.8.2"
   dependencies:
     "@prisma/client" "6.6.0"
     prisma "^6.6.0"
 
-"@comp/email@packages/email":
+"@comp/email@^workspace:packages/email":
   version "workspace:packages/email"
   resolved "workspace:packages/email"
   devDependencies:
@@ -1566,7 +1571,7 @@
     react-email "3.0.4"
     responsive-react-email "^0.0.5"
 
-"@comp/integrations@packages/integrations":
+"@comp/integrations@^workspace:packages/integrations":
   version "workspace:packages/integrations"
   resolved "workspace:packages/integrations"
   devDependencies:
@@ -1589,14 +1594,14 @@
     sharp "^0.33.5"
     zod "^3.24.2"
 
-"@comp/kv@packages/kv":
+"@comp/kv@^workspace:packages/kv":
   version "workspace:packages/kv"
   resolved "workspace:packages/kv"
   dependencies:
     "@upstash/redis" "^1.34.2"
     server-only "0.0.1"
 
-"@comp/notifications@packages/notifications", "@comp/notifications@workspace:*":
+"@comp/notifications@^workspace:packages/notifications", "@comp/notifications@workspace:*":
   version "workspace:packages/notifications"
   resolved "workspace:packages/notifications"
   devDependencies:
@@ -1605,7 +1610,7 @@
     "@novu/node" "^2.0.1"
     nanoid "5.1.0"
 
-"@comp/portal@apps/portal":
+"@comp/portal@^workspace:apps/portal":
   version "workspace:apps/portal"
   resolved "workspace:apps/portal"
   devDependencies:
@@ -1626,11 +1631,11 @@
     react-dom "^19.1.0"
     react-otp-input "^3.1.1"
 
-"@comp/tsconfig@packages/tsconfig", "@comp/tsconfig@workspace:*":
+"@comp/tsconfig@^workspace:packages/tsconfig", "@comp/tsconfig@workspace:*":
   version "workspace:packages/tsconfig"
   resolved "workspace:packages/tsconfig"
 
-"@comp/ui@packages/ui", "@comp/ui@workspace:*":
+"@comp/ui@^workspace:packages/ui", "@comp/ui@workspace:*":
   version "workspace:packages/ui"
   resolved "workspace:packages/ui"
   devDependencies:
@@ -1694,7 +1699,7 @@
     use-callback-ref "^1.3.3"
     vaul "^1.0.0"
 
-"@comp/utils@packages/utils", "@comp/utils@workspace:*":
+"@comp/utils@^workspace:packages/utils", "@comp/utils@workspace:*":
   version "workspace:packages/utils"
   resolved "workspace:packages/utils"
   devDependencies: