Skip to content

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

fix(rbac): return 400 when re-adding an existing project member (#17182)

Niklas Semmlere80271c389a2
diff --git a/web/src/__tests__/server/members-trpc.servertest.ts b/web/src/__tests__/server/members-trpc.servertest.ts
index fb56a7a7df..9795211805 100644
--- a/web/src/__tests__/server/members-trpc.servertest.ts
+++ b/web/src/__tests__/server/members-trpc.servertest.ts
@@ -806,6 +806,84 @@ describe("membersRouter.updateProjectRole - orgMembership/userId consistency", (
});
});
+describe("membersRouter.create - duplicate project membership", () => {
+ it("returns BAD_REQUEST when re-adding an existing org member to a project they already belong to", async () => {
+ const { org, project, caller } = await prepare("cloud:team");
+ const user = await createTestUser();
+ const orgMembership = await prisma.organizationMembership.create({
+ data: {
+ userId: user.id,
+ orgId: org.id,
+ role: Role.MEMBER,
+ },
+ });
+ await prisma.projectMembership.create({
+ data: {
+ userId: user.id,
+ projectId: project.id,
+ role: Role.VIEWER,
+ orgMembershipId: orgMembership.id,
+ },
+ });
+
+ await expect(
+ caller.members.create({
+ orgId: org.id,
+ email: user.email!,
+ orgRole: Role.NONE,
+ projectId: project.id,
+ projectRole: Role.VIEWER,
+ }),
+ ).rejects.toMatchObject({
+ code: "BAD_REQUEST",
+ message: "User is already a member of this project",
+ });
+ });
+
+ it("returns BAD_REQUEST when adding a new org member who already has a project membership", async () => {
+ const { org, project, caller } = await prepare("cloud:team");
+ const user = await createTestUser();
+ // Project memberships require an orgMembershipId FK. Seed the unique
+ // (project_id, user_id) collision via a membership in another org so this
+ // request still takes the "create org membership, then project
+ // membership" branch.
+ const otherOrg = await prisma.organization.create({
+ data: {
+ id: uuidv4(),
+ name: `Other Org ${uuidv4().substring(0, 8)}`,
+ },
+ });
+ const otherOrgMembership = await prisma.organizationMembership.create({
+ data: {
+ userId: user.id,
+ orgId: otherOrg.id,
+ role: Role.MEMBER,
+ },
+ });
+ await prisma.projectMembership.create({
+ data: {
+ userId: user.id,
+ projectId: project.id,
+ role: Role.VIEWER,
+ orgMembershipId: otherOrgMembership.id,
+ },
+ });
+
+ await expect(
+ caller.members.create({
+ orgId: org.id,
+ email: user.email!,
+ orgRole: Role.MEMBER,
+ projectId: project.id,
+ projectRole: Role.VIEWER,
+ }),
+ ).rejects.toMatchObject({
+ code: "BAD_REQUEST",
+ message: "User is already a member of this project",
+ });
+ });
+});
+
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 0723ec9859..10035c5c58 100644
--- a/web/src/features/rbac/server/membersRouter.ts
+++ b/web/src/features/rbac/server/membersRouter.ts
@@ -109,6 +109,34 @@ async function throwIfHigherProjectRole({
}
}
+async function createProjectMembershipOrThrowIfDuplicate({
+ prisma,
+ data,
+}: {
+ prisma: PrismaClient;
+ data: {
+ userId: string;
+ projectId: string;
+ role: Role;
+ orgMembershipId: string;
+ };
+}) {
+ try {
+ return await prisma.projectMembership.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 project",
+ });
+ }
+ throw error;
+ }
+}
+
export const membersRouter = createTRPCRouter({
...allMembersRoutes,
...allInvitesRoutes,
@@ -256,7 +284,8 @@ export const membersRouter = createTRPCRouter({
) {
// Create project role for user
const newProjectMembership =
- await ctx.prisma.projectMembership.create({
+ await createProjectMembershipOrThrowIfDuplicate({
+ prisma: ctx.prisma,
data: {
userId: user.id,
projectId: project.id,
@@ -313,14 +342,16 @@ export const membersRouter = createTRPCRouter({
role: input.orgRole,
});
if (project && input.projectRole && input.projectRole !== Role.NONE) {
- const projectMembership = await ctx.prisma.projectMembership.create({
- data: {
- userId: user.id,
- projectId: project.id,
- role: input.projectRole,
- orgMembershipId: orgMembership.id,
- },
- });
+ const projectMembership =
+ await createProjectMembershipOrThrowIfDuplicate({
+ prisma: ctx.prisma,
+ data: {
+ userId: user.id,
+ projectId: project.id,
+ role: input.projectRole,
+ orgMembershipId: orgMembership.id,
+ },
+ });
await auditLog({
session: ctx.session,
resourceType: "projectMembership",