fix(organization): scope ORGANIZATION_MEMBER_UPDATE_ROLE to the authenticated org

apps/api/src/tools/organization/member-update-role.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "bun:test";
+import { describe, expect, it, mock } from "bun:test";
 import { ORGANIZATION_MEMBER_UPDATE_ROLE } from "./member-update-role";
 
 describe("ORGANIZATION_MEMBER_UPDATE_ROLE outputSchema", () => {
@@ -31,3 +31,38 @@ describe("ORGANIZATION_MEMBER_UPDATE_ROLE outputSchema", () => {
     expect(result.success).toBe(true);
   });
 });
+
+describe("ORGANIZATION_MEMBER_UPDATE_ROLE handler", () => {
+  it("rejects an organizationId other than the authenticated one", async () => {
+    const updateMemberRole = mock(async () => ({}));
+    const ctx = {
+      auth: { user: { id: "user-1" } },
+      access: { check: mock(async () => {}) },
+      organization: { id: "org-1", slug: "acme", name: "Acme" },
+      db: {
+        selectFrom: () => ({
+          select: () => ({
+            where: () => ({
+              where: () => ({
+                executeTakeFirst: async () => ({ role: "owner" }),
+              }),
+            }),
+          }),
+        }),
+      },
+      boundAuth: { organization: { updateMemberRole } },
+    } as unknown as Parameters<
+      typeof ORGANIZATION_MEMBER_UPDATE_ROLE.handler
+    >[1];
+
+    await expect(
+      ORGANIZATION_MEMBER_UPDATE_ROLE.handler(
+        { organizationId: "org-2", memberId: "member-1", role: ["admin"] },
+        ctx,
+      ),
+    ).rejects.toThrow(
+      "Organization ID does not match authenticated organization",
+    );
+    expect(updateMemberRole.mock.calls.length).toBe(0);
+  });
+});

apps/api/src/tools/organization/member-update-role.ts

@@ -55,6 +55,13 @@ export const ORGANIZATION_MEMBER_UPDATE_ROLE = defineTool({
       );
     }
 
+    // Validate organization ID matches context (mirrors member-add.ts/update.ts).
+    if (organizationId !== ctx.organization?.id) {
+      throw new Error(
+        "Organization ID does not match authenticated organization",
+      );
+    }
+
     // Validate the caller is allowed to assign every target role. `organizationId`
     // may be an explicit override (not the session's active org), and
     // `ctx.auth.user?.role` only ever reflects the active-org role — using it here