Git merge

sean-brydon · sean-brydon · commit 2d7a186de856 · 2025-09-08T14:37:53.000+01:00
diff --git a/packages/trpc/server/routers/viewer/webhook/list.handler.ts b/packages/trpc/server/routers/viewer/webhook/list.handler.ts
@@ -59,11 +59,12 @@ export const listHandler = async ({ ctx, input }: ListOptions) => {
       const teamIds = user?.teams.map((membership) => membership.teamId) || [];
       const authorizedTeamIds = teamIds.filter((teamId) => teamsWithReadPermission.includes(teamId));
 
+      if (authorizedTeamIds.length === 0) {
+        return [];
+      }
+
       where.AND?.push({
-        OR: [
-          { userId: ctx.user.id },
-          { teamId: { in: authorizedTeamIds.length > 0 ? authorizedTeamIds : teamIds } },
-        ],
+        OR: [{ userId: ctx.user.id }, { teamId: { in: authorizedTeamIds } }],
       });
     }
 
diff --git a/packages/trpc/server/routers/viewer/webhook/util.ts b/packages/trpc/server/routers/viewer/webhook/util.ts
@@ -1,6 +1,3 @@
-import type { Membership } from "@prisma/client";
-
-import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
 import type { PermissionString } from "@calcom/features/pbac/domain/types/permission-registry";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { prisma } from "@calcom/prisma";
@@ -32,10 +29,11 @@ export const createWebhookPbacProcedure = (
       // Check if user is authorized to edit webhook
       const webhook = await prisma.webhook.findUnique({
         where: { id },
-        include: {
-          user: true,
-          team: true,
-          eventType: true,
+        select: {
+          id: true,
+          userId: true,
+          teamId: true,
+          eventTypeId: true,
         },
       });
 
