fix(api): webhooks should only listen on correct events

apps/api/src/controllers/live.controller.ts

@@ -142,22 +142,24 @@ export async function wsProjectEvents(
   getRedisSub().subscribe(subscribeToEvent);
 
   const message = async (channel: string, message: string) => {
-    const event = getSuperJson<IServiceEvent>(message);
-    if (event?.projectId === params.projectId) {
-      const profile = await getProfileByIdCached(
-        event.profileId,
-        event.projectId,
-      );
-      connection.socket.send(
-        superjson.stringify(
-          access
-            ? {
-                ...event,
-                profile,
-              }
-            : transformMinimalEvent(event),
-        ),
-      );
+    if (channel === subscribeToEvent) {
+      const event = getSuperJson<IServiceEvent>(message);
+      if (event?.projectId === params.projectId) {
+        const profile = await getProfileByIdCached(
+          event.profileId,
+          event.projectId,
+        );
+        connection.socket.send(
+          superjson.stringify(
+            access
+              ? {
+                  ...event,
+                  profile,
+                }
+              : transformMinimalEvent(event),
+          ),
+        );
+      }
     }
   };
 
@@ -207,9 +209,11 @@ export async function wsProjectNotifications(
   getRedisSub().subscribe(subscribeToEvent);
 
   const message = async (channel: string, message: string) => {
-    const notification = getSuperJson<Notification>(message);
-    if (notification?.projectId === params.projectId) {
-      connection.socket.send(superjson.stringify(notification));
+    if (channel === subscribeToEvent) {
+      const notification = getSuperJson<Notification>(message);
+      if (notification?.projectId === params.projectId) {
+        connection.socket.send(superjson.stringify(notification));
+      }
     }
   };
 
@@ -234,7 +238,12 @@ export async function wsIntegrationsSlack(
   const subscribeToEvent = 'integrations:slack';
   getRedisSub().subscribe(subscribeToEvent);
   const onMessage = (channel: string, message: string) => {
-    connection.socket.send(JSON.stringify('ok'));
+    if (channel === subscribeToEvent) {
+      const parsed = getSuperJson<{ organizationId: string }>(message);
+      if (parsed && parsed.organizationId === req.query.organizationId) {
+        connection.socket.send(message);
+      }
+    }
   };
   getRedisSub().on('message', onMessage);
   connection.socket.on('close', () => {

apps/api/src/controllers/webhook.controller.ts

@@ -1,4 +1,5 @@
 import type { WebhookEvent } from '@clerk/fastify';
+import { setSuperJson } from '@openpanel/common';
 import { AccessLevel, db } from '@openpanel/db';
 import {
   sendSlackNotification,
@@ -242,7 +243,12 @@ export async function slackWebhook(
       },
     });
 
-    getRedisPub().publish('integrations:slack', 'ok');
+    getRedisPub().publish(
+      'integrations:slack',
+      setSuperJson({
+        organizationId: parsedMetadata.data.organizationId,
+      }),
+    );
 
     reply.send({ success: true });
   } catch (err) {