Skip to content

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

fix(rbac): reject duplicate project member before creating org membership (#17191)

Niklas Semmlerb2d08298c4fc
diff --git a/web/src/__tests__/server/members-trpc.servertest.ts b/web/src/__tests__/server/members-trpc.servertest.ts
index 9795211805..95015b0cb9 100644
--- a/web/src/__tests__/server/members-trpc.servertest.ts
+++ b/web/src/__tests__/server/members-trpc.servertest.ts
@@ -881,6 +881,13 @@ describe("membersRouter.create - duplicate project membership", () => {
code: "BAD_REQUEST",
message: "User is already a member of this project",
});
+
+ // The duplicate is rejected before the org membership is created, so no
+ // partial write (or consumed seat) is left behind in the target org.
+ const orgMembership = await prisma.organizationMembership.findFirst({
+ where: { orgId: org.id, userId: user.id },
+ });
+ expect(orgMembership).toBeNull();
});
});
diff --git a/web/src/features/rbac/server/membersRouter.ts b/web/src/features/rbac/server/membersRouter.ts
index 10035c5c58..6a36fa414a 100644
--- a/web/src/features/rbac/server/membersRouter.ts
+++ b/web/src/features/rbac/server/membersRouter.ts
@@ -113,7 +113,7 @@ async function createProjectMembershipOrThrowIfDuplicate({
prisma,
data,
}: {
- prisma: PrismaClient;
+ prisma: PrismaClient | Prisma.TransactionClient;
data: {
userId: string;
projectId: string;
@@ -310,23 +310,65 @@ export const membersRouter = createTRPCRouter({
});
}
+ // A project membership can outlive this org's membership (e.g. a stray
+ // row referencing another org). Reject the duplicate before creating
+ // the org membership so a failed project insert cannot leave a
+ // committed org membership (and consumed seat) behind.
+ if (
+ project &&
+ input.projectRole &&
+ input.projectRole !== Role.NONE &&
+ (await ctx.prisma.projectMembership.findUnique({
+ where: {
+ projectId_userId: { projectId: project.id, userId: user.id },
+ },
+ }))
+ ) {
+ throw new TRPCError({
+ code: "BAD_REQUEST",
+ message: "User is already a member of this project",
+ });
+ }
+
// create org membership as user is not a member yet, unless that
- // would exceed the member limit
- const orgMembership = await createWithinEntitlementLimit({
- prisma: ctx.prisma,
- orgId: input.orgId,
- entitlementLimit: "organization-member-count",
- sessionUser: ctx.session.user,
- countCurrentUsage: countSeatsInUse,
- create: (tx) =>
- tx.organizationMembership.create({
- data: {
- userId: user.id,
- orgId: input.orgId,
- role: input.orgRole,
- },
- }),
- });
+ // would exceed the member limit. On limited plans this runs inside the
+ // entitlement transaction, so creating the project membership here too
+ // keeps both inserts atomic: a duplicate-project-membership rejection
+ // rolls back the org membership instead of leaving a consumed seat.
+ const { orgMembership, projectMembership } =
+ await createWithinEntitlementLimit({
+ prisma: ctx.prisma,
+ orgId: input.orgId,
+ entitlementLimit: "organization-member-count",
+ sessionUser: ctx.session.user,
+ countCurrentUsage: countSeatsInUse,
+ create: async (tx) => {
+ const createdOrgMembership =
+ await tx.organizationMembership.create({
+ data: {
+ userId: user.id,
+ orgId: input.orgId,
+ role: input.orgRole,
+ },
+ });
+ const createdProjectMembership =
+ project && input.projectRole && input.projectRole !== Role.NONE
+ ? await createProjectMembershipOrThrowIfDuplicate({
+ prisma: tx,
+ data: {
+ userId: user.id,
+ projectId: project.id,
+ role: input.projectRole,
+ orgMembershipId: createdOrgMembership.id,
+ },
+ })
+ : null;
+ return {
+ orgMembership: createdOrgMembership,
+ projectMembership: createdProjectMembership,
+ };
+ },
+ });
await auditLog({
session: ctx.session,
resourceType: "orgMembership",
@@ -341,17 +383,7 @@ export const membersRouter = createTRPCRouter({
email: user.email,
role: input.orgRole,
});
- if (project && input.projectRole && input.projectRole !== Role.NONE) {
- const projectMembership =
- await createProjectMembershipOrThrowIfDuplicate({
- prisma: ctx.prisma,
- data: {
- userId: user.id,
- projectId: project.id,
- role: input.projectRole,
- orgMembershipId: orgMembership.id,
- },
- });
+ if (projectMembership) {
await auditLog({
session: ctx.session,
resourceType: "projectMembership",