* 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>
150 lines
5.1 KiB
TypeScript
150 lines
5.1 KiB
TypeScript
import { z } from "zod";
|
|
|
|
import { getOrgFullOrigin } from "@calcom/ee/organizations/lib/orgDomains";
|
|
import { RedirectType, CreationSource } from "@calcom/prisma/enums";
|
|
import { UserSchema } from "@calcom/prisma/zod/modelSchema/UserSchema";
|
|
import { authedAdminProcedure } from "@calcom/trpc/server/procedures/authedProcedure";
|
|
import { router } from "@calcom/trpc/server/trpc";
|
|
|
|
import { TRPCError } from "@trpc/server";
|
|
import type { inferRouterOutputs } from "@trpc/server";
|
|
|
|
export type UserAdminRouter = typeof userAdminRouter;
|
|
export type UserAdminRouterOutputs = inferRouterOutputs<UserAdminRouter>;
|
|
|
|
const userIdSchema = z.object({ userId: z.coerce.number() });
|
|
|
|
const userBodySchema = UserSchema.pick({
|
|
name: true,
|
|
email: true,
|
|
username: true,
|
|
bio: true,
|
|
timeZone: true,
|
|
weekStart: true,
|
|
theme: true,
|
|
defaultScheduleId: true,
|
|
locale: true,
|
|
timeFormat: true,
|
|
// brandColor: true,
|
|
// darkBrandColor: true,
|
|
allowDynamicBooking: true,
|
|
identityProvider: true,
|
|
role: true,
|
|
avatarUrl: true,
|
|
});
|
|
|
|
/** Reusable logic that checks for admin permissions and if the requested user exists */
|
|
//const authedAdminWithUserMiddleware = middleware();
|
|
|
|
const authedAdminProcedureWithRequestedUser = authedAdminProcedure.use(async ({ ctx, next, getRawInput }) => {
|
|
const { prisma } = ctx;
|
|
const parsed = userIdSchema.safeParse(await getRawInput());
|
|
if (!parsed.success) throw new TRPCError({ code: "BAD_REQUEST", message: "User id is required" });
|
|
const { userId: id } = parsed.data;
|
|
const user = await prisma.user.findUnique({ where: { id } });
|
|
if (!user) throw new TRPCError({ code: "NOT_FOUND", message: "User not found" });
|
|
return next({
|
|
ctx: {
|
|
user: ctx.user,
|
|
requestedUser: user,
|
|
},
|
|
});
|
|
});
|
|
|
|
export const userAdminRouter = router({
|
|
get: authedAdminProcedureWithRequestedUser.input(userIdSchema).query(async ({ ctx }) => {
|
|
const { requestedUser } = ctx;
|
|
return { user: requestedUser };
|
|
}),
|
|
list: authedAdminProcedure.query(async ({ ctx }) => {
|
|
const { prisma } = ctx;
|
|
// TODO: Add search, pagination, etc.
|
|
const users = await prisma.user.findMany();
|
|
return users;
|
|
}),
|
|
add: authedAdminProcedure.input(userBodySchema).mutation(async ({ ctx, input }) => {
|
|
const { prisma } = ctx;
|
|
const user = await prisma.user.create({ data: { ...input, creationSource: CreationSource.WEBAPP } });
|
|
return { user, message: `User with id: ${user.id} added successfully` };
|
|
}),
|
|
update: authedAdminProcedureWithRequestedUser
|
|
.input(userBodySchema.partial())
|
|
.mutation(async ({ ctx, input }) => {
|
|
const { prisma, requestedUser } = ctx;
|
|
|
|
const user = await prisma.$transaction(async (tx) => {
|
|
const userInternal = await tx.user.update({ where: { id: requestedUser.id }, data: input });
|
|
|
|
// If the profile has been moved to an Org -> we can easily access the profile we need to update
|
|
if (requestedUser.movedToProfileId && input.username) {
|
|
const profile = await tx.profile.update({
|
|
where: {
|
|
id: requestedUser.movedToProfileId,
|
|
},
|
|
data: {
|
|
username: input.username,
|
|
},
|
|
});
|
|
|
|
// Update all of this users tempOrgRedirectUrls
|
|
if (requestedUser.username && profile.organizationId) {
|
|
const data = await prisma.team.findUnique({
|
|
where: {
|
|
id: profile.organizationId,
|
|
},
|
|
select: {
|
|
slug: true,
|
|
},
|
|
});
|
|
|
|
// We should never hit this
|
|
if (!data?.slug) {
|
|
throw new Error("Team has no attached slug.");
|
|
}
|
|
|
|
const orgUrlPrefix = getOrgFullOrigin(data.slug);
|
|
|
|
const toUrl = `${orgUrlPrefix}/${input.username}`;
|
|
|
|
await prisma.tempOrgRedirect.updateMany({
|
|
where: {
|
|
type: RedirectType.User,
|
|
from: requestedUser.username, // Old username
|
|
},
|
|
data: {
|
|
toUrl,
|
|
},
|
|
});
|
|
}
|
|
|
|
return userInternal;
|
|
}
|
|
|
|
/**
|
|
* TODO (Sean/Hariom): Change this to profile specific when we have a way for a user to have > 1 orgs
|
|
* If the user wasnt a CAL account before being moved to an org they dont have the movedToProfileId value
|
|
* So we update all of their profiles to this new username - this tx will rollback if there is a username
|
|
* conflict here somehow (Note for now users only have ONE profile.)
|
|
**/
|
|
if (input.username) {
|
|
await tx.profile.updateMany({
|
|
where: {
|
|
userId: requestedUser.id,
|
|
},
|
|
data: {
|
|
username: input.username,
|
|
},
|
|
});
|
|
}
|
|
|
|
return userInternal;
|
|
});
|
|
return { user, message: `User with id: ${user.id} updated successfully` };
|
|
}),
|
|
delete: authedAdminProcedureWithRequestedUser.input(userIdSchema).mutation(async ({ ctx }) => {
|
|
const { prisma, requestedUser } = ctx;
|
|
await prisma.user.delete({ where: { id: requestedUser.id } });
|
|
return { message: `User with id: ${requestedUser.id} deleted successfully` };
|
|
}),
|
|
});
|