{username || "No username"}
diff --git a/packages/features/webhooks/lib/scheduleTrigger.ts b/packages/features/webhooks/lib/scheduleTrigger.ts
index 8b610d55a7..aa5409101b 100644
--- a/packages/features/webhooks/lib/scheduleTrigger.ts
+++ b/packages/features/webhooks/lib/scheduleTrigger.ts
@@ -1,5 +1,205 @@
+import type { Prisma } from "@prisma/client";
+import { v4 } from "uuid";
+
+import { getHumanReadableLocationValue } from "@calcom/core/location";
+import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
+import logger from "@calcom/lib/logger";
+import { getTranslation } from "@calcom/lib/server";
import prisma from "@calcom/prisma";
-import { WebhookTriggerEvents } from "@calcom/prisma/enums";
+import type { ApiKey } from "@calcom/prisma/client";
+import { BookingStatus, WebhookTriggerEvents } from "@calcom/prisma/enums";
+
+const log = logger.getChildLogger({ prefix: ["[node-scheduler]"] });
+
+export async function addSubscription({
+ appApiKey,
+ triggerEvent,
+ subscriberUrl,
+ appId,
+}: {
+ appApiKey: ApiKey;
+ triggerEvent: WebhookTriggerEvents;
+ subscriberUrl: string;
+ appId: string;
+}) {
+ try {
+ const createSubscription = await prisma.webhook.create({
+ data: {
+ id: v4(),
+ userId: appApiKey.userId,
+ teamId: appApiKey.teamId,
+ eventTriggers: [triggerEvent],
+ subscriberUrl,
+ active: true,
+ appId: appId,
+ },
+ });
+
+ if (triggerEvent === WebhookTriggerEvents.MEETING_ENDED) {
+ //schedule job for already existing bookings
+ const where: Prisma.BookingWhereInput = {};
+ if (appApiKey.teamId) where.eventType = { teamId: appApiKey.teamId };
+ else where.userId = appApiKey.userId;
+ const bookings = await prisma.booking.findMany({
+ where: {
+ ...where,
+ startTime: {
+ gte: new Date(),
+ },
+ status: BookingStatus.ACCEPTED,
+ },
+ });
+
+ for (const booking of bookings) {
+ scheduleTrigger(booking, createSubscription.subscriberUrl, {
+ id: createSubscription.id,
+ appId: createSubscription.appId,
+ });
+ }
+ }
+
+ return createSubscription;
+ } catch (error) {
+ log.error(`Error creating subscription for user ${appApiKey.userId} and appId ${appApiKey.appId}.`);
+ }
+}
+
+export async function deleteSubscription({
+ appApiKey,
+ webhookId,
+ appId,
+}: {
+ appApiKey: ApiKey;
+ webhookId: string;
+ appId: string;
+}) {
+ try {
+ const webhook = await prisma.webhook.findFirst({
+ where: {
+ id: webhookId,
+ },
+ });
+
+ if (webhook?.eventTriggers.includes(WebhookTriggerEvents.MEETING_ENDED)) {
+ const where: Prisma.BookingWhereInput = {};
+ if (appApiKey.teamId) where.eventType = { teamId: appApiKey.teamId };
+ else where.userId = appApiKey.userId;
+ const bookingsWithScheduledJobs = await prisma.booking.findMany({
+ where: {
+ ...where,
+ scheduledJobs: {
+ isEmpty: false,
+ },
+ },
+ });
+ for (const booking of bookingsWithScheduledJobs) {
+ const updatedScheduledJobs = booking.scheduledJobs.filter(
+ (scheduledJob) => scheduledJob !== `${appId}_${webhook.id}`
+ );
+ await prisma.booking.update({
+ where: {
+ id: booking.id,
+ },
+ data: {
+ scheduledJobs: updatedScheduledJobs,
+ },
+ });
+ }
+ }
+
+ const deleteWebhook = await prisma.webhook.delete({
+ where: {
+ id: webhookId,
+ },
+ });
+ if (!deleteWebhook) {
+ throw new Error(`Unable to delete webhook ${webhookId}`);
+ }
+ return deleteWebhook;
+ } catch (err) {
+ log.error(
+ `Error deleting subscription for user ${appApiKey.userId}, webhookId ${webhookId}, appId ${appId}`
+ );
+ }
+}
+
+export async function listBookings(appApiKey: ApiKey) {
+ try {
+ const where: Prisma.BookingWhereInput = {};
+ if (appApiKey.teamId) {
+ where.eventType = {
+ OR: [{ teamId: appApiKey.teamId }, { parent: { teamId: appApiKey.teamId } }],
+ };
+ } else {
+ where.userId = appApiKey.userId;
+ }
+ const bookings = await prisma.booking.findMany({
+ take: 3,
+ where: where,
+ orderBy: {
+ id: "desc",
+ },
+ select: {
+ title: true,
+ description: true,
+ customInputs: true,
+ responses: true,
+ startTime: true,
+ endTime: true,
+ location: true,
+ cancellationReason: true,
+ status: true,
+ user: {
+ select: {
+ username: true,
+ name: true,
+ email: true,
+ timeZone: true,
+ locale: true,
+ },
+ },
+ eventType: {
+ select: {
+ title: true,
+ description: true,
+ requiresConfirmation: true,
+ price: true,
+ currency: true,
+ length: true,
+ bookingFields: true,
+ team: true,
+ },
+ },
+ attendees: {
+ select: {
+ name: true,
+ email: true,
+ timeZone: true,
+ },
+ },
+ },
+ });
+ if (bookings.length === 0) {
+ return [];
+ }
+ const t = await getTranslation(bookings[0].user?.locale ?? "en", "common");
+
+ const updatedBookings = bookings.map((booking) => {
+ return {
+ ...booking,
+ ...getCalEventResponses({
+ bookingFields: booking.eventType?.bookingFields ?? null,
+ booking,
+ }),
+ location: getHumanReadableLocationValue(booking.location || "", t),
+ };
+ });
+
+ return updatedBookings;
+ } catch (err) {
+ log.error(`Error retrieving list of bookings for user ${appApiKey.userId} and appId ${appApiKey.appId}.`);
+ }
+}
export async function scheduleTrigger(
booking: { id: number; endTime: Date; scheduledJobs: string[] },
diff --git a/packages/features/webhooks/lib/sendPayload.ts b/packages/features/webhooks/lib/sendPayload.ts
index da7d355acb..e0211a6a71 100644
--- a/packages/features/webhooks/lib/sendPayload.ts
+++ b/packages/features/webhooks/lib/sendPayload.ts
@@ -18,7 +18,7 @@ export type EventTypeInfo = {
export type WebhookDataType = CalendarEvent &
EventTypeInfo & {
- metadata?: { [key: string]: string };
+ metadata?: { [key: string]: string | number | boolean | null };
bookingId?: number;
status?: string;
smsReminderNumber?: string;
@@ -28,6 +28,7 @@ export type WebhookDataType = CalendarEvent &
triggerEvent: string;
createdAt: string;
downloadLink?: string;
+ paymentId?: number;
};
function getZapierPayload(
@@ -77,11 +78,7 @@ function getZapierPayload(
}
function applyTemplate(template: string, data: WebhookDataType, contentType: ContentType) {
- const organizer = JSON.stringify(data.organizer);
- const attendees = JSON.stringify(data.attendees);
- const formattedData = { ...data, metadata: JSON.stringify(data.metadata), organizer, attendees };
-
- const compiled = compile(template)(formattedData).replace(/"/g, '"');
+ const compiled = compile(template)(data).replace(/"/g, '"');
if (contentType === "application/json") {
return JSON.stringify(jsonParse(compiled));
@@ -126,24 +123,37 @@ const sendPayload = async (
});
}
- return _sendPayload(secretKey, triggerEvent, createdAt, webhook, body, contentType);
+ return _sendPayload(secretKey, webhook, body, contentType);
};
-export const sendGenericWebhookPayload = async (
- secretKey: string | null,
- triggerEvent: string,
- createdAt: string,
- webhook: Pick
,
- data: Record
-) => {
- const body = JSON.stringify(data);
- return _sendPayload(secretKey, triggerEvent, createdAt, webhook, body, "application/json");
+export const sendGenericWebhookPayload = async ({
+ secretKey,
+ triggerEvent,
+ createdAt,
+ webhook,
+ data,
+ rootData,
+}: {
+ secretKey: string | null;
+ triggerEvent: string;
+ createdAt: string;
+ webhook: Pick;
+ data: Record;
+ rootData?: Record;
+}) => {
+ const body = JSON.stringify({
+ // Added rootData props first so that using the known(i.e. triggerEvent, createdAt, payload) properties in rootData doesn't override the known properties
+ ...rootData,
+ triggerEvent: triggerEvent,
+ createdAt: createdAt,
+ payload: data,
+ });
+
+ return _sendPayload(secretKey, webhook, body, "application/json");
};
const _sendPayload = async (
secretKey: string | null,
- triggerEvent: string,
- createdAt: string,
webhook: Pick,
body: string,
contentType: "application/json" | "application/x-www-form-urlencoded"
diff --git a/packages/features/webhooks/pages/webhook-edit-view.tsx b/packages/features/webhooks/pages/webhook-edit-view.tsx
index 0bf8b35ba0..9429b5154a 100644
--- a/packages/features/webhooks/pages/webhook-edit-view.tsx
+++ b/packages/features/webhooks/pages/webhook-edit-view.tsx
@@ -63,8 +63,8 @@ function Component({ webhookId }: { webhookId: string }) {
backButton
/>
{
if (
subscriberUrlReserved({
diff --git a/packages/features/webhooks/pages/webhook-new-view.tsx b/packages/features/webhooks/pages/webhook-new-view.tsx
index c7da3b97ad..bccddf531e 100644
--- a/packages/features/webhooks/pages/webhook-new-view.tsx
+++ b/packages/features/webhooks/pages/webhook-new-view.tsx
@@ -81,9 +81,9 @@ const NewWebhookView = () => {
backButton
/>
app.slug)}
- noRoutingFormTriggers={!!teamId}
/>
);
diff --git a/packages/lib/constants.ts b/packages/lib/constants.ts
index 714626527b..6d302d7d03 100644
--- a/packages/lib/constants.ts
+++ b/packages/lib/constants.ts
@@ -58,6 +58,7 @@ export const HOSTED_CAL_FEATURES = process.env.NEXT_PUBLIC_HOSTED_CAL_FEATURES |
export const NEXT_PUBLIC_BASE_URL = process.env.NEXT_PUBLIC_WEBAPP_URL || `https://${process.env.VERCEL_URL}`;
export const LOGO = "/calcom-logo-white-word.svg";
export const LOGO_ICON = "/cal-com-icon-white.svg";
+export const AVATAR_FALLBACK = "/avatar.svg";
export const FAVICON_16 = "/favicon-16x16.png";
export const FAVICON_32 = "/favicon-32x32.png";
export const APPLE_TOUCH_ICON = "/apple-touch-icon.png";
diff --git a/packages/lib/defaultAvatarImage.test.ts b/packages/lib/defaultAvatarImage.test.ts
deleted file mode 100644
index 14d7ca2392..0000000000
--- a/packages/lib/defaultAvatarImage.test.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { defaultAvatarSrc, getPlaceholderAvatar } from "./defaultAvatarImage";
-
-describe("Default Avatar Image tests", () => {
- describe("fn: defaultAvatarSrc", () => {
- it("should return a gravatar URL when an email is provided", () => {
- const email = "john@example.com";
- const result = defaultAvatarSrc({ email });
-
- expect(result).toEqual(
- "https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=160&d=mp&r=PG"
- );
- });
-
- it("should return a gravatar URL when an MD5 hash is provided", () => {
- const md5 = "my-md5-hash";
- const result = defaultAvatarSrc({ md5 });
-
- expect(result).toEqual("https://www.gravatar.com/avatar/my-md5-hash?s=160&d=mp&r=PG");
- });
-
- it("should return a gravatar URL using the MD5 hash when an email and MD5 hash are provided", () => {
- const email = "john@example.com";
- const md5 = "my-md5-hash";
-
- const result = defaultAvatarSrc({ email, md5 });
-
- expect(result).toEqual("https://www.gravatar.com/avatar/my-md5-hash?s=160&d=mp&r=PG");
- });
-
- it("should return an empty string when neither an email or MD5 hash is provided", () => {
- const result = defaultAvatarSrc({});
-
- expect(result).toEqual("");
- });
- });
-
- describe("fn: getPlaceholderAvatar", () => {
- it("should return the avatar URL when one is provided", () => {
- const avatar = "https://example.com/avatar.png";
- const name = "John Doe";
-
- const result = getPlaceholderAvatar(avatar, name);
-
- expect(result).toEqual(avatar);
- });
-
- it("should return a placeholder avatar URL when no avatar is provided", () => {
- const name = "John Doe";
-
- const result = getPlaceholderAvatar(null, name);
-
- expect(result).toEqual(
- "https://eu.ui-avatars.com/api/?background=fff&color=f9f9f9&bold=true&background=000000&name=John%20Doe"
- );
- });
-
- it("should return a placeholder avatar URL when no avatar is provided and no name is provided", () => {
- const result = getPlaceholderAvatar(null, null);
-
- expect(result).toEqual(
- "https://eu.ui-avatars.com/api/?background=fff&color=f9f9f9&bold=true&background=000000&name="
- );
- });
- });
-});
diff --git a/packages/lib/defaultAvatarImage.ts b/packages/lib/defaultAvatarImage.ts
index f9f3eb1864..2fee3bffee 100644
--- a/packages/lib/defaultAvatarImage.ts
+++ b/packages/lib/defaultAvatarImage.ts
@@ -1,19 +1,3 @@
-import md5Parser from "md5";
-
-/**
- * Provided either an email or an MD5 hash, return the URL for the Gravatar
- * image aborting early if neither is provided.
- */
-export const defaultAvatarSrc = function ({ email, md5 }: { md5?: string; email?: string }) {
- if (!email && !md5) return "";
-
- if (email && !md5) {
- md5 = md5Parser(email);
- }
-
- return `https://www.gravatar.com/avatar/${md5}?s=160&d=mp&r=PG`;
-};
-
/**
* Given an avatar URL and a name, return the appropriate avatar URL. In the
* event that no avatar URL is provided, return a placeholder avatar URL from
diff --git a/packages/lib/server/queries/teams/index.ts b/packages/lib/server/queries/teams/index.ts
index 35e8cfe248..633ccffb84 100644
--- a/packages/lib/server/queries/teams/index.ts
+++ b/packages/lib/server/queries/teams/index.ts
@@ -136,7 +136,6 @@ export async function getTeamWithMembers(args: {
// This should improve performance saving already app data found.
const appDataMap = new Map();
-
const members = team.members.map((obj) => {
return {
...obj.user,
@@ -144,7 +143,7 @@ export async function getTeamWithMembers(args: {
accepted: obj.accepted,
disableImpersonation: obj.disableImpersonation,
avatar: `${WEBAPP_URL}/${obj.user.username}/avatar.png`,
- connectedApps: obj.user.credentials.map((cred) => {
+ connectedApps: obj?.user?.credentials?.map((cred) => {
const appSlug = cred.app?.slug;
let appData = appDataMap.get(appSlug);
@@ -153,14 +152,13 @@ export async function getTeamWithMembers(args: {
appDataMap.set(appSlug, appData);
}
- const isCalendar = cred?.app?.categories.includes("calendar");
- const externalId = isCalendar ? cred.destinationCalendars[0]?.externalId : undefined;
-
+ const isCalendar = cred?.app?.categories?.includes("calendar") ?? false;
+ const externalId = isCalendar ? cred.destinationCalendars?.[0]?.externalId : null;
return {
- name: appData?.name,
- logo: appData?.logo,
+ name: appData?.name ?? null,
+ logo: appData?.logo ?? null,
app: cred.app,
- externalId,
+ externalId: externalId ?? null,
};
}),
};
diff --git a/packages/lib/testEmails.ts b/packages/lib/testEmails.ts
new file mode 100644
index 0000000000..fff8da1079
--- /dev/null
+++ b/packages/lib/testEmails.ts
@@ -0,0 +1,18 @@
+declare global {
+ // eslint-disable-next-line no-var
+ var testEmails: {
+ to: string;
+ from: string;
+ subject: string;
+ html: string;
+ }[];
+}
+
+export const setTestEmail = (email: (typeof globalThis.testEmails)[number]) => {
+ globalThis.testEmails = globalThis.testEmails || [];
+ globalThis.testEmails.push(email);
+};
+
+export const getTestEmails = () => {
+ return globalThis.testEmails;
+};
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 80a4c25478..c6bf3208d4 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -56,6 +56,7 @@ model EventType {
position Int @default(0)
/// @zod.custom(imports.eventTypeLocations)
locations Json?
+ /// @zod.min(1)
length Int
offsetStart Int @default(0)
hidden Boolean @default(false)
diff --git a/packages/prisma/seed-app-store.ts b/packages/prisma/seed-app-store.ts
index 56dd6e1133..d4bff45b70 100644
--- a/packages/prisma/seed-app-store.ts
+++ b/packages/prisma/seed-app-store.ts
@@ -337,7 +337,9 @@ export default async function main() {
invite_link: process.env.ZAPIER_INVITE_LINK,
});
}
-
+ await createApp("make", "make", ["automation"], "make_automation", {
+ invite_link: "https://make.com/en/hq/app-invitation/6cb2772b61966508dd8f414ba3b44510",
+ });
await createApp("huddle01", "huddle01video", ["conferencing"], "huddle01_video");
// Payment apps
diff --git a/packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts
index 13e5abd9ae..d68b8f0826 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts
@@ -32,11 +32,10 @@ const userSelect = Prisma.validator()({
name: true,
});
-const eventTypeSelect = Prisma.validator()({
+const userEventTypeSelect = Prisma.validator()({
// Position is required by lodash to sort on it. Don't remove it, TS won't complain but it would silently break reordering
position: true,
hashedLink: true,
- locations: true,
destinationCalendar: true,
userId: true,
team: {
@@ -53,13 +52,6 @@ const eventTypeSelect = Prisma.validator()({
users: {
select: userSelect,
},
- children: {
- include: {
- users: {
- select: userSelect,
- },
- },
- },
parentId: true,
hosts: {
select: {
@@ -72,6 +64,17 @@ const eventTypeSelect = Prisma.validator()({
...baseEventTypeSelect,
});
+const teamEventTypeSelect = Prisma.validator()({
+ ...userEventTypeSelect,
+ children: {
+ include: {
+ users: {
+ select: userSelect,
+ },
+ },
+ },
+});
+
export const compareMembership = (mship1: MembershipRole, mship2: MembershipRole) => {
const mshipToNumber = (mship: MembershipRole) =>
Object.keys(MembershipRole).findIndex((mmship) => mmship === mship);
@@ -118,7 +121,7 @@ export const getByViewerHandler = async ({ ctx, input }: GetByViewerOptions) =>
},
},
eventTypes: {
- select: eventTypeSelect,
+ select: teamEventTypeSelect,
orderBy: [
{
position: "desc",
@@ -134,10 +137,12 @@ export const getByViewerHandler = async ({ ctx, input }: GetByViewerOptions) =>
},
eventTypes: {
where: {
- team: null,
+ teamId: null,
userId: getPrismaWhereUserIdFromFilter(ctx.user.id, input?.filters),
},
- select: eventTypeSelect,
+ select: {
+ ...userEventTypeSelect,
+ },
orderBy: [
{
position: "desc",
@@ -154,11 +159,15 @@ export const getByViewerHandler = async ({ ctx, input }: GetByViewerOptions) =>
throw new TRPCError({ code: "INTERNAL_SERVER_ERROR" });
}
- const mapEventType = (eventType: (typeof user.eventTypes)[number]) => ({
+ type UserEventTypes = (typeof user.eventTypes)[number];
+ type TeamEventTypeChildren = (typeof user.teams)[number]["team"]["eventTypes"][number];
+
+ const mapEventType = (eventType: UserEventTypes & Partial) => ({
...eventType,
- safeDescription: markdownToSafeHTML(eventType.description),
- users: !!eventType.hosts?.length ? eventType.hosts.map((host) => host.user) : eventType.users,
+ safeDescription: eventType?.description ? markdownToSafeHTML(eventType.description) : undefined,
+ users: !!eventType?.hosts?.length ? eventType?.hosts.map((host) => host.user) : eventType.users,
metadata: eventType.metadata ? EventTypeMetaDataSchema.parse(eventType.metadata) : undefined,
+ children: eventType.children,
});
const userEventTypes = user.eventTypes.map(mapEventType);
diff --git a/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts
index dc0f28781a..84bd5d76e5 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts
@@ -241,13 +241,13 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
}
}
- if (input?.price || input.metadata?.apps?.stripe?.price) {
- data.price = input.price || input.metadata?.apps?.stripe?.price;
+ if (input.metadata?.apps?.stripe?.price) {
+ data.price = input.metadata?.apps?.stripe?.price;
const paymentCredential = await ctx.prisma.credential.findFirst({
where: {
userId: ctx.user.id,
type: {
- contains: "_payment",
+ equals: "stripe_payment",
},
},
select: {
@@ -260,6 +260,22 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
const { default_currency } = stripeDataSchema.parse(paymentCredential.key);
data.currency = default_currency;
}
+ }
+
+ if (input.metadata?.apps?.paypal?.price) {
+ data.price = input.metadata?.apps?.paypal?.price;
+ const paymentCredential = await ctx.prisma.credential.findFirst({
+ where: {
+ userId: ctx.user.id,
+ type: {
+ equals: "paypal_payment",
+ },
+ },
+ select: {
+ type: true,
+ key: true,
+ },
+ });
if (paymentCredential?.type === "paypal_payment" && input.metadata?.apps?.paypal?.currency) {
data.currency = input.metadata?.apps?.paypal?.currency.toLowerCase();
}
diff --git a/packages/trpc/server/routers/viewer/organizations/listOtherTeams.handler.ts b/packages/trpc/server/routers/viewer/organizations/listOtherTeams.handler.ts
index 8b82119d5f..3bb2a30d02 100644
--- a/packages/trpc/server/routers/viewer/organizations/listOtherTeams.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/listOtherTeams.handler.ts
@@ -9,38 +9,20 @@ type ListOptions = {
};
export const listOtherTeamHandler = async ({ ctx }: ListOptions) => {
- const teamsInOrgIamNotPartOf = await prisma.membership.findMany({
+ const teamsInOrgIamNotPartOf = await prisma.team.findMany({
where: {
- userId: {
- not: ctx.user.id,
+ parent: {
+ id: ctx.user?.organization?.id,
},
- team: {
- parent: {
- is: {
- id: ctx.user?.organization?.id,
- },
- },
- members: {
- none: {
- userId: ctx.user.id,
- },
+ members: {
+ none: {
+ userId: ctx.user.id,
},
},
},
- include: {
- team: true,
- },
- orderBy: { role: "desc" },
- distinct: ["teamId"],
});
- return teamsInOrgIamNotPartOf.map(({ team, ...membership }) => ({
- role: membership.role,
- accepted: membership.accepted,
- userId: membership.userId,
- isOrgAdmin: true,
- ...team,
- }));
+ return teamsInOrgIamNotPartOf;
};
export default listOtherTeamHandler;
diff --git a/packages/trpc/server/routers/viewer/slots/_router.tsx b/packages/trpc/server/routers/viewer/slots/_router.tsx
index c38b4e4441..2d37ad3eab 100644
--- a/packages/trpc/server/routers/viewer/slots/_router.tsx
+++ b/packages/trpc/server/routers/viewer/slots/_router.tsx
@@ -3,6 +3,7 @@ import type { NextApiRequest, NextApiResponse } from "next";
import publicProcedure from "../../../procedures/publicProcedure";
import { router } from "../../../trpc";
import { ZGetScheduleInputSchema } from "./getSchedule.schema";
+import { ZRemoveSelectedSlotInputSchema } from "./removeSelectedSlot.schema";
import { ZReserveSlotInputSchema } from "./reserveSlot.schema";
type SlotsRouterHandlerCache = {
@@ -49,12 +50,14 @@ export const slotsRouter = router({
});
}),
// This endpoint has no dependencies, it doesn't need its own file
- removeSelectedSlotMark: publicProcedure.mutation(async ({ ctx }) => {
- const { req, prisma } = ctx;
- const uid = req?.cookies?.uid;
- if (uid) {
- await prisma.selectedSlots.deleteMany({ where: { uid: { equals: uid } } });
- }
- return;
- }),
+ removeSelectedSlotMark: publicProcedure
+ .input(ZRemoveSelectedSlotInputSchema)
+ .mutation(async ({ input, ctx }) => {
+ const { req, prisma } = ctx;
+ const uid = req?.cookies?.uid || input.uid;
+ if (uid) {
+ await prisma.selectedSlots.deleteMany({ where: { uid: { equals: uid } } });
+ }
+ return;
+ }),
});
diff --git a/packages/trpc/server/routers/viewer/slots/removeSelectedSlot.schema.ts b/packages/trpc/server/routers/viewer/slots/removeSelectedSlot.schema.ts
new file mode 100644
index 0000000000..afdfab987c
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/slots/removeSelectedSlot.schema.ts
@@ -0,0 +1,7 @@
+import type { z } from "zod";
+
+import { removeSelectedSlotSchema } from "./types";
+
+export const ZRemoveSelectedSlotInputSchema = removeSelectedSlotSchema;
+
+export type TRemoveSelectedSlotInputSchema = z.infer;
diff --git a/packages/trpc/server/routers/viewer/slots/reserveSlot.handler.ts b/packages/trpc/server/routers/viewer/slots/reserveSlot.handler.ts
index 330789f975..62e3a263ba 100644
--- a/packages/trpc/server/routers/viewer/slots/reserveSlot.handler.ts
+++ b/packages/trpc/server/routers/viewer/slots/reserveSlot.handler.ts
@@ -86,5 +86,7 @@ export const reserveSlotHandler = async ({ ctx, input }: ReserveSlotOptions) =>
}
}
res?.setHeader("Set-Cookie", serialize("uid", uid, { path: "/", sameSite: "lax" }));
- return;
+ return {
+ uid: uid,
+ };
};
diff --git a/packages/trpc/server/routers/viewer/slots/types.ts b/packages/trpc/server/routers/viewer/slots/types.ts
index aed8403143..aca1834f62 100644
--- a/packages/trpc/server/routers/viewer/slots/types.ts
+++ b/packages/trpc/server/routers/viewer/slots/types.ts
@@ -57,3 +57,7 @@ export type Slot = {
bookingUid?: string;
users?: string[];
};
+
+export const removeSelectedSlotSchema = z.object({
+ uid: z.string().nullable(),
+});
diff --git a/packages/ui/components/apps/AppCard.tsx b/packages/ui/components/apps/AppCard.tsx
index 593d03f32d..1bbaca9f18 100644
--- a/packages/ui/components/apps/AppCard.tsx
+++ b/packages/ui/components/apps/AppCard.tsx
@@ -21,6 +21,7 @@ import {
DropdownMenuLabel,
DropdownItem,
Avatar,
+ Badge,
} from "@calcom/ui";
import { Button } from "../button";
@@ -154,15 +155,10 @@ export function AppCard({ app, credentials, searchText, userAdminTeams }: AppCar
)}