* 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>
221 lines
7.2 KiB
TypeScript
221 lines
7.2 KiB
TypeScript
import type { EmbedProps } from "app/WithEmbedSSR";
|
|
import type { GetServerSideProps } from "next";
|
|
import { encode } from "querystring";
|
|
import type { z } from "zod";
|
|
|
|
import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
|
|
import { DEFAULT_DARK_BRAND_COLOR, DEFAULT_LIGHT_BRAND_COLOR } from "@calcom/lib/constants";
|
|
import { getUsernameList } from "@calcom/lib/defaultEvents";
|
|
import { getEventTypesPublic } from "@calcom/lib/event-types/getEventTypesPublic";
|
|
import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
|
|
import logger from "@calcom/lib/logger";
|
|
import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
|
|
import { safeStringify } from "@calcom/lib/safeStringify";
|
|
import { UserRepository } from "@calcom/lib/server/repository/user";
|
|
import { stripMarkdown } from "@calcom/lib/stripMarkdown";
|
|
import { prisma } from "@calcom/prisma";
|
|
import type { EventType, User } from "@calcom/prisma/client";
|
|
import { RedirectType } from "@calcom/prisma/enums";
|
|
import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
|
|
import type { UserProfile } from "@calcom/types/UserProfile";
|
|
|
|
import { handleOrgRedirect } from "@lib/handleOrgRedirect";
|
|
|
|
const log = logger.getSubLogger({ prefix: ["[[pages/[user]]]"] });
|
|
type UserPageProps = {
|
|
profile: {
|
|
name: string;
|
|
image: string;
|
|
theme: string | null;
|
|
brandColor: string;
|
|
darkBrandColor: string;
|
|
organization: {
|
|
requestedSlug: string | null;
|
|
slug: string | null;
|
|
id: number | null;
|
|
} | null;
|
|
allowSEOIndexing: boolean;
|
|
username: string | null;
|
|
};
|
|
users: (Pick<User, "name" | "username" | "bio" | "verified" | "avatarUrl"> & {
|
|
profile: UserProfile;
|
|
})[];
|
|
themeBasis: string | null;
|
|
markdownStrippedBio: string;
|
|
safeBio: string;
|
|
entity: {
|
|
logoUrl?: string | null;
|
|
considerUnpublished: boolean;
|
|
orgSlug?: string | null;
|
|
name?: string | null;
|
|
teamSlug?: string | null;
|
|
};
|
|
eventTypes: ({
|
|
descriptionAsSafeHTML: string;
|
|
metadata: z.infer<typeof EventTypeMetaDataSchema>;
|
|
} & Pick<
|
|
EventType,
|
|
| "id"
|
|
| "title"
|
|
| "slug"
|
|
| "length"
|
|
| "hidden"
|
|
| "lockTimeZoneToggleOnBookingPage"
|
|
| "lockedTimeZone"
|
|
| "requiresConfirmation"
|
|
| "canSendCalVideoTranscriptionEmails"
|
|
| "requiresBookerEmailVerification"
|
|
| "price"
|
|
| "currency"
|
|
| "recurringEvent"
|
|
| "seatsPerTimeSlot"
|
|
| "schedulingType"
|
|
>)[];
|
|
isOrgSEOIndexable: boolean | undefined;
|
|
} & EmbedProps;
|
|
|
|
export const getServerSideProps: GetServerSideProps<UserPageProps> = async (context) => {
|
|
const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(context.req, context.params?.orgSlug);
|
|
const usernameList = getUsernameList(context.query.user as string);
|
|
const isARedirectFromNonOrgLink = context.query.orgRedirection === "true";
|
|
const dataFetchStart = Date.now();
|
|
|
|
const redirect = await handleOrgRedirect({
|
|
slugs: usernameList,
|
|
redirectType: RedirectType.User,
|
|
eventTypeSlug: null,
|
|
context,
|
|
currentOrgDomain: isValidOrgDomain ? currentOrgDomain : null,
|
|
});
|
|
|
|
if (redirect) {
|
|
return redirect;
|
|
}
|
|
|
|
const usersInOrgContext = await getUsersInOrgContext(
|
|
usernameList,
|
|
isValidOrgDomain ? currentOrgDomain : null
|
|
);
|
|
|
|
const isDynamicGroup = usersInOrgContext.length > 1;
|
|
log.debug(safeStringify({ usersInOrgContext, isValidOrgDomain, currentOrgDomain, isDynamicGroup }));
|
|
|
|
if (isDynamicGroup) {
|
|
const destinationUrl = encodeURI(`/${usernameList.join("+")}/dynamic`);
|
|
|
|
// EXAMPLE - context.params: { orgSlug: 'acme', user: 'member0+owner1' }
|
|
// EXAMPLE - context.query: { redirect: 'undefined', orgRedirection: 'undefined', user: 'member0+owner1' }
|
|
const originalQueryString = new URLSearchParams(context.query as Record<string, string>).toString();
|
|
const destinationWithQuery = `${destinationUrl}?${originalQueryString}`;
|
|
log.debug(`Dynamic group detected, redirecting to ${destinationUrl}`);
|
|
return {
|
|
redirect: {
|
|
permanent: false,
|
|
destination: destinationWithQuery,
|
|
},
|
|
} as const;
|
|
}
|
|
|
|
const isNonOrgUser = (user: { profile: UserProfile }) => {
|
|
return !user.profile?.organization;
|
|
};
|
|
|
|
const isThereAnyNonOrgUser = usersInOrgContext.some(isNonOrgUser);
|
|
|
|
if (!usersInOrgContext.length || (!isValidOrgDomain && !isThereAnyNonOrgUser)) {
|
|
return {
|
|
notFound: true,
|
|
} as const;
|
|
}
|
|
|
|
const [user] = usersInOrgContext; //to be used when dealing with single user, not dynamic group
|
|
|
|
const profile = {
|
|
name: user.name || user.username || "",
|
|
image: getUserAvatarUrl({
|
|
avatarUrl: user.avatarUrl,
|
|
}),
|
|
theme: user.theme,
|
|
brandColor: user.brandColor ?? DEFAULT_LIGHT_BRAND_COLOR,
|
|
avatarUrl: user.avatarUrl,
|
|
darkBrandColor: user.darkBrandColor ?? DEFAULT_DARK_BRAND_COLOR,
|
|
allowSEOIndexing: user.allowSEOIndexing ?? true,
|
|
username: user.username,
|
|
organization: user.profile.organization,
|
|
};
|
|
|
|
const dataFetchEnd = Date.now();
|
|
if (context.query.log === "1") {
|
|
context.res.setHeader("X-Data-Fetch-Time", `${dataFetchEnd - dataFetchStart}ms`);
|
|
}
|
|
|
|
const eventTypes = await getEventTypesPublic(user.id);
|
|
|
|
// if profile only has one public event-type, redirect to it
|
|
if (eventTypes.length === 1 && context.query.redirect !== "false") {
|
|
// Redirect but don't change the URL
|
|
const urlDestination = `/${user.profile.username}/${eventTypes[0].slug}`;
|
|
const { query } = context;
|
|
const urlQuery = new URLSearchParams(encode(query));
|
|
|
|
return {
|
|
redirect: {
|
|
permanent: false,
|
|
destination: `${encodeURI(urlDestination)}?${urlQuery}`,
|
|
},
|
|
};
|
|
}
|
|
|
|
const safeBio = markdownToSafeHTML(user.bio) || "";
|
|
|
|
const markdownStrippedBio = stripMarkdown(user?.bio || "");
|
|
const org = usersInOrgContext[0].profile.organization;
|
|
|
|
return {
|
|
props: {
|
|
users: usersInOrgContext.map((user) => ({
|
|
name: user.name,
|
|
username: user.username,
|
|
bio: user.bio,
|
|
avatarUrl: user.avatarUrl,
|
|
verified: user.verified,
|
|
profile: user.profile,
|
|
})),
|
|
entity: {
|
|
...(org?.logoUrl ? { logoUrl: org?.logoUrl } : {}),
|
|
considerUnpublished: !isARedirectFromNonOrgLink && org?.slug === null,
|
|
orgSlug: currentOrgDomain,
|
|
name: org?.name ?? null,
|
|
},
|
|
eventTypes,
|
|
safeBio,
|
|
profile,
|
|
// Dynamic group has no theme preference right now. It uses system theme.
|
|
themeBasis: user.username,
|
|
markdownStrippedBio,
|
|
isOrgSEOIndexable: org?.organizationSettings?.allowSEOIndexing ?? false,
|
|
},
|
|
};
|
|
};
|
|
|
|
export async function getUsersInOrgContext(usernameList: string[], orgSlug: string | null) {
|
|
const userRepo = new UserRepository(prisma);
|
|
|
|
const usersInOrgContext = await userRepo.findUsersByUsername({
|
|
usernameList,
|
|
orgSlug,
|
|
});
|
|
|
|
if (usersInOrgContext.length) {
|
|
return usersInOrgContext;
|
|
}
|
|
|
|
// note(Lauris): platform members (people who run platform) are part of platform organization while
|
|
// the platform organization does not have a domain. In this case there is no org domain but also platform member
|
|
// "User.organization" is not null so "UserRepository.findUsersByUsername" returns empty array and we do this as a last resort
|
|
// call to find platform member.
|
|
return await userRepo.findPlatformMembersByUsernames({
|
|
usernameList,
|
|
});
|
|
}
|