* 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>
196 lines
6.0 KiB
TypeScript
196 lines
6.0 KiB
TypeScript
import type { IncomingMessage } from "http";
|
|
|
|
import { IS_PRODUCTION, WEBSITE_URL, SINGLE_ORG_SLUG } from "@calcom/lib/constants";
|
|
import { ALLOWED_HOSTNAMES, RESERVED_SUBDOMAINS, WEBAPP_URL } from "@calcom/lib/constants";
|
|
import logger from "@calcom/lib/logger";
|
|
import slugify from "@calcom/lib/slugify";
|
|
import type { Prisma } from "@calcom/prisma/client";
|
|
|
|
const log = logger.getSubLogger({
|
|
prefix: ["orgDomains.ts"],
|
|
});
|
|
/**
|
|
* return the org slug
|
|
* @param hostname
|
|
*/
|
|
export function getOrgSlug(hostname: string, forcedSlug?: string) {
|
|
if (forcedSlug) {
|
|
if (process.env.NEXT_PUBLIC_IS_E2E) {
|
|
log.debug("Using provided forcedSlug in E2E", {
|
|
forcedSlug,
|
|
});
|
|
return forcedSlug;
|
|
}
|
|
log.debug("Ignoring forcedSlug in non-test mode", {
|
|
forcedSlug,
|
|
});
|
|
}
|
|
|
|
// If SINGLE_ORG_SLUG is set we know that the Cal.com instance is configured to run just one organization, so we can return the slug directly.
|
|
if (SINGLE_ORG_SLUG) {
|
|
log.debug("In Single Org Mode, using SINGLE_ORG_SLUG as the Org slug", { SINGLE_ORG_SLUG });
|
|
return SINGLE_ORG_SLUG;
|
|
}
|
|
|
|
if (!hostname.includes(".")) {
|
|
log.warn('Org support not enabled for hostname without "."', { hostname });
|
|
// A no-dot domain can never be org domain. It automatically considers localhost to be non-org domain
|
|
return null;
|
|
}
|
|
// Find which hostname is being currently used
|
|
const currentHostname = ALLOWED_HOSTNAMES.find((ahn) => {
|
|
const url = new URL(WEBAPP_URL);
|
|
const testHostname = `${url.hostname}${url.port ? `:${url.port}` : ""}`;
|
|
return testHostname.endsWith(`.${ahn}`);
|
|
});
|
|
|
|
if (!currentHostname) {
|
|
log.warn("Match of WEBAPP_URL with ALLOWED_HOSTNAMES failed", { WEBAPP_URL, ALLOWED_HOSTNAMES });
|
|
return null;
|
|
}
|
|
// Define which is the current domain/subdomain
|
|
const slug = hostname.replace(currentHostname ? `.${currentHostname}` : "", "");
|
|
const hasNoDotInSlug = slug.indexOf(".") === -1;
|
|
if (hasNoDotInSlug) {
|
|
return slug;
|
|
}
|
|
log.warn("Derived slug ended up having dots, so not considering it an org domain", { slug });
|
|
return null;
|
|
}
|
|
|
|
export function getOrgDomainConfig({
|
|
hostname,
|
|
fallback,
|
|
forcedSlug,
|
|
isPlatform,
|
|
}: {
|
|
hostname: string;
|
|
fallback?: string | string[];
|
|
forcedSlug?: string;
|
|
isPlatform?: boolean;
|
|
}) {
|
|
if (isPlatform && forcedSlug) {
|
|
return {
|
|
isValidOrgDomain: true,
|
|
currentOrgDomain: forcedSlug,
|
|
};
|
|
}
|
|
|
|
return getOrgDomainConfigFromHostname({
|
|
hostname,
|
|
fallback,
|
|
forcedSlug,
|
|
});
|
|
}
|
|
|
|
/**
|
|
* @deprecated Use `getOrgDomainConfig` instead. To be removed in a future release. getOrgDomainConfig is more flexible and can be used without next request.
|
|
*/
|
|
export function orgDomainConfig(req: IncomingMessage | undefined, fallback?: string | string[]) {
|
|
const forPlatform = isPlatformRequest(req);
|
|
const forcedSlugHeader = req?.headers?.["x-cal-force-slug"];
|
|
const forcedSlug = forcedSlugHeader instanceof Array ? forcedSlugHeader[0] : forcedSlugHeader;
|
|
|
|
if (forPlatform && forcedSlug) {
|
|
return {
|
|
isValidOrgDomain: true,
|
|
currentOrgDomain: forcedSlug,
|
|
};
|
|
}
|
|
|
|
const hostname = req?.headers?.host || "";
|
|
return getOrgDomainConfigFromHostname({
|
|
hostname,
|
|
fallback,
|
|
forcedSlug,
|
|
});
|
|
}
|
|
|
|
function isPlatformRequest(req: IncomingMessage | undefined) {
|
|
return !!req?.headers?.["x-cal-client-id"];
|
|
}
|
|
|
|
export function getOrgDomainConfigFromHostname({
|
|
hostname,
|
|
fallback,
|
|
forcedSlug,
|
|
}: {
|
|
hostname: string;
|
|
fallback?: string | string[];
|
|
forcedSlug?: string;
|
|
}) {
|
|
const currentOrgDomain = getOrgSlug(hostname, forcedSlug);
|
|
const isValidOrgDomain = currentOrgDomain !== null && !RESERVED_SUBDOMAINS.includes(currentOrgDomain);
|
|
if (isValidOrgDomain || !fallback) {
|
|
return {
|
|
currentOrgDomain: isValidOrgDomain ? currentOrgDomain : null,
|
|
isValidOrgDomain,
|
|
};
|
|
}
|
|
const fallbackOrgSlug = fallback as string;
|
|
const isValidFallbackDomain = !RESERVED_SUBDOMAINS.includes(fallbackOrgSlug);
|
|
return {
|
|
currentOrgDomain: isValidFallbackDomain ? fallbackOrgSlug : null,
|
|
isValidOrgDomain: isValidFallbackDomain,
|
|
};
|
|
}
|
|
|
|
export function subdomainSuffix() {
|
|
if (!IS_PRODUCTION && process.env.LOCAL_TESTING_DOMAIN_VERCEL) {
|
|
// Allow testing with a valid domain so that we can test with deployment services like Vercel and Cloudflare locally.
|
|
return process.env.LOCAL_TESTING_DOMAIN_VERCEL;
|
|
}
|
|
const urlSplit = WEBAPP_URL.replace("https://", "")?.replace("http://", "").split(".");
|
|
return urlSplit.length === 3 ? urlSplit.slice(1).join(".") : urlSplit.join(".");
|
|
}
|
|
|
|
export function getOrgFullOrigin(slug: string | null, options: { protocol: boolean } = { protocol: true }) {
|
|
if (!slug)
|
|
return options.protocol ? WEBSITE_URL : WEBSITE_URL.replace("https://", "").replace("http://", "");
|
|
|
|
const orgFullOrigin = `${
|
|
options.protocol ? `${new URL(WEBSITE_URL).protocol}//` : ""
|
|
}${slug}.${subdomainSuffix()}`;
|
|
return orgFullOrigin;
|
|
}
|
|
|
|
/**
|
|
* @deprecated You most probably intend to query for an organization only, use `whereClauseForOrgWithSlugOrRequestedSlug` instead which will only return the organization and not a team accidentally.
|
|
*/
|
|
export function getSlugOrRequestedSlug(slug: string) {
|
|
const slugifiedValue = slugify(slug);
|
|
return {
|
|
OR: [
|
|
{ slug: slugifiedValue },
|
|
{
|
|
metadata: {
|
|
path: ["requestedSlug"],
|
|
equals: slugifiedValue,
|
|
},
|
|
},
|
|
],
|
|
} satisfies Prisma.TeamWhereInput;
|
|
}
|
|
|
|
export function whereClauseForOrgWithSlugOrRequestedSlug(slug: string) {
|
|
const slugifiedValue = slugify(slug);
|
|
|
|
return {
|
|
OR: [
|
|
{ slug: slugifiedValue },
|
|
{
|
|
metadata: {
|
|
path: ["requestedSlug"],
|
|
equals: slug,
|
|
},
|
|
},
|
|
],
|
|
isOrganization: true,
|
|
} satisfies Prisma.TeamWhereInput;
|
|
}
|
|
|
|
export function userOrgQuery(req: IncomingMessage | undefined, fallback?: string | string[]) {
|
|
const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(req, fallback);
|
|
return isValidOrgDomain && currentOrgDomain ? getSlugOrRequestedSlug(currentOrgDomain) : null;
|
|
}
|