From fcb443a8ebfad5fe281c6bc2d608d9bf8cca3e5b Mon Sep 17 00:00:00 2001
From: Riddhesh Mahajan <40472653+riddhesh-mahajan@users.noreply.github.com>
Date: Fri, 15 Dec 2023 21:39:59 +0530
Subject: [PATCH] fix: Zapier subscriber url shown in webhooks (#12702)

Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
---
 .../routers/viewer/webhook/getByViewer.handler.ts  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts b/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts
index c38c7d446b..f15988b424 100644
--- a/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts
+++ b/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts
@@ -39,6 +39,15 @@ export type WebhooksByViewer = {
   }[];
 };
 
+const filterWebhooks = (webhook: Webhook) => {
+  const appIds = [
+    "zapier",
+    // Add more if needed
+  ];
+
+  return !appIds.some((appId: string) => webhook.appId == appId);
+};
+
 export const getByViewerHandler = async ({ ctx }: GetByViewerOptions) => {
   const user = await prisma.user.findUnique({
     where: {
@@ -80,7 +89,8 @@ export const getByViewerHandler = async ({ ctx }: GetByViewerOptions) => {
     throw new TRPCError({ code: "INTERNAL_SERVER_ERROR" });
   }
 
-  const userWebhooks = user.webhooks;
+  let userWebhooks = user.webhooks;
+  userWebhooks = userWebhooks.filter(filterWebhooks);
   let webhookGroups: WebhookGroup[] = [];
   const bookerUrl = await getBookerUrl(user);
 
@@ -132,7 +142,7 @@ export const getByViewerHandler = async ({ ctx }: GetByViewerOptions) => {
                 : MembershipRole.MEMBER
               : MembershipRole.MEMBER),
         },
-        webhooks: membership.team.webhooks,
+        webhooks: membership.team.webhooks.filter(filterWebhooks),
       };
     });