* chore: Upgrade prisma to 6.7.0 * Build fixes * type fixes Signed-off-by: Omar López <zomars@me.com> * Update schema.prisma * Patching * Revert "Update schema.prisma" This reverts commit 47d8618bf89ef4d007b30084df766f17281e21a1. * Revert "Patching" This reverts commit a1d2e3040e71690a44d4324db95d73b4d68c6adb. * Revert schema changes Signed-off-by: Omar López <zomars@me.com> * WIP Signed-off-by: Omar López <zomars@me.com> * Update getPublicEvent.ts * Update imports Signed-off-by: Omar López <zomars@me.com> * Update gitignore Signed-off-by: Omar López <zomars@me.com> * update remaining imports Signed-off-by: Omar López <zomars@me.com> * Delete .cursor/config.json * Discard changes to packages/features/eventtypes/lib/getPublicEvent.ts * Update _get.ts * Update user.ts * Update .gitignore * update * Update WorkflowStepContainer.tsx * Update next-auth-custom-adapter.ts * Update getPublicEvent.ts * Update workflow.ts * Update next-auth-custom-adapter.ts * Update next-auth-options.ts * Update bookingScenario.ts * fix missing imports * upgrades prismock Signed-off-by: Omar López <zomars@me.com> * patches prismock Signed-off-by: Omar López <zomars@me.com> * Update reschedule.test.ts * Update prisma.ts * patch prismock Signed-off-by: Omar López <zomars@me.com> * fix enums imports Signed-off-by: Omar López <zomars@me.com> * Revert "Update prisma.ts" This reverts commit 64edcf8db54171ff4456c209d563b5d431d99619. * Revert "patch prismock" This reverts commit e95819113dc9d88e7130947aa120cd42710977c8. * fix patch * Fix test that overrun the boundary, it shouldn't test too much * Move prisma import to changeSMSLockState * Bring back broken test without illegal imports * Merge with main and fix filter hosts by same round robin host * Fixed buildDryRunBooking fn tests * Fix and move ooo create or update handler test * Fix packages/features/eventtypes/lib/isCurrentlyAvailable.test.ts * Fix packages/trpc/server/routers/viewer/organizations/listMembers.handler.test.ts * Mock @calcom/prisma * Fix: verify-email.test.ts * fix: Moved WebhookService test and fixed default import mock * Fix: Added missing prisma mock, handleNewBooking uses that of course * We're not testing createContext here * fix: Prisma mock fix for listMembers.test.ts * More fixes to broken testcases * Forgot to remove borked test * Prevent the need to mock a lot of dependencies by moving out buildBaseWhereCondition to its own file * Temporarily skip getCalendarEvents, needs a rewrite * Fix: turns out you can access protected in testcases * fix further mocks * Added packages/features/insights/server/buildBaseWhereCondition.ts, types * Always great to have a mock and then not use it * And one less again. * fix: confirm.handler.test, didn't mock prisma * fix: Address minor nit by @eunjae & fix ImpersonationProvider test * Updated isPrismaAvailableCheck that doesn't crash on import * fix: Get Prisma directly from the client, it usually involves the Validator and does not need 'local' inclusion * Add zod-prisma-types without the generator enabled (commented out) * Uncomment and see what happens * Change method of import as imports did not work in Input Schemas * Remove custom 'zod' booking model, it does not belong with Prisma * Fix all other global Model imports * Rewrite most schema includes AND remove barrel file * Add bookingCreateBodySchema to features/bookings * Flurry of type fixes for compatibility with new zod gen * Refactor out the custom prisma type createEventTypeInput * Work around nullable eventTypeLocations * HandlePayment type fix * More fixes, final fix remaining is CompleteEventType * Should fix a bunch more booking related type errors * Missed one * Some props missing from BookingCreateBodySchema * Fix location type in handleChildrenEventTypes * Little bit hacky imo but it works * Final type error \o/ * Forgot to include Prisma * Do not include zod-utils in booker/types * Oops, was already including Booker/types * Fix membership type, also disallow updating createdAt/updatedAt, make part of patch/post * Fix api v1 type errors * Fix EventTypeDescription typings * Remove getParserWithGeneric, use userBodySchema with UserSchema * use centralized timeZoneSchema * Implement feedback by @zomars * Couple of WIP pushes * Fix tests * Type fixes in `handleChildrenEventTypes` test * Try and parse metadata before use * Change zod-prisma-types configuration for optimal performance * Fix prisma validator error in `prisma/selects/credential` * Disable seperate relations model, hits a bug * Import absolute - this makes rollup work in @platform/libraries * Attempt at removing resolutions override * Refactor using `Prisma.validator` to `satisfies` * Build atoms using @calcom/prisma/client * Build atoms using @calcom/prisma/client * fixes * Update eventTypeSelect.ts * Adjust `eventTypeMetaDataSchemaWithUntypedApps` from `unknown` to `record(any)` * `EventTypeDescription` rely on `descriptionAsSafeHTML` instead of `description` * Add `seatsPerTimeSlot` to event type public select * Fix typing in `users-public-view` getServerSide props * Add missing `schedulingType` to prop * chore: bump platform libraries * Function return type is illegal, not sure how this passed eslint (#21567) * Merged with main * Update updateTokenObject.ts * Update handleResponse.ts * Update index.ts * Update handleChildrenEventTypes.ts * Update booking-idempotency-key.ts * Update WebhookService.test.ts * Update events.test.ts * Update queued-response.test.ts * Update events.test.ts * Update getRoutedUrl.test.ts * fix: type checks Signed-off-by: Omar López <zomars@me.com> * fixes Signed-off-by: Omar López <zomars@me.com> * chore: bump platform libraries * Update yarn.lock * more fixes Signed-off-by: Omar López <zomars@me.com> * fixes Signed-off-by: Omar López <zomars@me.com> * biuld fixes * chore: bump platform libraries * Update conferencing.repository.ts * Update conferencing.repository.ts * Update getCalendarsEvents.test.ts * Update vite.config.js * chore: bump platform libraries * Update users.ts * Discard changes to docs/api-reference/v2/openapi.json * Update vite.config.ts * updated platform libraries * Update get.handler.test.ts * Update get.handler.test.ts * Update schema.prisma * Discard changes to docs/api-reference/v2/openapi.json * Update next-auth-custom-adapter.ts * Update team.ts * Flurry of type fixes * Fix majority of insight related type errors * Type fixes for unlink of account * Make user nullable again * Fixed a bunch of unit tests and one type error * Attempted mock fix * Attempted fix for Attribute type * Ensure default import becomes prisma, but not direct usage * Import default as prisma in prisma.module * Add attributeOption to attribute type * Fix calcom/prisma mock * Refactor Prisma client imports to @calcom/prisma/client Updated all imports from '@prisma/client' to '@calcom/prisma/client' across tests and repository files for consistency and to use the correct Prisma client package. This change improves maintainability and ensures the correct client is referenced throughout the codebase. * Undo removal of max-warnings=0 to get main to merge * Remove unit tests for e2e fixtures, provide new prisma mock * Mock @calcom/prisma in event manager * Mock @calcom/prisma in event manager * Add correct format even with --no-verify * Mock prisma in CalendarManager * Add mock for permission-check.service * Better injection in PrismaApiKeyRepository imports * More mock fixes :) * Fix listMembers.handler.test * Fix User import * Appropriately adjust all types to be imported as types, there were a lot of types imported as normal deps * Why was this a thing? * Strictly speaking; Not using prismock anymore * Ditched patch file for prismock * Fix output.service.ts platform type imports, need concrete for plainToClass * Better typing and tests for unlinkConnectedAccount.handler * Small type fix * Disable calendar cache tests as they are dependent on prismock * chore: bump platform lib * getRoutedUrl test remove of unused import * Extract select to external const on getEventTypesFromDB * Direct select of userSelect from selects/user * fix type error from merging 23653 * Fixed integration tests by removing hardcoded values that were possible due to mocking, but as its now directly hitting the db no longer * fix: vite config atoms prisma client type location * revert: example app prisma client * revert: example app prisma client * bump platform libs * fix: use class instead of type for DI of PlatformBookingsService * update platform libs * remove unused variable * chore: generate prisma client for api v2 * fix: api v2 e2e * fix: atoms e2e * fix: atoms e2e * fix: atoms e2e * fix: api v2 e2e * fix: tsconfig apiv2 enums * publish libraries * Simplify check for existence teamId --------- Signed-off-by: Omar López <zomars@me.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com>
170 lines
5.7 KiB
TypeScript
170 lines
5.7 KiB
TypeScript
import type { Adapter, AdapterUser, AdapterAccount } from "next-auth/adapters";
|
|
|
|
import type { PrismaClient } from "@calcom/prisma";
|
|
import { Prisma } from "@calcom/prisma/client";
|
|
import type { Account, IdentityProvider, User } from "@calcom/prisma/client";
|
|
|
|
const parseIntSafe = (id: string | number): number => {
|
|
if (typeof id === "number") return id;
|
|
const parsed = parseInt(id, 10);
|
|
if (isNaN(parsed)) throw new Error(`Invalid ID format: ${id}`);
|
|
return parsed;
|
|
};
|
|
|
|
// Simple utility functions for transformations
|
|
const toAdapterUser = (user: User): AdapterUser => ({
|
|
id: user.id.toString(),
|
|
name: user.name,
|
|
email: user.email,
|
|
emailVerified: user.emailVerified,
|
|
image: user.avatarUrl,
|
|
});
|
|
|
|
const toAdapterAccount = (account: Account): AdapterAccount => ({
|
|
userId: account.userId.toString(),
|
|
type: account.type as AdapterAccount["type"],
|
|
provider: account.provider,
|
|
providerAccountId: account.providerAccountId,
|
|
refresh_token: account.refresh_token ?? undefined,
|
|
access_token: account.access_token ?? undefined,
|
|
expires_at: account.expires_at ?? undefined,
|
|
token_type: account.token_type ?? undefined,
|
|
scope: account.scope ?? undefined,
|
|
id_token: account.id_token ?? undefined,
|
|
session_state: account.session_state ?? undefined,
|
|
});
|
|
|
|
const createUserData = (data: Omit<AdapterUser, "id">): Prisma.UserCreateInput => ({
|
|
name: data.name || null,
|
|
email: data.email,
|
|
emailVerified: data.emailVerified || null,
|
|
avatarUrl: data.image || null,
|
|
});
|
|
|
|
const createAccountData = (account: AdapterAccount): Prisma.AccountCreateInput => ({
|
|
provider: account.provider,
|
|
providerAccountId: account.providerAccountId,
|
|
type: account.type,
|
|
user: { connect: { id: parseIntSafe(account.userId) } },
|
|
access_token: account.access_token,
|
|
refresh_token: account.refresh_token,
|
|
expires_at: account.expires_at,
|
|
token_type: account.token_type,
|
|
scope: account.scope,
|
|
id_token: account.id_token,
|
|
session_state: account.session_state,
|
|
});
|
|
|
|
const getAccountWhere = (provider: string, providerAccountId: string) => ({
|
|
provider_providerAccountId: { provider, providerAccountId },
|
|
});
|
|
|
|
export default function CalComAdapter(prismaClient: PrismaClient): Adapter {
|
|
return {
|
|
createUser: async (data) => {
|
|
const user = await prismaClient.user.create({ data: createUserData(data) });
|
|
return toAdapterUser(user);
|
|
},
|
|
|
|
getUser: async (id) => {
|
|
const user = await prismaClient.user.findUnique({ where: { id: parseIntSafe(id) } });
|
|
return user ? toAdapterUser(user) : null;
|
|
},
|
|
|
|
getUserByEmail: async (email) => {
|
|
const user = await prismaClient.user.findUnique({ where: { email } });
|
|
return user ? toAdapterUser(user) : null;
|
|
},
|
|
|
|
async getUserByAccount(providerAccountId) {
|
|
const account = await prismaClient.account.findUnique({
|
|
where: getAccountWhere(providerAccountId.provider, providerAccountId.providerAccountId),
|
|
select: { user: true },
|
|
});
|
|
|
|
if (account?.user) {
|
|
return toAdapterUser(account.user);
|
|
}
|
|
|
|
// Fallback for legacy users without Account entries
|
|
const provider = providerAccountId.provider.toUpperCase();
|
|
|
|
const isGoogleOrSaml = (p: string): p is Extract<IdentityProvider, "GOOGLE" | "SAML"> =>
|
|
["GOOGLE", "SAML"].includes(p);
|
|
if (!isGoogleOrSaml(provider)) return null;
|
|
|
|
const user = await prismaClient.user.findFirst({
|
|
where: {
|
|
identityProviderId: providerAccountId.providerAccountId,
|
|
identityProvider: provider,
|
|
},
|
|
});
|
|
|
|
return user ? toAdapterUser(user) : null;
|
|
},
|
|
|
|
updateUser: async (userData) => {
|
|
const { id, ...data } = userData;
|
|
const user = await prismaClient.user.update({
|
|
where: { id: parseIntSafe(id) },
|
|
data: {
|
|
name: data.name,
|
|
email: data.email,
|
|
emailVerified: data.emailVerified,
|
|
avatarUrl: data.image,
|
|
},
|
|
});
|
|
return toAdapterUser(user);
|
|
},
|
|
|
|
deleteUser: async (userId) => {
|
|
const user = await prismaClient.user.delete({ where: { id: parseIntSafe(userId) } });
|
|
return toAdapterUser(user);
|
|
},
|
|
|
|
createVerificationToken: async (data) => {
|
|
const token = await prismaClient.verificationToken.create({ data });
|
|
const { id, ...verificationToken } = token;
|
|
return verificationToken;
|
|
},
|
|
|
|
useVerificationToken: async (identifier_token) => {
|
|
try {
|
|
const token = await prismaClient.verificationToken.delete({ where: { identifier_token } });
|
|
const { id, ...verificationToken } = token;
|
|
return verificationToken;
|
|
} catch (error) {
|
|
// If token already used/deleted, just return null
|
|
// https://www.prisma.io/docs/reference/api-reference/error-reference#p2025
|
|
if (error instanceof Prisma.PrismaClientKnownRequestError) {
|
|
if (error.code === "P2025") return null;
|
|
}
|
|
throw error;
|
|
}
|
|
},
|
|
|
|
linkAccount: async (account) => {
|
|
const createdAccount = await prismaClient.account.create({ data: createAccountData(account) });
|
|
return toAdapterAccount(createdAccount);
|
|
},
|
|
|
|
unlinkAccount: async (providerAccountId) => {
|
|
const deletedAccount = await prismaClient.account.delete({
|
|
where: getAccountWhere(providerAccountId.provider, providerAccountId.providerAccountId),
|
|
});
|
|
return toAdapterAccount(deletedAccount);
|
|
},
|
|
|
|
createSession: async (session) => session,
|
|
getSessionAndUser: async () => null,
|
|
updateSession: async (session) => ({
|
|
sessionToken: session.sessionToken || "",
|
|
userId: session.userId || "",
|
|
expires: session.expires || new Date(),
|
|
}),
|
|
deleteSession: async () => {
|
|
// No-op implementation for minimal session support
|
|
},
|
|
} satisfies Adapter;
|
|
}
|