[pull] main from activepieces:main

packages/server/api/src/app/chat/chat-controller.ts

@@ -1,15 +1,14 @@
 import {
     CreateChatConversationRequest,
-    Permission,
     PrincipalType,
     SendChatMessageRequest,
     SERVICE_KEY_SECURITY_OPENAPI,
+    SetProjectContextRequest,
     UpdateChatConversationRequest,
 } from '@activepieces/shared'
 import { FastifyPluginAsyncZod } from 'fastify-type-provider-zod'
 import { StatusCodes } from 'http-status-codes'
 import { z } from 'zod'
-import { ProjectResourceType } from '../core/security/authorization/common'
 import { securityAccess } from '../core/security/authorization/fastify-security'
 import { chatService } from './chat-service'
 
@@ -19,7 +18,7 @@ export const chatController: FastifyPluginAsyncZod = async (app) => {
 
     app.post('/conversations', CreateConversationRoute, async (request, reply) => {
         const conversation = await chatService(request.log).createConversation({
-            projectId: request.projectId,
+            platformId: request.principal.platform.id,
             userId: request.principal.id,
             request: request.body,
         })
@@ -28,7 +27,7 @@ export const chatController: FastifyPluginAsyncZod = async (app) => {
 
     app.get('/conversations', ListConversationsRoute, async (request) => {
         return chatService(request.log).listConversations({
-            projectId: request.projectId,
+            platformId: request.principal.platform.id,
             userId: request.principal.id,
             cursor: request.query.cursor,
             limit: request.query.limit ?? 20,
@@ -38,15 +37,15 @@ export const chatController: FastifyPluginAsyncZod = async (app) => {
     app.get('/conversations/:id', GetConversationRoute, async (request) => {
         return chatService(request.log).getConversationOrThrow({
             id: request.params.id,
-            projectId: request.projectId,
+            platformId: request.principal.platform.id,
             userId: request.principal.id,
         })
     })
 
     app.post('/conversations/:id', UpdateConversationRoute, async (request) => {
         return chatService(request.log).updateConversation({
             id: request.params.id,
-            projectId: request.projectId,
+            platformId: request.principal.platform.id,
             userId: request.principal.id,
             request: request.body,
         })
@@ -55,7 +54,7 @@ export const chatController: FastifyPluginAsyncZod = async (app) => {
     app.delete('/conversations/:id', DeleteConversationRoute, async (request, reply) => {
         await chatService(request.log).deleteConversation({
             id: request.params.id,
-            projectId: request.projectId,
+            platformId: request.principal.platform.id,
             userId: request.principal.id,
         })
         return reply.status(StatusCodes.NO_CONTENT).send()
@@ -64,7 +63,7 @@ export const chatController: FastifyPluginAsyncZod = async (app) => {
     app.get('/conversations/:id/messages', GetMessagesRoute, async (request) => {
         return chatService(request.log).getMessages({
             id: request.params.id,
-            projectId: request.projectId,
+            platformId: request.principal.platform.id,
             userId: request.principal.id,
         })
     })
@@ -75,7 +74,6 @@ export const chatController: FastifyPluginAsyncZod = async (app) => {
 
         const { result, closeMcpClient } = await chatService(log).sendMessage({
             conversationId: request.params.id,
-            projectId: request.projectId,
             userId: request.principal.id,
             platformId: request.principal.platform.id,
             content,
@@ -105,110 +103,109 @@ export const chatController: FastifyPluginAsyncZod = async (app) => {
             await closeMcpClient()
         }
     })
+
+    app.post('/conversations/:id/project-context', SetProjectContextRoute, async (request) => {
+        return chatService(request.log).setProjectContext({
+            id: request.params.id,
+            platformId: request.principal.platform.id,
+            userId: request.principal.id,
+            projectId: request.body.projectId ?? null,
+        })
+    })
 }
 
 const CreateConversationRoute = {
     config: {
-        security: securityAccess.project(CHAT_PRINCIPALS, Permission.WRITE_CHAT, {
-            type: ProjectResourceType.QUERY,
-        }),
+        security: securityAccess.publicPlatform(CHAT_PRINCIPALS),
     },
     schema: {
         tags: ['chat'],
         security: [SERVICE_KEY_SECURITY_OPENAPI],
-        querystring: z.object({ projectId: z.string() }),
         body: CreateChatConversationRequest,
     },
 }
 
 const ListConversationsRoute = {
     config: {
-        security: securityAccess.project(CHAT_PRINCIPALS, Permission.READ_CHAT, {
-            type: ProjectResourceType.QUERY,
-        }),
+        security: securityAccess.publicPlatform(CHAT_PRINCIPALS),
     },
     schema: {
         tags: ['chat'],
         security: [SERVICE_KEY_SECURITY_OPENAPI],
         querystring: z.object({
-            projectId: z.string(),
             cursor: z.string().optional(),
             limit: z.coerce.number().int().min(1).max(100).default(20).optional(),
         }),
     },
 }
 
-const CONVERSATION_QUERY = z.object({ projectId: z.string() })
 const CONVERSATION_PARAMS = z.object({ id: z.string() })
 
 const GetConversationRoute = {
     config: {
-        security: securityAccess.project(CHAT_PRINCIPALS, Permission.READ_CHAT, {
-            type: ProjectResourceType.QUERY,
-        }),
+        security: securityAccess.publicPlatform(CHAT_PRINCIPALS),
     },
     schema: {
         tags: ['chat'],
         security: [SERVICE_KEY_SECURITY_OPENAPI],
         params: CONVERSATION_PARAMS,
-        querystring: CONVERSATION_QUERY,
     },
 }
 
 const UpdateConversationRoute = {
     config: {
-        security: securityAccess.project(CHAT_PRINCIPALS, Permission.WRITE_CHAT, {
-            type: ProjectResourceType.QUERY,
-        }),
+        security: securityAccess.publicPlatform(CHAT_PRINCIPALS),
     },
     schema: {
         tags: ['chat'],
         security: [SERVICE_KEY_SECURITY_OPENAPI],
         params: CONVERSATION_PARAMS,
-        querystring: CONVERSATION_QUERY,
         body: UpdateChatConversationRequest,
     },
 }
 
 const DeleteConversationRoute = {
     config: {
-        security: securityAccess.project(CHAT_PRINCIPALS, Permission.WRITE_CHAT, {
-            type: ProjectResourceType.QUERY,
-        }),
+        security: securityAccess.publicPlatform(CHAT_PRINCIPALS),
     },
     schema: {
         tags: ['chat'],
         security: [SERVICE_KEY_SECURITY_OPENAPI],
         params: CONVERSATION_PARAMS,
-        querystring: CONVERSATION_QUERY,
     },
 }
 
 const GetMessagesRoute = {
     config: {
-        security: securityAccess.project(CHAT_PRINCIPALS, Permission.READ_CHAT, {
-            type: ProjectResourceType.QUERY,
-        }),
+        security: securityAccess.publicPlatform(CHAT_PRINCIPALS),
     },
     schema: {
         tags: ['chat'],
         security: [SERVICE_KEY_SECURITY_OPENAPI],
         params: CONVERSATION_PARAMS,
-        querystring: CONVERSATION_QUERY,
     },
 }
 
 const SendMessageRoute = {
     config: {
-        security: securityAccess.project(CHAT_PRINCIPALS, Permission.WRITE_CHAT, {
-            type: ProjectResourceType.QUERY,
-        }),
+        security: securityAccess.publicPlatform(CHAT_PRINCIPALS),
     },
     schema: {
         tags: ['chat'],
         security: [SERVICE_KEY_SECURITY_OPENAPI],
         params: CONVERSATION_PARAMS,
-        querystring: CONVERSATION_QUERY,
         body: SendChatMessageRequest,
     },
 }
+
+const SetProjectContextRoute = {
+    config: {
+        security: securityAccess.publicPlatform(CHAT_PRINCIPALS),
+    },
+    schema: {
+        tags: ['chat'],
+        security: [SERVICE_KEY_SECURITY_OPENAPI],
+        params: CONVERSATION_PARAMS,
+        body: SetProjectContextRequest,
+    },
+}

packages/server/api/src/app/chat/chat-conversation-entity.ts

@@ -1,8 +1,9 @@
-import { ChatConversation, Project } from '@activepieces/shared'
+import { ChatConversation, Platform, Project } from '@activepieces/shared'
 import { EntitySchema } from 'typeorm'
 import { ApIdSchema, BaseColumnSchemaPart } from '../database/database-common'
 
 type ChatConversationWithRelations = ChatConversation & {
+    platform: Platform
     project: Project
     user: unknown
 }
@@ -11,10 +12,14 @@ export const ChatConversationEntity = new EntitySchema<ChatConversationWithRelat
     name: 'chat_conversation',
     columns: {
         ...BaseColumnSchemaPart,
-        projectId: {
+        platformId: {
             ...ApIdSchema,
             nullable: false,
         },
+        projectId: {
+            ...ApIdSchema,
+            nullable: true,
+        },
         userId: {
             ...ApIdSchema,
             nullable: false,
@@ -43,16 +48,26 @@ export const ChatConversationEntity = new EntitySchema<ChatConversationWithRelat
     },
     indices: [
         {
-            name: 'idx_chat_conversation_project_user_created_id',
-            columns: ['projectId', 'userId', 'created', 'id'],
+            name: 'idx_chat_conversation_platform_user_created_id',
+            columns: ['platformId', 'userId', 'created', 'id'],
         },
     ],
     relations: {
+        platform: {
+            type: 'many-to-one',
+            target: 'platform',
+            cascade: true,
+            onDelete: 'CASCADE',
+            joinColumn: {
+                name: 'platformId',
+                foreignKeyConstraintName: 'fk_chat_conversation_platform_id',
+            },
+        },
         project: {
             type: 'many-to-one',
             target: 'project',
             cascade: true,
-            onDelete: 'CASCADE',
+            onDelete: 'SET NULL',
             joinColumn: {
                 name: 'projectId',
                 foreignKeyConstraintName: 'fk_chat_conversation_project_id',