* refactor: convert UserRepository to use dependency injection pattern - Convert all static methods to public instance methods - Add constructor that takes PrismaClient parameter - Update all usage sites to use new instantiation pattern: new UserRepository(prisma).method() - Follow same pattern as PrismaOOORepository for consistency - Maintain all existing method logic and signatures unchanged - Update 125+ files across the codebase to adapt to new pattern Co-Authored-By: morgan@cal.com <morgan@cal.com> * optimize: reuse UserRepository instances within same function scope - Create single UserRepository instance per function scope - Reuse instance for multiple method calls within same function - Reduces object instantiation overhead and improves performance - Apply optimization pattern consistently across codebase Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: repository * fixup! fix: repository * fixup! fixup! fix: repository * fixup! fixup! fixup! fix: repository * fix: update test mocking strategies for UserRepository dependency injection - Convert static method mocks to instance method mocks in userCreationService.test.ts - Update vi.spyOn calls to work with constructor injection pattern in getAllCredentials.test.ts - Fix UserRepository mocking in getRoutedUrl.test.ts to use constructor injection - Ensure consistent mocking approach across all test files - Fix 'UserRepository is not a constructor' errors in tests Co-Authored-By: morgan@cal.com <morgan@cal.com> * feat: optimize UserRepository instance reuse and add SessionUser type - Reuse UserRepository instance in OrganizationRepository.createWithNonExistentOwner - Add comprehensive SessionUser type definition for type safety - Improve type constraints in enrichUserWithTheProfile and enrichUserWithItsProfile - Ensure proper return types with profile information Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: make UserRepository mocking strategy more robust for CI environments - Add defensive checks for vi.mocked() to handle CI environment differences - Ensure mockImplementation is available before calling it - Maintain consistent mocking pattern across all test files - Fix 'Cannot read properties of undefined' error in CI Co-Authored-By: morgan@cal.com <morgan@cal.com> * fixup! fix: make UserRepository mocking strategy more robust for CI environments * refactor: convert direct UserRepository instantiations to two-step pattern - Change await new UserRepository(prisma).method(...) to const userRepo = new UserRepository(prisma); await userRepo.method(...) - Optimize instance reuse within same function scopes - Apply pattern consistently across all modified files in PR - Fix type errors in organization.ts and sessionMiddleware.ts Co-Authored-By: morgan@cal.com <morgan@cal.com> * refactor: complete two-step UserRepository pattern for remaining files - Apply two-step instantiation pattern to all remaining modified files in PR - Ensure consistent UserRepository usage across entire codebase - Maintain instance reuse optimization within function scopes Co-Authored-By: morgan@cal.com <morgan@cal.com> * chore: bump platform libs --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: morgan@cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
144 lines
3.9 KiB
TypeScript
144 lines
3.9 KiB
TypeScript
import prismock from "../../../../tests/libs/__mocks__/prisma";
|
|
|
|
import { describe, test, expect, vi, beforeEach } from "vitest";
|
|
|
|
import { hashPassword } from "@calcom/features/auth/lib/hashPassword";
|
|
import { checkIfEmailIsBlockedInWatchlistController } from "@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller";
|
|
import { CreationSource } from "@calcom/prisma/enums";
|
|
|
|
import { UserRepository } from "../repository/user";
|
|
import { UserCreationService } from "./userCreationService";
|
|
|
|
vi.mock("@calcom/lib/server/i18n", () => {
|
|
return {
|
|
getTranslation: (key: string) => {
|
|
return () => key;
|
|
},
|
|
};
|
|
});
|
|
|
|
vi.mock("@calcom/features/auth/lib/hashPassword", () => ({
|
|
hashPassword: vi.fn().mockResolvedValue("hashed-password"),
|
|
}));
|
|
|
|
vi.mock("../repository/user", () => {
|
|
return {
|
|
UserRepository: vi.fn().mockImplementation(() => ({
|
|
create: vi.fn(),
|
|
})),
|
|
};
|
|
});
|
|
|
|
vi.mock("@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller", (async) => ({
|
|
checkIfEmailIsBlockedInWatchlistController: vi.fn(() => false),
|
|
}));
|
|
|
|
const mockUserData = {
|
|
email: "test@example.com",
|
|
username: "test",
|
|
creationSource: CreationSource.WEBAPP,
|
|
};
|
|
|
|
vi.stubEnv("CALCOM_LICENSE_KEY", undefined);
|
|
|
|
describe("UserCreationService", () => {
|
|
beforeEach(() => {
|
|
prismock;
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
test("should create user", async () => {
|
|
const mockCreate = vi.fn().mockResolvedValue({
|
|
username: "test",
|
|
locked: false,
|
|
organizationId: null,
|
|
} as any);
|
|
|
|
const mockUserRepository = vi.mocked(UserRepository);
|
|
if (mockUserRepository && typeof mockUserRepository.mockImplementation === "function") {
|
|
mockUserRepository.mockImplementation(
|
|
() =>
|
|
({
|
|
create: mockCreate,
|
|
} as any)
|
|
);
|
|
}
|
|
|
|
const user = await UserCreationService.createUser({ data: mockUserData });
|
|
|
|
expect(mockCreate).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
username: "test",
|
|
locked: false,
|
|
organizationId: null,
|
|
})
|
|
);
|
|
|
|
expect(user).not.toHaveProperty("locked");
|
|
});
|
|
|
|
test("should lock user when email is in watchlist", async () => {
|
|
vi.mocked(checkIfEmailIsBlockedInWatchlistController).mockResolvedValue(true);
|
|
|
|
const mockCreate = vi.fn().mockResolvedValue({
|
|
username: "test",
|
|
locked: true,
|
|
organizationId: null,
|
|
} as any);
|
|
|
|
const mockUserRepository = vi.mocked(UserRepository);
|
|
if (mockUserRepository && typeof mockUserRepository.mockImplementation === "function") {
|
|
mockUserRepository.mockImplementation(
|
|
() =>
|
|
({
|
|
create: mockCreate,
|
|
} as any)
|
|
);
|
|
}
|
|
|
|
const user = await UserCreationService.createUser({ data: mockUserData });
|
|
|
|
expect(mockCreate).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
locked: true,
|
|
})
|
|
);
|
|
|
|
expect(user).not.toHaveProperty("locked");
|
|
});
|
|
|
|
test("should hash password when provided", async () => {
|
|
const mockPassword = "password";
|
|
vi.mocked(hashPassword).mockResolvedValue("hashed_password");
|
|
|
|
const mockCreate = vi.fn().mockResolvedValue({
|
|
username: "test",
|
|
locked: false,
|
|
organizationId: null,
|
|
} as any);
|
|
|
|
const mockUserRepository = vi.mocked(UserRepository);
|
|
if (mockUserRepository && typeof mockUserRepository.mockImplementation === "function") {
|
|
mockUserRepository.mockImplementation(
|
|
() =>
|
|
({
|
|
create: mockCreate,
|
|
} as any)
|
|
);
|
|
}
|
|
|
|
const user = await UserCreationService.createUser({
|
|
data: { ...mockUserData, password: mockPassword },
|
|
});
|
|
|
|
expect(hashPassword).toHaveBeenCalledWith(mockPassword);
|
|
expect(mockCreate).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
hashedPassword: "hashed_password",
|
|
})
|
|
);
|
|
|
|
expect(user).not.toHaveProperty("locked");
|
|
});
|
|
});
|