🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
feat: listen to role changes on PUT (#19489)
jordibosch20d522dcc7bcda
diff --git a/web/src/__tests__/server/scim-api.servertest.ts b/web/src/__tests__/server/scim-api.servertest.tsindex 9f9b9fa6e7..b6fa1cda3a 100644--- a/web/src/__tests__/server/scim-api.servertest.ts+++ b/web/src/__tests__/server/scim-api.servertest.ts@@ -976,6 +976,68 @@ describe("SCIM API", () => {expect(auditLogs.length).toBe(0);});+ it("should update an existing member's role when active is omitted (Okta profile push)", async () => {+ const before = await prisma.organizationMembership.findFirst({+ where: { userId: testUserId, orgId: orgId },+ });++ const response = await makeZodVerifiedAPICall(+ ScimUserSchema,+ "PUT",+ `/api/public/scim/Users/${testUserId}`,+ {+ schemas: ["urn:ietf:params:scim:schemas:core:2.0:User"],+ id: testUserId,+ userName: "[email protected]",+ roles: ["ADMIN"],+ },+ createBasicAuthHeader(orgApiKey, orgSecretKey),+ 200,+ );+ expect(response.status).toBe(200);++ const after = await prisma.organizationMembership.findFirst({+ where: { userId: testUserId, orgId: orgId },+ });+ expect(after!.id).toBe(before!.id);+ expect(after!.role).toBe("ADMIN");++ const auditLogs = await prisma.auditLog.findMany({+ where: {+ resourceType: "orgMembership",+ resourceId: before!.id,+ action: "update",+ orgId: orgId,+ },+ });+ expect(auditLogs.length).toBe(1);+ });++ it("should leave an existing member untouched when both active and roles are omitted", async () => {+ await prisma.organizationMembership.updateMany({+ where: { userId: testUserId, orgId: orgId },+ data: { role: "MEMBER" },+ });++ const response = await makeAPICall(+ "PUT",+ `/api/public/scim/Users/${testUserId}`,+ {+ schemas: ["urn:ietf:params:scim:schemas:core:2.0:User"],+ id: testUserId,+ userName: "[email protected]",+ },+ createBasicAuthHeader(orgApiKey, orgSecretKey),+ );+ expect(response.status).toBe(200);++ const after = await prisma.organizationMembership.findMany({+ where: { userId: testUserId, orgId: orgId },+ });+ expect(after.length).toBe(1);+ expect(after[0].role).toBe("MEMBER");+ });+it("should write a delete audit log when PUT active:false deprovisions a membership", async () => {const before = await prisma.organizationMembership.findFirst({where: { userId: testUserId, orgId: orgId },@@ -1592,7 +1654,10 @@ describe("SCIM API", () => {const result = await makeAPICall<{ detail: string; userName?: string }>("PUT",`/api/public/scim/Users/${outsider.id}`,- { schemas: ["urn:ietf:params:scim:schemas:core:2.0:User"] },+ {+ schemas: ["urn:ietf:params:scim:schemas:core:2.0:User"],+ roles: ["ADMIN"],+ },createBasicAuthHeader(orgApiKey, orgSecretKey),);diff --git a/web/src/pages/api/public/scim/Users/[id].ts b/web/src/pages/api/public/scim/Users/[id].tsindex 703da3a15e..c45f770d96 100644--- a/web/src/pages/api/public/scim/Users/[id].ts+++ b/web/src/pages/api/public/scim/Users/[id].ts@@ -655,8 +655,15 @@ async function handlePut(// is omitted we create a default NONE membership if one is missing but leave// an existing membership untouched — so a periodic IdP full-sync that omits// roles cannot reset an existing member's role back to NONE.- if (typeof body.active === "boolean") {- if (body.active) {+ //+ // Okta profile pushes send `roles` without `active`. The membership check+ // above guarantees the user is already a member, so a roles-only PUT is+ // handled like `active: true`.+ const isRolesOnlyUpdate =+ body.active === undefined && body.roles !== undefined;+ const effectiveActive = isRolesOnlyUpdate ? true : body.active;+ if (typeof effectiveActive === "boolean") {+ if (effectiveActive) {const outcome = await provisionMembership({userId: user.id,orgId,