* 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>
104 lines
2.9 KiB
TypeScript
104 lines
2.9 KiB
TypeScript
import { getOrgFullOrigin } from "@calcom/ee/organizations/lib/orgDomains";
|
|
import { ProfileRepository } from "@calcom/lib/server/repository/profile";
|
|
import { TeamRepository } from "@calcom/lib/server/repository/team";
|
|
import { UserRepository } from "@calcom/lib/server/repository/user";
|
|
import prisma from "@calcom/prisma";
|
|
import { RedirectType } from "@calcom/prisma/enums";
|
|
|
|
import { getOrgUsernameFromEmail } from "../features/auth/signup/utils/getOrgUsernameFromEmail";
|
|
import logger from "./logger";
|
|
import { safeStringify } from "./safeStringify";
|
|
|
|
const log = logger.getSubLogger({ prefix: ["lib", "createAProfileForAnExistingUser"] });
|
|
export const createAProfileForAnExistingUser = async ({
|
|
user,
|
|
organizationId,
|
|
}: {
|
|
user: {
|
|
email: string;
|
|
id: number;
|
|
currentUsername: string | null;
|
|
};
|
|
organizationId: number;
|
|
}) => {
|
|
const org = await TeamRepository.findById({ id: organizationId });
|
|
if (!org) {
|
|
throw new Error(`Organization with id ${organizationId} not found`);
|
|
}
|
|
|
|
const existingProfile = await ProfileRepository.findByUserIdAndOrgId({
|
|
userId: user.id,
|
|
organizationId,
|
|
});
|
|
|
|
if (existingProfile) {
|
|
return existingProfile;
|
|
}
|
|
|
|
const usernameInOrg = getOrgUsernameFromEmail(
|
|
user.email,
|
|
org.organizationSettings?.orgAutoAcceptEmail ?? null
|
|
);
|
|
const profile = await ProfileRepository.createForExistingUser({
|
|
userId: user.id,
|
|
organizationId,
|
|
username: usernameInOrg,
|
|
email: user.email,
|
|
movedFromUserId: user.id,
|
|
});
|
|
|
|
const userRepo = new UserRepository(prisma);
|
|
await userRepo.updateWhereId({
|
|
whereId: user.id,
|
|
data: {
|
|
movedToProfileId: profile.id,
|
|
},
|
|
});
|
|
|
|
log.debug(
|
|
"Created profile for user",
|
|
safeStringify({ userId: user.id, profileId: profile.id, usernameInOrg, username: user.currentUsername })
|
|
);
|
|
|
|
const orgSlug = org.slug || org.requestedSlug;
|
|
|
|
if (!orgSlug) {
|
|
throw new Error(`Organization with id ${organizationId} doesn't have a slug`);
|
|
}
|
|
|
|
const orgUrl = getOrgFullOrigin(orgSlug);
|
|
|
|
if (org.isPlatform) {
|
|
// We don't want redirects for Platform Organizations
|
|
return profile;
|
|
}
|
|
|
|
if (user.currentUsername) {
|
|
log.debug(`Creating redirect for user ${user.currentUsername} to ${orgUrl}/${usernameInOrg}`);
|
|
await prisma.tempOrgRedirect.upsert({
|
|
where: {
|
|
from_type_fromOrgId: {
|
|
from: user.currentUsername,
|
|
type: RedirectType.User,
|
|
fromOrgId: 0,
|
|
},
|
|
},
|
|
update: {
|
|
type: RedirectType.User,
|
|
from: user.currentUsername,
|
|
fromOrgId: 0,
|
|
toUrl: `${orgUrl}/${usernameInOrg}`,
|
|
},
|
|
create: {
|
|
type: RedirectType.User,
|
|
from: user.currentUsername,
|
|
fromOrgId: 0,
|
|
toUrl: `${orgUrl}/${usernameInOrg}`,
|
|
},
|
|
});
|
|
} else {
|
|
log.debug(`Skipping redirect setup as ${user.id} doesn't have a username`);
|
|
}
|
|
return profile;
|
|
};
|