🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor user organization role assignment logic
Bill Yang1157dab53700
diff --git a/server/src/api/user/addUserToOrganization.ts b/server/src/api/user/addUserToOrganization.tsindex c9cb6b583..831771f3d 100644--- a/server/src/api/user/addUserToOrganization.ts+++ b/server/src/api/user/addUserToOrganization.ts@@ -33,14 +33,15 @@ export async function addUserToOrganization(request: FastifyRequest<AddUserToOrgconst isAdmin = await getIsUserAdmin(request);+ let callerMembership = null;if (!isAdmin) {if (!userId) {return reply.status(401).send({ error: "Unauthorized" });}- const userMembership = await db.query.member.findFirst({+ callerMembership = await db.query.member.findFirst({where: and(eq(member.userId, userId), eq(member.organizationId, organizationId)),});- if (!userMembership || (userMembership.role !== "admin" && userMembership.role !== "owner")) {+ if (!callerMembership || (callerMembership.role !== "admin" && callerMembership.role !== "owner")) {return reply.status(401).send({ error: "Unauthorized" });}}@@ -58,6 +59,13 @@ export async function addUserToOrganization(request: FastifyRequest<AddUserToOrg});}+ // Only an organization owner (or a system admin) may grant the owner role.+ // Otherwise an org admin could mint an owner — an account with higher+ // privileges than their own — which is a privilege-escalation path.+ if (role === "owner" && !isAdmin && callerMembership?.role !== "owner") {+ return reply.status(403).send({ error: "Only an organization owner can assign the owner role" });+ }+const foundUser = await db.query.user.findFirst({where: eq(user.email, email),});