* refactor: replace TRPCError with ErrorWithCode in packages/features This refactor moves error handling from throwing TRPCError directly in packages/features to throwing ErrorWithCode instead. The conversion to TRPCError now happens at the TRPC layer. Changes: - Add generic ErrorCode values (Unauthorized, Forbidden, NotFound, BadRequest, InternalServerError) to errorCodes.ts - Update getServerErrorFromUnknown to map new ErrorCodes to proper HTTP status codes - Create toTRPCError helper in packages/trpc/server/lib - Create errorMappingMiddleware in packages/trpc/server/middlewares - Migrate TRPCError throws in packages/features to ErrorWithCode: - teamService.ts - getEventTypeById.ts - eventTypeRepository.ts - OrganizationPermissionService.ts - OrganizationPaymentService.ts - sso.ts - handleCreatePhoneCall.ts - userCanCreateTeamGroupMapping.ts This improves separation of concerns by making packages/features transport-agnostic, allowing the same feature code to be reused from tRPC, API routes, workers, etc. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: remove isTrpcCall parameter and fix lint warning - Remove isTrpcCall parameter from get.handler.ts call since the feature layer no longer needs to know about tRPC - Fix unsafe optional chaining lint warning in getEventTypesByViewer.ts by precomputing usersSource variable - Complete migration of getEventTypesByViewer.ts to ErrorWithCode Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * revert * add eslint rule * add comment * fix: add isTrpcCall back to getEventTypeById interface The user reverted the removal of isTrpcCall parameter from the handler, so we need to add it back to the interface to fix the type error. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * test: update teamService tests to expect ErrorWithCode instead of TRPCError Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor * wip * feat: integrate errorMappingMiddleware into base TRPC procedure Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * connect middlewares * revert * revert * refactor * rename * fix: handle ErrorWithCode in teams server-page error handling The error handling was checking for TRPCError, but teamService now throws ErrorWithCode. This caused the 'This invitation is not for your account' error message to not be displayed when a wrong user tries to use an invitation link. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix * fix * fix --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
398 lines
14 KiB
TypeScript
398 lines
14 KiB
TypeScript
import prismaMock from "../../../../../tests/libs/__mocks__/prismaMock";
|
|
|
|
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
|
|
|
import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries";
|
|
import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
|
|
import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
|
|
import { createAProfileForAnExistingUser } from "@calcom/features/profile/lib/createAProfileForAnExistingUser";
|
|
import { deleteDomain } from "@calcom/lib/domainManager/organization";
|
|
import { ErrorCode } from "@calcom/lib/errorCodes";
|
|
import { ErrorWithCode } from "@calcom/lib/errors";
|
|
import type { Membership, Team, User, VerificationToken, Profile } from "@calcom/prisma/client";
|
|
import { MembershipRole } from "@calcom/prisma/enums";
|
|
|
|
import { TeamService } from "./teamService";
|
|
|
|
vi.mock("@calcom/ee/billing/di/containers/Billing");
|
|
vi.mock("@calcom/features/ee/teams/repositories/TeamRepository");
|
|
vi.mock("@calcom/features/ee/workflows/lib/service/WorkflowService");
|
|
vi.mock("@calcom/lib/domainManager/organization");
|
|
vi.mock("@calcom/features/ee/teams/lib/removeMember");
|
|
vi.mock("@calcom/features/profile/lib/createAProfileForAnExistingUser");
|
|
vi.mock("@calcom/features/ee/teams/lib/queries");
|
|
|
|
const mockTeamBilling = {
|
|
cancel: vi.fn(),
|
|
updateQuantity: vi.fn(),
|
|
publish: vi.fn(),
|
|
downgrade: vi.fn(),
|
|
};
|
|
|
|
const mockTeamBillingFactory = {
|
|
findAndInit: vi.fn().mockResolvedValue(mockTeamBilling),
|
|
findAndInitMany: vi.fn().mockResolvedValue([mockTeamBilling]),
|
|
};
|
|
|
|
describe("TeamService", () => {
|
|
beforeEach(async () => {
|
|
vi.resetAllMocks();
|
|
mockTeamBillingFactory.findAndInit.mockResolvedValue(mockTeamBilling);
|
|
mockTeamBillingFactory.findAndInitMany.mockResolvedValue([mockTeamBilling]);
|
|
|
|
const { getTeamBillingServiceFactory } = await import("@calcom/ee/billing/di/containers/Billing");
|
|
vi.mocked(getTeamBillingServiceFactory).mockReturnValue(mockTeamBillingFactory);
|
|
});
|
|
|
|
afterEach(() => {
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
describe("delete", () => {
|
|
it("should delete team, cancel billing, and clean up", async () => {
|
|
const mockDeletedTeam = {
|
|
id: 1,
|
|
name: "Deleted Team",
|
|
isOrganization: true,
|
|
slug: "deleted-team",
|
|
};
|
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
// @ts-ignore
|
|
const mockTeamRepo = {
|
|
deleteById: vi.fn().mockResolvedValue(mockDeletedTeam),
|
|
} as Pick<TeamRepository, "deleteById">;
|
|
vi.mocked(TeamRepository).mockImplementation(() => mockTeamRepo);
|
|
|
|
const result = await TeamService.delete({ id: 1 });
|
|
|
|
expect(mockTeamBillingFactory.findAndInit).toHaveBeenCalledWith(1);
|
|
expect(mockTeamBilling.cancel).toHaveBeenCalled();
|
|
expect(WorkflowService.deleteWorkflowRemindersOfRemovedTeam).toHaveBeenCalledWith(1);
|
|
expect(mockTeamRepo.deleteById).toHaveBeenCalledWith({ id: 1 });
|
|
expect(deleteDomain).toHaveBeenCalledWith("deleted-team");
|
|
expect(result).toEqual(mockDeletedTeam);
|
|
});
|
|
});
|
|
|
|
describe("inviteMemberByToken", () => {
|
|
it("should throw error if verification token is not found", async () => {
|
|
prismaMock.verificationToken.findFirst.mockResolvedValue(null);
|
|
await expect(TeamService.inviteMemberByToken("invalid-token", 1)).rejects.toThrow(ErrorWithCode);
|
|
});
|
|
|
|
it("should create provisional membership and update billing", async () => {
|
|
const mockToken = {
|
|
teamId: 1,
|
|
team: { name: "Test Team" },
|
|
expiresInDays: null,
|
|
expires: new Date(Date.now() + 86400000),
|
|
token: "valid-token",
|
|
identifier: "test@example.com",
|
|
id: "1",
|
|
};
|
|
prismaMock.verificationToken.findFirst.mockResolvedValue(mockToken);
|
|
prismaMock.membership.create.mockResolvedValue({} as Membership);
|
|
|
|
const result = await TeamService.inviteMemberByToken("valid-token", 1);
|
|
|
|
expect(prismaMock.membership.create).toHaveBeenCalledWith({
|
|
data: {
|
|
accepted: false,
|
|
createdAt: expect.any(Date),
|
|
role: MembershipRole.MEMBER,
|
|
teamId: 1,
|
|
userId: 1,
|
|
},
|
|
});
|
|
expect(mockTeamBilling.updateQuantity).toHaveBeenCalled();
|
|
expect(result).toBe("Test Team");
|
|
});
|
|
});
|
|
|
|
describe("acceptTeamMembership", () => {
|
|
it("should accept membership and update event types for regular team", async () => {
|
|
const mockMembership = {
|
|
team: { id: 1, parentId: null, isOrganization: false },
|
|
};
|
|
|
|
prismaMock.membership.update.mockResolvedValue(mockMembership as Membership & { team: Team });
|
|
vi.mocked(updateNewTeamMemberEventTypes).mockResolvedValue(undefined);
|
|
|
|
await TeamService.acceptTeamMembership({
|
|
userId: 1,
|
|
teamId: 1,
|
|
userEmail: "test@example.com",
|
|
username: "testuser",
|
|
});
|
|
|
|
expect(prismaMock.membership.update).toHaveBeenCalledWith({
|
|
where: { userId_teamId: { userId: 1, teamId: 1 } },
|
|
data: { accepted: true },
|
|
select: { team: true },
|
|
});
|
|
expect(updateNewTeamMemberEventTypes).toHaveBeenCalledWith(1, 1);
|
|
});
|
|
|
|
it("should accept membership and create profile for organization", async () => {
|
|
const mockMembership = {
|
|
team: { id: 1, parentId: null, isOrganization: true },
|
|
};
|
|
|
|
prismaMock.membership.update.mockResolvedValue(mockMembership as Membership & { team: Team });
|
|
vi.mocked(createAProfileForAnExistingUser).mockResolvedValue({} as Profile);
|
|
vi.mocked(updateNewTeamMemberEventTypes).mockResolvedValue(undefined);
|
|
|
|
await TeamService.acceptTeamMembership({
|
|
userId: 1,
|
|
teamId: 1,
|
|
userEmail: "test@example.com",
|
|
username: "testuser",
|
|
});
|
|
|
|
expect(createAProfileForAnExistingUser).toHaveBeenCalledWith({
|
|
user: {
|
|
id: 1,
|
|
email: "test@example.com",
|
|
currentUsername: "testuser",
|
|
},
|
|
organizationId: 1,
|
|
});
|
|
});
|
|
|
|
it("should accept membership and handle parent team for subteam", async () => {
|
|
const mockMembership = {
|
|
team: { id: 1, parentId: 2, isOrganization: false },
|
|
};
|
|
|
|
prismaMock.membership.update
|
|
.mockResolvedValueOnce(mockMembership as Membership & { team: Team })
|
|
.mockResolvedValueOnce({} as Membership);
|
|
vi.mocked(createAProfileForAnExistingUser).mockResolvedValue({} as Profile);
|
|
vi.mocked(updateNewTeamMemberEventTypes).mockResolvedValue(undefined);
|
|
|
|
await TeamService.acceptTeamMembership({
|
|
userId: 1,
|
|
teamId: 1,
|
|
userEmail: "test@example.com",
|
|
username: "testuser",
|
|
});
|
|
|
|
expect(prismaMock.membership.update).toHaveBeenCalledTimes(2);
|
|
expect(prismaMock.membership.update).toHaveBeenNthCalledWith(2, {
|
|
where: { userId_teamId: { userId: 1, teamId: 2 } },
|
|
data: { accepted: true },
|
|
});
|
|
expect(createAProfileForAnExistingUser).toHaveBeenCalledWith({
|
|
user: {
|
|
id: 1,
|
|
email: "test@example.com",
|
|
currentUsername: "testuser",
|
|
},
|
|
organizationId: 2,
|
|
});
|
|
});
|
|
});
|
|
describe("leaveTeamMembership", () => {
|
|
it("should delete membership when rejecting invitation", async () => {
|
|
const mockMembership = {
|
|
team: { id: 1, parentId: null },
|
|
};
|
|
|
|
prismaMock.membership.delete.mockResolvedValue(mockMembership as Membership & { team: Team });
|
|
|
|
await TeamService.leaveTeamMembership({
|
|
userId: 1,
|
|
teamId: 1,
|
|
});
|
|
|
|
expect(prismaMock.membership.delete).toHaveBeenCalledWith({
|
|
where: { userId_teamId: { userId: 1, teamId: 1 } },
|
|
select: { team: true },
|
|
});
|
|
});
|
|
|
|
it("should delete parent membership when rejecting subteam invitation", async () => {
|
|
const mockMembership = {
|
|
team: { id: 1, parentId: 2 },
|
|
};
|
|
|
|
prismaMock.membership.delete
|
|
.mockResolvedValueOnce(mockMembership as Membership & { team: Team })
|
|
.mockResolvedValueOnce({} as Membership);
|
|
|
|
await TeamService.leaveTeamMembership({
|
|
userId: 1,
|
|
teamId: 1,
|
|
});
|
|
|
|
expect(prismaMock.membership.delete).toHaveBeenCalledTimes(2);
|
|
expect(prismaMock.membership.delete).toHaveBeenNthCalledWith(2, {
|
|
where: { userId_teamId: { userId: 1, teamId: 2 } },
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("acceptInvitationByToken", () => {
|
|
it("should throw error if verification token is not found", async () => {
|
|
prismaMock.verificationToken.findFirst.mockResolvedValue(null);
|
|
await expect(TeamService.acceptInvitationByToken("invalid-token", 1)).rejects.toThrow(ErrorWithCode);
|
|
});
|
|
|
|
it("should throw error if token is not associated with team", async () => {
|
|
const mockToken = {
|
|
teamId: null,
|
|
team: null,
|
|
identifier: "test@example.com",
|
|
id: "1",
|
|
};
|
|
|
|
prismaMock.verificationToken.findFirst.mockResolvedValue(
|
|
mockToken as VerificationToken & { team: Team | null }
|
|
);
|
|
|
|
await expect(TeamService.acceptInvitationByToken("valid-token", 1)).rejects.toThrow(
|
|
new ErrorWithCode(ErrorCode.NotFound, "Invite token is not associated with any team")
|
|
);
|
|
});
|
|
|
|
it("should throw error if user not found", async () => {
|
|
const mockToken = {
|
|
teamId: 1,
|
|
team: { name: "Test Team" },
|
|
identifier: "test@example.com",
|
|
id: "1",
|
|
};
|
|
|
|
prismaMock.verificationToken.findFirst.mockResolvedValue(
|
|
mockToken as VerificationToken & { team: Team }
|
|
);
|
|
prismaMock.user.findUnique.mockResolvedValue(null);
|
|
|
|
await expect(TeamService.acceptInvitationByToken("valid-token", 1)).rejects.toThrow(
|
|
new ErrorWithCode(ErrorCode.NotFound, "User not found")
|
|
);
|
|
});
|
|
|
|
it("should throw error if user email doesn't match token identifier", async () => {
|
|
const mockToken = {
|
|
teamId: 1,
|
|
team: { name: "Test Team" },
|
|
identifier: "invited@example.com",
|
|
id: "1",
|
|
};
|
|
|
|
const mockUser = {
|
|
email: "different@example.com",
|
|
username: "testuser",
|
|
};
|
|
|
|
prismaMock.verificationToken.findFirst.mockResolvedValue(
|
|
mockToken as VerificationToken & { team: Team }
|
|
);
|
|
prismaMock.user.findUnique.mockResolvedValue(mockUser as User);
|
|
|
|
await expect(TeamService.acceptInvitationByToken("valid-token", 1)).rejects.toThrow(
|
|
new ErrorWithCode(ErrorCode.Forbidden, "This invitation is not for your account")
|
|
);
|
|
});
|
|
|
|
it("should throw error if user username doesn't match token identifier", async () => {
|
|
const mockToken = {
|
|
teamId: 1,
|
|
team: { name: "Test Team" },
|
|
identifier: "inviteduser",
|
|
id: "1",
|
|
};
|
|
|
|
const mockUser = {
|
|
email: "test@example.com",
|
|
username: "differentuser",
|
|
};
|
|
|
|
prismaMock.verificationToken.findFirst.mockResolvedValue(
|
|
mockToken as VerificationToken & { team: Team }
|
|
);
|
|
prismaMock.user.findUnique.mockResolvedValue(mockUser as User);
|
|
|
|
await expect(TeamService.acceptInvitationByToken("valid-token", 1)).rejects.toThrow(
|
|
new ErrorWithCode(ErrorCode.Forbidden, "This invitation is not for your account")
|
|
);
|
|
});
|
|
|
|
it("should accept invitation when user email matches token identifier", async () => {
|
|
const mockToken = {
|
|
teamId: 1,
|
|
team: { name: "Test Team" },
|
|
identifier: "test@example.com",
|
|
id: "1",
|
|
};
|
|
|
|
const mockUser = {
|
|
email: "test@example.com",
|
|
username: "testuser",
|
|
};
|
|
|
|
const mockMembership = {
|
|
team: { id: 1, parentId: null, isOrganization: false },
|
|
};
|
|
|
|
prismaMock.verificationToken.findFirst.mockResolvedValue(
|
|
mockToken as VerificationToken & { team: Team }
|
|
);
|
|
prismaMock.user.findUnique.mockResolvedValue(mockUser as User);
|
|
prismaMock.membership.update.mockResolvedValue(mockMembership as Membership & { team: Team });
|
|
vi.mocked(updateNewTeamMemberEventTypes).mockResolvedValue(undefined);
|
|
|
|
await TeamService.acceptInvitationByToken("valid-token", 1);
|
|
|
|
expect(prismaMock.membership.update).toHaveBeenCalledWith({
|
|
where: { userId_teamId: { userId: 1, teamId: 1 } },
|
|
data: { accepted: true },
|
|
select: { team: true },
|
|
});
|
|
});
|
|
|
|
it("should accept invitation when user username matches token identifier", async () => {
|
|
const mockToken = {
|
|
teamId: 1,
|
|
team: { name: "Test Team" },
|
|
identifier: "testuser",
|
|
id: "1",
|
|
};
|
|
|
|
const mockUser = {
|
|
email: "testuser@example.com",
|
|
username: "testuser",
|
|
};
|
|
|
|
const mockMembership = {
|
|
team: { id: 1, parentId: null, isOrganization: false },
|
|
};
|
|
|
|
prismaMock.verificationToken.findFirst.mockResolvedValue(
|
|
mockToken as VerificationToken & { team: Team }
|
|
);
|
|
prismaMock.user.findUnique.mockResolvedValue(mockUser as User);
|
|
prismaMock.membership.update.mockResolvedValue(mockMembership as Membership & { team: Team });
|
|
vi.mocked(updateNewTeamMemberEventTypes).mockResolvedValue(undefined);
|
|
|
|
await TeamService.acceptInvitationByToken("valid-token", 1);
|
|
|
|
expect(prismaMock.membership.update).toHaveBeenCalledWith({
|
|
where: { userId_teamId: { userId: 1, teamId: 1 } },
|
|
data: { accepted: true },
|
|
select: { team: true },
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("publish", () => {
|
|
it("should call publish on TeamBilling", async () => {
|
|
await TeamService.publish(1);
|
|
|
|
expect(mockTeamBillingFactory.findAndInit).toHaveBeenCalledWith(1);
|
|
expect(mockTeamBilling.publish).toHaveBeenCalled();
|
|
});
|
|
});
|
|
});
|