* 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>
254 lines
8.7 KiB
TypeScript
254 lines
8.7 KiB
TypeScript
import { useRouter } from "next/navigation";
|
|
|
|
import dayjs from "@calcom/dayjs";
|
|
import type { PaymentPageProps } from "@calcom/ee/payments/pages/payment";
|
|
import { useIsEmbed } from "@calcom/embed-core/embed-iframe";
|
|
import type { BookingResponse } from "@calcom/features/bookings/types";
|
|
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
|
|
import { navigateInTopWindow } from "@calcom/lib/navigateInTopWindow";
|
|
import type { EventType } from "@calcom/prisma/client";
|
|
|
|
import { getSafe } from "./getSafe";
|
|
|
|
export function getNewSearchParams(args: {
|
|
query: Record<string, string | null | undefined | boolean>;
|
|
searchParams?: URLSearchParams;
|
|
filterInternalParams?: boolean;
|
|
}) {
|
|
const { query, searchParams, filterInternalParams = false } = args;
|
|
const newSearchParams = new URLSearchParams();
|
|
|
|
// Embed-specific params
|
|
const embedParams = new Set(["embed", "layout", "embedType", "ui.color-scheme"]);
|
|
|
|
// Webapp-specific params
|
|
const webappParams = new Set(["overlayCalendar"]);
|
|
|
|
// Add non-excluded params from searchParams if provided
|
|
if (searchParams) {
|
|
searchParams.forEach((value, key) => {
|
|
if (shouldExcludeParam(key)) {
|
|
return;
|
|
}
|
|
newSearchParams.append(key, value);
|
|
});
|
|
}
|
|
|
|
// Add params from query, filtering excluded params
|
|
Object.entries(query).forEach(([key, value]) => {
|
|
if (value === null || value === undefined) {
|
|
return;
|
|
}
|
|
|
|
if (shouldExcludeParam(key)) {
|
|
return;
|
|
}
|
|
|
|
newSearchParams.append(key, String(value));
|
|
});
|
|
|
|
function shouldExcludeParam(key: string) {
|
|
if (filterInternalParams) {
|
|
return embedParams.has(key) || webappParams.has(key);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
return newSearchParams;
|
|
}
|
|
|
|
type SuccessRedirectBookingType = Pick<
|
|
BookingResponse | PaymentPageProps["booking"],
|
|
"uid" | "title" | "description" | "startTime" | "endTime" | "location" | "attendees" | "user" | "responses"
|
|
>;
|
|
|
|
type BookingResponseKey = keyof SuccessRedirectBookingType;
|
|
|
|
type ResultType = {
|
|
[key in BookingResponseKey]?: SuccessRedirectBookingType[key];
|
|
} & {
|
|
hostName?: string[];
|
|
attendeeName?: string | null;
|
|
hostStartTime?: string | null;
|
|
attendeeStartTime?: string | null;
|
|
guestEmails?: string[] | null;
|
|
phone?: string | null;
|
|
attendeeFirstName?: string | null;
|
|
attendeeLastName?: string | null;
|
|
};
|
|
|
|
export const getBookingRedirectExtraParams = (booking: SuccessRedirectBookingType) => {
|
|
const redirectQueryParamKeys: BookingResponseKey[] = [
|
|
"title",
|
|
"description",
|
|
"startTime",
|
|
"endTime",
|
|
"location",
|
|
"attendees",
|
|
"user",
|
|
"responses",
|
|
];
|
|
|
|
// Helper function to extract response details (e.g., phone, attendee's first and last name)
|
|
function extractResponseDetails(booking: SuccessRedirectBookingType, obj: ResultType): ResultType {
|
|
const result: ResultType = { ...obj };
|
|
const phone = getSafe<string>(booking.responses, ["phone"]);
|
|
const firstName = getSafe<string>(booking.responses, ["name", "firstName"]);
|
|
const lastName = getSafe<string>(booking.responses, ["name", "lastName"]);
|
|
const name = getSafe<string>(booking.responses, ["name"]);
|
|
|
|
if (phone) result.phone = phone;
|
|
if (firstName) result.attendeeFirstName = firstName;
|
|
if (lastName) result.attendeeLastName = lastName;
|
|
else if (name && typeof name === "string") result.attendeeName = name; // Fallback if `name` is a string instead of an object
|
|
|
|
return result;
|
|
}
|
|
|
|
// Helper function to extract user details (e.g., host name and time zone)
|
|
function extractUserDetails(booking: SuccessRedirectBookingType, obj: ResultType): ResultType {
|
|
if (booking.user?.name) {
|
|
const hostStartTime = dayjs(booking.startTime).tz(booking.user.timeZone).format();
|
|
return {
|
|
...obj,
|
|
hostName: [...(obj.hostName || []), booking.user.name],
|
|
hostStartTime,
|
|
};
|
|
}
|
|
return obj;
|
|
}
|
|
|
|
// Helper function to extract attendee and guest details
|
|
function extractAttendeesAndGuests(booking: SuccessRedirectBookingType, obj: ResultType): ResultType {
|
|
if (!Array.isArray(booking.attendees) || booking.attendees.length === 0) return obj;
|
|
|
|
const attendeeName = booking.attendees[0]?.name || null;
|
|
const attendeeTimeZone = booking.attendees[0]?.timeZone || "UTC";
|
|
const attendeeStartTime = dayjs(booking.startTime).tz(attendeeTimeZone).format();
|
|
|
|
const { hostNames, guestEmails } = booking.attendees.slice(1).reduce(
|
|
(acc, attendee) => {
|
|
if (attendee.name) {
|
|
acc.hostNames.push(attendee.name);
|
|
} else if (attendee.email) {
|
|
acc.guestEmails.push(attendee.email);
|
|
}
|
|
return acc;
|
|
},
|
|
{ hostNames: [], guestEmails: [] } as { hostNames: string[]; guestEmails: string[] }
|
|
);
|
|
|
|
return {
|
|
...obj,
|
|
attendeeName,
|
|
attendeeStartTime,
|
|
hostName: [...(obj.hostName || []), ...hostNames],
|
|
guestEmails: guestEmails.length > 0 ? guestEmails : undefined,
|
|
};
|
|
}
|
|
|
|
const bookingParams = (Object.keys(booking) as BookingResponseKey[])
|
|
.filter((key) => redirectQueryParamKeys.includes(key))
|
|
.reduce<ResultType>(
|
|
(obj, key) => {
|
|
if (key === "responses") return extractResponseDetails(booking, obj);
|
|
if (key === "user") return extractUserDetails(booking, obj);
|
|
if (key === "attendees") return extractAttendeesAndGuests(booking, obj);
|
|
return { ...obj, [key]: booking[key] };
|
|
},
|
|
{ uid: booking.uid }
|
|
);
|
|
|
|
const queryCompatibleParams: Record<string, string | boolean | null | undefined> = {
|
|
...Object.fromEntries(
|
|
Object.entries(bookingParams).map(([key, value]) => {
|
|
if (Array.isArray(value)) {
|
|
return [key, value.join(", ")];
|
|
}
|
|
if (typeof value === "object" && value !== null) {
|
|
// Skip complex objects (user, attendees) as we are extracting only needed fields
|
|
return [key, undefined];
|
|
}
|
|
return [key, value];
|
|
})
|
|
),
|
|
hostName: bookingParams.hostName?.join(", "),
|
|
attendeeName: bookingParams.attendeeName || undefined,
|
|
hostStartTime: bookingParams.hostStartTime || undefined,
|
|
attendeeStartTime: bookingParams.attendeeStartTime || undefined,
|
|
};
|
|
|
|
return queryCompatibleParams;
|
|
};
|
|
|
|
export const useBookingSuccessRedirect = () => {
|
|
const router = useRouter();
|
|
const searchParams = useCompatSearchParams();
|
|
const isEmbed = useIsEmbed();
|
|
const bookingSuccessRedirect = ({
|
|
successRedirectUrl,
|
|
query,
|
|
booking,
|
|
forwardParamsSuccessRedirect,
|
|
}: {
|
|
successRedirectUrl: EventType["successRedirectUrl"];
|
|
forwardParamsSuccessRedirect: EventType["forwardParamsSuccessRedirect"];
|
|
query: Record<string, string | null | undefined | boolean>;
|
|
booking: SuccessRedirectBookingType;
|
|
}) => {
|
|
// Ensures that the param is added both to external redirect url and booking success page URL
|
|
query = {
|
|
...query,
|
|
"cal.rerouting": searchParams.get("cal.rerouting"),
|
|
};
|
|
|
|
if (successRedirectUrl) {
|
|
const url = new URL(successRedirectUrl);
|
|
// Using parent ensures, Embed iframe would redirect outside of the iframe.
|
|
if (!forwardParamsSuccessRedirect) {
|
|
navigateInTopWindow(url.toString());
|
|
return;
|
|
}
|
|
|
|
const bookingExtraParams = getBookingRedirectExtraParams(booking);
|
|
|
|
// Filter internal Cal.com params when redirecting to external URLs.
|
|
// - It prevents leaking internal state.
|
|
// - Certain websites might break due to the presence of certain params e.g. Wordpress has different meaning for `embed` param and an embed param passed by Cal.com breaks a wordpress webpage
|
|
const newSearchParams = getNewSearchParams({
|
|
query: {
|
|
...query,
|
|
...bookingExtraParams,
|
|
isEmbed,
|
|
},
|
|
searchParams: new URLSearchParams(searchParams.toString()),
|
|
filterInternalParams: true,
|
|
});
|
|
|
|
newSearchParams.forEach((value, key) => {
|
|
url.searchParams.append(key, value);
|
|
});
|
|
|
|
navigateInTopWindow(url.toString());
|
|
return;
|
|
}
|
|
|
|
// TODO: Abstract it out and reuse at other places where we navigate within the embed. Though this is needed only in case of hard navigation happening but we aren't sure where hard navigation happens and where a soft navigation
|
|
// This is specially true after App Router it seems
|
|
const headersRelatedSearchParams = searchParams
|
|
? {
|
|
"flag.coep": searchParams.get("flag.coep") ?? "false",
|
|
}
|
|
: undefined;
|
|
|
|
// We don't want to forward all search params, as they could possibly break the booking page.
|
|
const newSearchParams = getNewSearchParams({
|
|
query,
|
|
searchParams: new URLSearchParams(headersRelatedSearchParams),
|
|
});
|
|
return router.push(`/booking/${booking.uid}${isEmbed ? "/embed" : ""}?${newSearchParams.toString()}`);
|
|
};
|
|
|
|
return bookingSuccessRedirect;
|
|
};
|