RomitGitHubDevin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>bot_apkAlex van Andel* fix: harden seed script org settings upsert and P2002 error handling Co-Authored-By: romitgabani1 <romitgabani1.work@gmail.com> * fix: remove PII from P2002 log and recover existing user instead of returning null - Replace username interpolation in log message with generic text (Cubic violation #2, confidence 9/10) - On P2002, fetch the existing user from DB and return it with membership data instead of returning null, which was dropping users from org setup on retries (Cubic violation #3, confidence 9/10) Co-Authored-By: bot_apk <apk@cognition.ai> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: bot_apk <apk@cognition.ai> Co-authored-by: Alex van Andel <me@alexvanandel.com>
89 lines
3.2 KiB
TypeScript
89 lines
3.2 KiB
TypeScript
import prisma from "@calcom/prisma";
|
|
import { describe, expect, it } from "vitest";
|
|
import {
|
|
getAccessibleUsers,
|
|
retrieveOrgScopedAccessibleUsers,
|
|
} from "../../../lib/utils/retrieveScopedAccessibleUsers";
|
|
|
|
describe("retrieveScopedAccessibleUsers tests", () => {
|
|
describe("getAccessibleUsers", () => {
|
|
it("Does not return members when only admin user ID is supplied", async () => {
|
|
const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-acme@example.com" } });
|
|
const accessibleUserIds = await getAccessibleUsers({
|
|
memberUserIds: [],
|
|
adminUserId: adminUser.id,
|
|
});
|
|
|
|
expect(accessibleUserIds.length).toBe(0);
|
|
});
|
|
|
|
it("Does not return members when admin user ID is not an admin of the user", async () => {
|
|
const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-dunder@example.com" } });
|
|
const memberOneUser = await prisma.user.findFirstOrThrow({
|
|
where: { email: "member1-acme@example.com" },
|
|
});
|
|
const accessibleUserIds = await getAccessibleUsers({
|
|
memberUserIds: [memberOneUser.id],
|
|
adminUserId: adminUser.id,
|
|
});
|
|
|
|
expect(accessibleUserIds.length).toBe(0);
|
|
});
|
|
|
|
it("Returns members when admin user ID is supplied and members IDs are supplied", async () => {
|
|
const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-acme@example.com" } });
|
|
const memberOneUser = await prisma.user.findFirstOrThrow({
|
|
where: { email: "member1-acme@example.com" },
|
|
});
|
|
const memberTwoUser = await prisma.user.findFirstOrThrow({
|
|
where: { email: "member2-acme@example.com" },
|
|
});
|
|
const accessibleUserIds = await getAccessibleUsers({
|
|
memberUserIds: [memberOneUser.id, memberTwoUser.id],
|
|
adminUserId: adminUser.id,
|
|
});
|
|
|
|
expect(accessibleUserIds.length).toBe(2);
|
|
expect(accessibleUserIds).toContain(memberOneUser.id);
|
|
expect(accessibleUserIds).toContain(memberTwoUser.id);
|
|
});
|
|
});
|
|
|
|
describe("retrieveOrgScopedAccessibleUsers", () => {
|
|
it("Does not return members when admin user ID is an admin of an org", async () => {
|
|
const memberOneUser = await prisma.user.findFirstOrThrow({
|
|
where: { email: "member1-acme@example.com" },
|
|
});
|
|
|
|
const accessibleUserIds = await retrieveOrgScopedAccessibleUsers({
|
|
adminId: memberOneUser.id,
|
|
});
|
|
|
|
expect(accessibleUserIds.length).toBe(0);
|
|
});
|
|
|
|
it("Returns members when admin user ID is an admin of an org", async () => {
|
|
const adminUser = await prisma.user.findFirstOrThrow({
|
|
where: { email: "owner1-acme@example.com" },
|
|
});
|
|
|
|
const accessibleUserIds = await retrieveOrgScopedAccessibleUsers({
|
|
adminId: adminUser.id,
|
|
});
|
|
|
|
const memberOneUser = await prisma.user.findFirstOrThrow({
|
|
where: { email: "member1-acme@example.com" },
|
|
});
|
|
|
|
const memberTwoUser = await prisma.user.findFirstOrThrow({
|
|
where: { email: "member2-acme@example.com" },
|
|
});
|
|
|
|
expect(accessibleUserIds.length).toBe(11);
|
|
expect(accessibleUserIds).toContain(memberOneUser.id);
|
|
expect(accessibleUserIds).toContain(memberTwoUser.id);
|
|
expect(accessibleUserIds).toContain(adminUser.id);
|
|
});
|
|
});
|
|
});
|