+ {showContent ? (
+
+ );
+}
+
+const CopyApiKey = ({ apiKey }: { apiKey: string }) => {
+ const { t } = useLocale();
+ return (
+
+
+ ) : (
+
+
+
+ 
+
+
+
+
+ {t("setting_up_make")}
+
+ <>
+ {t("generate_api_key")}:
+ {!teams ? (
+
+ ) : (
+ <>
+ Your event types:
+ {!newApiKeys[""] ? (
+
+ ) : (
+
+
+ );
+ })}
+
+ )}
+
+
+ {team.name}:
+ {!newApiKeys[team.id] ? (
+
+ ) : (
+ -
+
- + Go to + + Make Invite Link + + and install the Cal.com app. + +
- Log into your Make account and create a new Scenario. +
- Select Cal.com as your Trigger app. Also choose a Trigger event. +
- Choose your account and then enter your Unique API Key. +
- Test your Trigger. +
- You're set! +
+
+ )}
+ {t("install_make_app")}
+
+
+
+
+
+
+
+ );
+};
diff --git a/packages/app-store/make/static/1.jpeg b/packages/app-store/make/static/1.jpeg
new file mode 100644
index 0000000000..54f811f918
Binary files /dev/null and b/packages/app-store/make/static/1.jpeg differ
diff --git a/packages/app-store/make/static/2.jpeg b/packages/app-store/make/static/2.jpeg
new file mode 100644
index 0000000000..c6637a01c8
Binary files /dev/null and b/packages/app-store/make/static/2.jpeg differ
diff --git a/packages/app-store/make/static/3.jpeg b/packages/app-store/make/static/3.jpeg
new file mode 100644
index 0000000000..15c25d425f
Binary files /dev/null and b/packages/app-store/make/static/3.jpeg differ
diff --git a/packages/app-store/make/static/4.jpeg b/packages/app-store/make/static/4.jpeg
new file mode 100644
index 0000000000..6ae8a3cabc
Binary files /dev/null and b/packages/app-store/make/static/4.jpeg differ
diff --git a/packages/app-store/make/static/5.jpeg b/packages/app-store/make/static/5.jpeg
new file mode 100644
index 0000000000..29667aff9a
Binary files /dev/null and b/packages/app-store/make/static/5.jpeg differ
diff --git a/packages/app-store/make/static/icon.svg b/packages/app-store/make/static/icon.svg
new file mode 100644
index 0000000000..3332f2c81f
--- /dev/null
+++ b/packages/app-store/make/static/icon.svg
@@ -0,0 +1,6 @@
+
diff --git a/packages/app-store/make/zod.ts b/packages/app-store/make/zod.ts
new file mode 100644
index 0000000000..4a98d79116
--- /dev/null
+++ b/packages/app-store/make/zod.ts
@@ -0,0 +1,7 @@
+import { z } from "zod";
+
+export const appDataSchema = z.object({});
+
+export const appKeysSchema = z.object({
+ invite_link: z.string().min(1),
+});
diff --git a/packages/app-store/zapier/api/subscriptions/addSubscription.ts b/packages/app-store/zapier/api/subscriptions/addSubscription.ts
index 3bc3ecc2f4..675f161be1 100644
--- a/packages/app-store/zapier/api/subscriptions/addSubscription.ts
+++ b/packages/app-store/zapier/api/subscriptions/addSubscription.ts
@@ -1,12 +1,8 @@
-import type { Prisma } from "@prisma/client";
import type { NextApiRequest, NextApiResponse } from "next";
-import { v4 } from "uuid";
import findValidApiKey from "@calcom/features/ee/api-keys/lib/findValidApiKey";
-import { scheduleTrigger } from "@calcom/features/webhooks/lib/scheduleTrigger";
+import { addSubscription } from "@calcom/features/webhooks/lib/scheduleTrigger";
import { defaultHandler, defaultResponder } from "@calcom/lib/server";
-import prisma from "@calcom/prisma";
-import { BookingStatus, WebhookTriggerEvents } from "@calcom/prisma/enums";
async function handler(req: NextApiRequest, res: NextApiResponse) {
const apiKey = req.query.apiKey as string;
@@ -23,45 +19,18 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
const { subscriberUrl, triggerEvent } = req.body;
- try {
- const createSubscription = await prisma.webhook.create({
- data: {
- id: v4(),
- userId: validKey.userId,
- teamId: validKey.teamId,
- eventTriggers: [triggerEvent],
- subscriberUrl,
- active: true,
- appId: "zapier",
- },
- });
+ const createAppSubscription = await addSubscription({
+ appApiKey: validKey,
+ triggerEvent: triggerEvent,
+ subscriberUrl: subscriberUrl,
+ appId: "zapier",
+ });
- if (triggerEvent === WebhookTriggerEvents.MEETING_ENDED) {
- //schedule job for already existing bookings
- const where: Prisma.BookingWhereInput = {};
- if (validKey.teamId) where.eventType = { teamId: validKey.teamId };
- else where.userId = validKey.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,
- });
- }
- }
- res.status(200).json(createSubscription);
- } catch (error) {
+ if (!createAppSubscription) {
return res.status(500).json({ message: "Could not create subscription." });
}
+
+ res.status(200).json(createAppSubscription);
}
export default defaultHandler({
diff --git a/packages/app-store/zapier/api/subscriptions/deleteSubscription.ts b/packages/app-store/zapier/api/subscriptions/deleteSubscription.ts
index b0887ac21b..81469a30ff 100644
--- a/packages/app-store/zapier/api/subscriptions/deleteSubscription.ts
+++ b/packages/app-store/zapier/api/subscriptions/deleteSubscription.ts
@@ -1,11 +1,9 @@
-import type { Prisma } from "@prisma/client";
import type { NextApiRequest, NextApiResponse } from "next";
import z from "zod";
import findValidApiKey from "@calcom/features/ee/api-keys/lib/findValidApiKey";
+import { deleteSubscription } from "@calcom/features/webhooks/lib/scheduleTrigger";
import { defaultHandler, defaultResponder } from "@calcom/lib/server";
-import prisma from "@calcom/prisma";
-import { WebhookTriggerEvents } from "@calcom/prisma/enums";
const querySchema = z.object({
apiKey: z.string(),
@@ -24,49 +22,16 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
if (!validKey) {
return res.status(401).json({ message: "API key not valid" });
}
- const webhook = await prisma.webhook.findFirst({
- where: {
- id,
- userId: validKey.userId,
- teamId: validKey.teamId,
- },
+
+ const deleteEventSubscription = await deleteSubscription({
+ appApiKey: validKey,
+ webhookId: id,
+ appId: "zapier",
});
- if (!webhook) {
- return res.status(401).json({ message: "Not authorized to delete this webhook" });
+ if (!deleteEventSubscription) {
+ return res.status(500).json({ message: "Could not delete subscription." });
}
- if (webhook?.eventTriggers.includes(WebhookTriggerEvents.MEETING_ENDED)) {
- const where: Prisma.BookingWhereInput = {};
- if (validKey.teamId) where.eventType = { teamId: validKey.teamId };
- else where.userId = validKey.userId;
- const bookingsWithScheduledJobs = await prisma.booking.findMany({
- where: {
- ...where,
- scheduledJobs: {
- isEmpty: false,
- },
- },
- });
- for (const booking of bookingsWithScheduledJobs) {
- const updatedScheduledJobs = booking.scheduledJobs.filter(
- (scheduledJob) => scheduledJob !== `zapier_${webhook.id}`
- );
- await prisma.booking.update({
- where: {
- id: booking.id,
- },
- data: {
- scheduledJobs: updatedScheduledJobs,
- },
- });
- }
- }
-
- await prisma.webhook.delete({
- where: {
- id,
- },
- });
res.status(204).json({ message: "Subscription is deleted." });
}
diff --git a/packages/app-store/zapier/api/subscriptions/listBookings.ts b/packages/app-store/zapier/api/subscriptions/listBookings.ts
index 7cf0510339..f3a59c690a 100644
--- a/packages/app-store/zapier/api/subscriptions/listBookings.ts
+++ b/packages/app-store/zapier/api/subscriptions/listBookings.ts
@@ -1,11 +1,8 @@
-import type { Prisma } from "@prisma/client";
import type { NextApiRequest, NextApiResponse } from "next";
-import { getHumanReadableLocationValue } from "@calcom/core/location";
-import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
import findValidApiKey from "@calcom/features/ee/api-keys/lib/findValidApiKey";
-import { defaultHandler, defaultResponder, getTranslation } from "@calcom/lib/server";
-import prisma from "@calcom/prisma";
+import { listBookings } from "@calcom/features/webhooks/lib/scheduleTrigger";
+import { defaultHandler, defaultResponder } from "@calcom/lib/server";
async function handler(req: NextApiRequest, res: NextApiResponse) {
const apiKey = req.query.apiKey as string;
@@ -20,88 +17,18 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
return res.status(401).json({ message: "API key not valid" });
}
- try {
- const where: Prisma.BookingWhereInput = {};
- if (validKey.teamId) {
- where.eventType = {
- OR: [{ teamId: validKey.teamId }, { parent: { teamId: validKey.teamId } }],
- };
- } else {
- where.userId = validKey.userId;
- }
+ const bookings = await listBookings(validKey);
- const bookings = await prisma.booking.findMany({
- take: 3,
- 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) {
- const requested = validKey.teamId ? "teamId: " + validKey.teamId : "userId: " + validKey.userId;
- return res.status(404).json({
- message: `There are no bookings to retrieve, please create a booking first. Requested: \`${requested}\``,
- });
- }
-
- 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),
- };
- });
-
- res.status(201).json(updatedBookings);
- } catch (error) {
- console.error(error);
+ if (!bookings) {
return res.status(500).json({ message: "Unable to get bookings." });
}
+ if (bookings.length === 0) {
+ const requested = validKey.teamId ? "teamId: " + validKey.teamId : "userId: " + validKey.userId;
+ return res.status(404).json({
+ message: `There are no bookings to retrieve, please create a booking first. Requested: \`${requested}\``,
+ });
+ }
+ res.status(201).json(bookings);
}
export default defaultHandler({
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/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
+
+
+
+
+
+ {apiKey}
+
+ {t("copy_somewhere_safe")}
+