Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

fix(rbac): return 400 on duplicate org membership in members.create (#17428)

Niklas Semmlerdf4ac6cdacc8
diff --git a/web/src/__tests__/server/members-trpc.servertest.ts b/web/src/__tests__/server/members-trpc.servertest.ts
index 95015b0cb9..78482f27b1 100644
--- a/web/src/__tests__/server/members-trpc.servertest.ts
+++ b/web/src/__tests__/server/members-trpc.servertest.ts
@@ -1,3 +1,4 @@
+import { vi } from "vitest";
import { appRouter } from "@/src/server/api/root";
import { createInnerTRPCContext } from "@/src/server/api/trpc";
import { prisma } from "@langfuse/shared/src/db";
@@ -891,6 +892,44 @@ describe("membersRouter.create - duplicate project membership", () => {
});
});
+describe("membersRouter.create - duplicate org membership", () => {
+ it("returns BAD_REQUEST when a concurrent request already created the org membership", async () => {
+ const { org, caller } = await prepare("cloud:team");
+ const user = await createTestUser();
+
+ // Simulate the concurrent race the create path guards against: the
+ // existing-membership pre-check sees no row, but by the time the org
+ // membership is created another request has already inserted the
+ // (orgId, userId) row, so the unique constraint fires. Seed the real row
+ // and stub only the pre-check so the request reaches the create.
+ await prisma.organizationMembership.create({
+ data: {
+ userId: user.id,
+ orgId: org.id,
+ role: Role.MEMBER,
+ },
+ });
+ const findFirstSpy = vi
+ .spyOn(prisma.organizationMembership, "findFirst")
+ .mockResolvedValueOnce(null);
+
+ try {
+ await expect(
+ caller.members.create({
+ orgId: org.id,
+ email: user.email!,
+ orgRole: Role.MEMBER,
+ }),
+ ).rejects.toMatchObject({
+ code: "BAD_REQUEST",
+ message: "User is already a member of this organization",
+ });
+ } finally {
+ findFirstSpy.mockRestore();
+ }
+ });
+});
+
describe("membersRouter.updateProjectRole - project organization consistency", () => {
it("rejects a project from another organization without writing membership or audit log", async () => {
const { org, ownerUser, caller } = await prepare("cloud:team");
diff --git a/web/src/features/rbac/server/membersRouter.ts b/web/src/features/rbac/server/membersRouter.ts
index 55441e4060..f317c855c9 100644
--- a/web/src/features/rbac/server/membersRouter.ts
+++ b/web/src/features/rbac/server/membersRouter.ts
@@ -139,6 +139,33 @@ async function createProjectMembershipOrThrowIfDuplicate({
}
}
+async function createOrgMembershipOrThrowIfDuplicate({
+ prisma,
+ data,
+}: {
+ prisma: PrismaClient | Prisma.TransactionClient;
+ data: {
+ userId: string;
+ orgId: string;
+ role: Role;
+ };
+}) {
+ try {
+ return await prisma.organizationMembership.create({ data });
+ } catch (error) {
+ if (
+ error instanceof Prisma.PrismaClientKnownRequestError &&
+ error.code === "P2002"
+ ) {
+ throw new TRPCError({
+ code: "BAD_REQUEST",
+ message: "User is already a member of this organization",
+ });
+ }
+ throw error;
+ }
+}
+
export const membersRouter = createTRPCRouter({
...allMembersRoutes,
...allInvitesRoutes,
@@ -346,7 +373,8 @@ export const membersRouter = createTRPCRouter({
countCurrentUsage: countSeatsInUse,
create: async (tx) => {
const createdOrgMembership =
- await tx.organizationMembership.create({
+ await createOrgMembershipOrThrowIfDuplicate({
+ prisma: tx,
data: {
userId: user.id,
orgId: input.orgId,