Fix: pick action bot user based on workspace (#195)

Author: saimanoj

actions/slack/package.json

@@ -10,7 +10,7 @@
   "packageManager": "pnpm@8.15.6",
   "dependencies": {
     "@tegonhq/sdk": "^0.1.3",
-    "@trigger.dev/sdk": "3.0.0-beta.55",
+    "@trigger.dev/sdk": "3.0.0-beta.56",
     "axios": "^1.6.7",
     "form-data": "^4.0.0"
   },

apps/server/src/modules/action-event/action-event.utils.ts

@@ -34,17 +34,17 @@ export const prepareTriggerPayload = async (
   prisma: PrismaService,
   actionId: string,
 ) => {
-  const action = await prisma.action.findFirst({
+  const action = await prisma.action.findUnique({
     where: {
       id: actionId,
     },
   });
 
-  const actionUser = await prisma.user.findFirst({
-    where: { username: action.slug },
+  const actionUser = await prisma.usersOnWorkspaces.findFirst({
+    where: { workspaceId: action.workspaceId, user: { username: action.slug } },
   });
 
-  const accessToken = await generateKeyForUserId(actionUser.id);
+  const accessToken = await generateKeyForUserId(actionUser.userId);
 
   const integrationMap = await getIntegrationAccountsFromActions(
     prisma,

apps/server/src/modules/webhook/webhook.service.ts

@@ -88,8 +88,11 @@ export default class WebhookService {
 
     // TODO (actons): Send all integration accounts based on the ask
     actionEntities.map(async (actionEntity: ActionEntity) => {
-      const actionUser = await this.prisma.user.findFirst({
-        where: { username: actionEntity.action.slug },
+      const actionUser = await this.prisma.usersOnWorkspaces.findFirst({
+        where: {
+          workspaceId: actionEntity.action.workspaceId,
+          user: { username: actionEntity.action.slug },
+        },
       });
       const accessToken = await generateKeyForUserId(actionUser.id);