* 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>
182 lines
5.2 KiB
TypeScript
182 lines
5.2 KiB
TypeScript
import { z } from "zod";
|
|
|
|
import { emailSchema } from "@calcom/lib/emailSchema";
|
|
import { checkUsername } from "@calcom/lib/server/checkUsername";
|
|
import { iso8601 } from "@calcom/prisma/zod-utils";
|
|
import { UserSchema } from "@calcom/prisma/zod/modelSchema/UserSchema";
|
|
|
|
import { isValidBase64Image } from "~/lib/utils/isValidBase64Image";
|
|
import { timeZone } from "~/lib/validations/shared/timeZone";
|
|
|
|
// @note: These are the ONLY values allowed as weekStart. So user don't introduce bad data.
|
|
enum weekdays {
|
|
MONDAY = "Monday",
|
|
TUESDAY = "Tuesday",
|
|
WEDNESDAY = "Wednesday",
|
|
THURSDAY = "Thursday",
|
|
FRIDAY = "Friday",
|
|
SATURDAY = "Saturday",
|
|
SUNDAY = "Sunday",
|
|
}
|
|
|
|
// @note: extracted from apps/web/next-i18next.config.js, update if new locales.
|
|
enum locales {
|
|
EN = "en",
|
|
FR = "fr",
|
|
IT = "it",
|
|
RU = "ru",
|
|
ES = "es",
|
|
DE = "de",
|
|
PT = "pt",
|
|
RO = "ro",
|
|
NL = "nl",
|
|
PT_BR = "pt-BR",
|
|
ES_419 = "es-419",
|
|
KO = "ko",
|
|
JA = "ja",
|
|
PL = "pl",
|
|
AR = "ar",
|
|
IW = "iw",
|
|
ZH_CN = "zh-CN",
|
|
ZH_TW = "zh-TW",
|
|
CS = "cs",
|
|
SR = "sr",
|
|
SV = "sv",
|
|
VI = "vi",
|
|
BN = "bn",
|
|
}
|
|
enum theme {
|
|
DARK = "dark",
|
|
LIGHT = "light",
|
|
}
|
|
|
|
enum timeFormat {
|
|
TWELVE = 12,
|
|
TWENTY_FOUR = 24,
|
|
}
|
|
|
|
const usernameSchema = z
|
|
.string()
|
|
.transform((v) => v.toLowerCase())
|
|
// .refine(() => {})
|
|
.superRefine(async (val, ctx) => {
|
|
if (val) {
|
|
const result = await checkUsername(val);
|
|
if (!result.available) ctx.addIssue({ code: z.ZodIssueCode.custom, message: "already_in_use_error" });
|
|
if (result.premium) ctx.addIssue({ code: z.ZodIssueCode.custom, message: "premium_username" });
|
|
}
|
|
});
|
|
|
|
// @note: These are the values that are editable via PATCH method on the user Model
|
|
export const schemaUserBaseBodyParams = UserSchema.pick({
|
|
name: true,
|
|
email: true,
|
|
username: true,
|
|
bio: true,
|
|
timeZone: true,
|
|
weekStart: true,
|
|
theme: true,
|
|
appTheme: true,
|
|
defaultScheduleId: true,
|
|
locale: true,
|
|
hideBranding: true,
|
|
timeFormat: true,
|
|
brandColor: true,
|
|
darkBrandColor: true,
|
|
allowDynamicBooking: true,
|
|
role: true,
|
|
// @note: disallowing avatar changes via API for now. We can add it later if needed. User should upload image via UI.
|
|
// avatar: true,
|
|
}).partial();
|
|
// @note: partial() is used to allow for the user to edit only the fields they want to edit making all optional,
|
|
// if want to make any required do it in the schemaRequiredParams
|
|
|
|
// Here we can both require or not (adding optional or nullish) and also rewrite validations for any value
|
|
// for example making weekStart only accept weekdays as input
|
|
const schemaUserEditParams = z.object({
|
|
email: emailSchema.toLowerCase(),
|
|
username: usernameSchema,
|
|
weekStart: z.nativeEnum(weekdays).optional(),
|
|
brandColor: z.string().min(4).max(9).regex(/^#/).optional(),
|
|
darkBrandColor: z.string().min(4).max(9).regex(/^#/).optional(),
|
|
hideBranding: z.boolean().optional(),
|
|
timeZone: timeZone.optional(),
|
|
theme: z.nativeEnum(theme).optional().nullable(),
|
|
appTheme: z.nativeEnum(theme).optional().nullable(),
|
|
timeFormat: z.nativeEnum(timeFormat).optional(),
|
|
defaultScheduleId: z
|
|
.number()
|
|
.refine((id: number) => id > 0)
|
|
.optional()
|
|
.nullable(),
|
|
locale: z.nativeEnum(locales).optional().nullable(),
|
|
avatar: z.string().refine(isValidBase64Image).optional(),
|
|
});
|
|
|
|
// @note: These are the values that are editable via PATCH method on the user Model,
|
|
// merging both BaseBodyParams with RequiredParams, and omitting whatever we want at the end.
|
|
|
|
const schemaUserCreateParams = z.object({
|
|
email: emailSchema.toLowerCase(),
|
|
username: usernameSchema,
|
|
weekStart: z.nativeEnum(weekdays).optional(),
|
|
brandColor: z.string().min(4).max(9).regex(/^#/).optional(),
|
|
darkBrandColor: z.string().min(4).max(9).regex(/^#/).optional(),
|
|
hideBranding: z.boolean().optional(),
|
|
timeZone: timeZone.optional(),
|
|
theme: z.nativeEnum(theme).optional().nullable(),
|
|
appTheme: z.nativeEnum(theme).optional().nullable(),
|
|
timeFormat: z.nativeEnum(timeFormat).optional(),
|
|
defaultScheduleId: z
|
|
.number()
|
|
.refine((id: number) => id > 0)
|
|
.optional()
|
|
.nullable(),
|
|
locale: z.nativeEnum(locales).optional(),
|
|
createdDate: iso8601.optional(),
|
|
avatar: z.string().refine(isValidBase64Image).optional(),
|
|
});
|
|
|
|
// @note: These are the values that are editable via PATCH method on the user Model,
|
|
// merging both BaseBodyParams with RequiredParams, and omitting whatever we want at the end.
|
|
export const schemaUserEditBodyParams = schemaUserBaseBodyParams
|
|
.merge(schemaUserEditParams)
|
|
.omit({})
|
|
.partial()
|
|
.strict();
|
|
|
|
export const schemaUserCreateBodyParams = schemaUserBaseBodyParams
|
|
.merge(schemaUserCreateParams)
|
|
.omit({})
|
|
.strict();
|
|
|
|
// @note: These are the values that are always returned when reading a user
|
|
export const schemaUserReadPublic = UserSchema.pick({
|
|
id: true,
|
|
username: true,
|
|
name: true,
|
|
email: true,
|
|
emailVerified: true,
|
|
bio: true,
|
|
avatar: true,
|
|
timeZone: true,
|
|
weekStart: true,
|
|
endTime: true,
|
|
bufferTime: true,
|
|
appTheme: true,
|
|
theme: true,
|
|
defaultScheduleId: true,
|
|
locale: true,
|
|
timeFormat: true,
|
|
hideBranding: true,
|
|
brandColor: true,
|
|
darkBrandColor: true,
|
|
allowDynamicBooking: true,
|
|
createdDate: true,
|
|
verified: true,
|
|
invitedTo: true,
|
|
role: true,
|
|
});
|
|
|
|
export const schemaUsersReadPublic = z.array(schemaUserReadPublic);
|