fix(organizations): fix data consistency bugs found in code review

- acceptInvite: create Profile + guard against user already in another org
- removeMember: delete Profile + clear user.organizationId in transaction
- inviteMember: reject invite if invitee already belongs to an org
- profile page: fix members link pointing to /teams (now /settings/organizations/members)
- E2E acceptInvite: assert user.organizationId and Profile after accept
- E2E members list: scope name selector to ul li to avoid strict mode violation

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: regisstedile

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/profile/page.tsx

@@ -44,7 +44,7 @@ export default function OrganizationProfilePage() {
             </p>
 
             <div className="flex flex-wrap gap-2 pt-2">
-              <Button href="/teams">{t("members")}</Button>
+              <Button href="/settings/organizations/members">{t("members")}</Button>
               <Button href="/event-types" color="secondary">
                 {t("event_types_page_title")}
               </Button>

apps/web/playwright/settings/organizations.e2e.ts

@@ -54,7 +54,7 @@ test.describe("Organization Settings", () => {
     await page.waitForLoadState("networkidle");
 
     await expect(page.getByTestId("invite-member-btn")).toBeVisible();
-    await expect(page.getByText(owner.name ?? owner.username ?? "")).toBeVisible();
+    await expect(page.locator("ul li").filter({ hasText: owner.name ?? owner.username ?? "" })).toBeVisible();
   });
 
   test("owner can invite existing member and member sees pending invite", async ({
@@ -135,6 +135,17 @@ test.describe("Organization Settings", () => {
       where: { userId_teamId: { userId: invitee.id, teamId: org.id } },
     });
     expect(membership?.accepted).toBe(true);
+
+    const updatedUser = await prisma.user.findUnique({
+      where: { id: invitee.id },
+      select: { organizationId: true },
+    });
+    expect(updatedUser?.organizationId).toBe(org.id);
+
+    const profile = await prisma.profile.findFirst({
+      where: { userId: invitee.id, organizationId: org.id },
+    });
+    expect(profile).not.toBeNull();
   });
 
   test("invitee can decline an org invite", async ({ page, users, orgs }) => {

packages/trpc/server/routers/viewer/organizations/acceptInvite.handler.ts

@@ -1,8 +1,11 @@
+import { v4 as uuidv4 } from "uuid";
+
 import prisma from "@calcom/prisma";
 import { TRPCError } from "@trpc/server";
 
 import type { TrpcSessionUser } from "../../../types";
 import type { TAcceptDeclineInviteInputSchema } from "./schema";
+import { getProfileUsername } from "./organizationUtils";
 
 type AcceptInviteHandlerOptions = {
   ctx: {
@@ -12,10 +15,16 @@ type AcceptInviteHandlerOptions = {
 };
 
 export const acceptInviteHandler = async ({ ctx, input }: AcceptInviteHandlerOptions) => {
-  const membership = await prisma.membership.findUnique({
-    where: { userId_teamId: { userId: ctx.user.id, teamId: input.teamId } },
-    select: { accepted: true, teamId: true },
-  });
+  const [membership, user] = await Promise.all([
+    prisma.membership.findUnique({
+      where: { userId_teamId: { userId: ctx.user.id, teamId: input.teamId } },
+      select: { accepted: true, teamId: true },
+    }),
+    prisma.user.findUnique({
+      where: { id: ctx.user.id },
+      select: { id: true, username: true, email: true, organizationId: true },
+    }),
+  ]);
 
   if (!membership) {
     throw new TRPCError({ code: "NOT_FOUND", message: "Invite not found." });
@@ -25,11 +34,23 @@ export const acceptInviteHandler = async ({ ctx, input }: AcceptInviteHandlerOpt
     throw new TRPCError({ code: "BAD_REQUEST", message: "Invite already accepted." });
   }
 
+  if (user?.organizationId) {
+    throw new TRPCError({ code: "CONFLICT", message: "You already belong to an organization." });
+  }
+
   await prisma.$transaction([
     prisma.membership.update({
       where: { userId_teamId: { userId: ctx.user.id, teamId: input.teamId } },
       data: { accepted: true },
     }),
+    prisma.profile.create({
+      data: {
+        uid: uuidv4(),
+        userId: ctx.user.id,
+        organizationId: input.teamId,
+        username: getProfileUsername(user ?? { email: "" }),
+      },
+    }),
     prisma.user.update({
       where: { id: ctx.user.id },
       data: { organizationId: input.teamId },

packages/trpc/server/routers/viewer/organizations/inviteMember.handler.ts

@@ -21,7 +21,7 @@ export const inviteMemberHandler = async ({ ctx, input }: InviteMemberHandlerOpt
 
   const invitee = await prisma.user.findUnique({
     where: { email: input.email.toLowerCase() },
-    select: { id: true, name: true, email: true, locale: true },
+    select: { id: true, name: true, email: true, locale: true, organizationId: true },
   });
 
   if (!invitee) {
@@ -31,6 +31,13 @@ export const inviteMemberHandler = async ({ ctx, input }: InviteMemberHandlerOpt
     });
   }
 
+  if (invitee.organizationId) {
+    throw new TRPCError({
+      code: "CONFLICT",
+      message: "This user already belongs to an organization.",
+    });
+  }
+
   const existing = await prisma.membership.findUnique({
     where: { userId_teamId: { userId: invitee.id, teamId: membership.team.id } },
     select: { accepted: true },

packages/trpc/server/routers/viewer/organizations/removeMember.handler.ts

@@ -33,9 +33,18 @@ export const removeMemberHandler = async ({ ctx, input }: RemoveMemberHandlerOpt
     throw new TRPCError({ code: "FORBIDDEN", message: "Cannot remove the organization owner." });
   }
 
-  await prisma.membership.delete({
-    where: { userId_teamId: { userId: input.userId, teamId: membership.team.id } },
-  });
+  await prisma.$transaction([
+    prisma.membership.delete({
+      where: { userId_teamId: { userId: input.userId, teamId: membership.team.id } },
+    }),
+    prisma.profile.deleteMany({
+      where: { userId: input.userId, organizationId: membership.team.id },
+    }),
+    prisma.user.updateMany({
+      where: { id: input.userId, organizationId: membership.team.id },
+      data: { organizationId: null },
+    }),
+  ]);
 
   return { success: true };
 };