Merge branch 'main' into fix/tavily-api-key-param

Author: asimar007

packages/components/src/utils.ts

@@ -988,7 +988,7 @@ export const getVars = async (
     nodeData: INodeData,
     options: ICommonObject
 ) => {
-    if (!options.workspaceId) {
+    if (!options.workspaceId || options.skipVariables) {
         return []
     }
     const variables =

packages/server/src/controllers/nodes/index.ts

@@ -94,7 +94,8 @@ const executeCustomFunction = async (req: Request, res: Response, next: NextFunc
         }
         const orgId = req.user?.activeOrganizationId
         const workspaceId = req.user?.activeWorkspaceId
-        const apiResponse = await nodesService.executeCustomFunction(req.body, workspaceId, orgId)
+        const canViewVariables = !!(req.user?.isOrganizationAdmin || req.user?.permissions?.includes('variables:view'))
+        const apiResponse = await nodesService.executeCustomFunction(req.body, workspaceId, orgId, canViewVariables)
         return res.json(apiResponse)
     } catch (error) {
         next(error)

packages/server/src/queue/PredictionQueue.ts

@@ -92,7 +92,8 @@ export class PredictionQueue extends BaseQueue {
                 componentNodes: this.componentNodes,
                 data: executeCustomFunctionData.data,
                 workspaceId: executeCustomFunctionData.workspaceId,
-                orgId: executeCustomFunctionData.orgId
+                orgId: executeCustomFunctionData.orgId,
+                canViewVariables: executeCustomFunctionData.canViewVariables
             })
         }
 

packages/server/src/services/nodes/index.ts

@@ -126,13 +126,14 @@ const getSingleNodeAsyncOptions = async (nodeName: string, requestBody: any): Pr
 }
 
 // execute custom function node
-const executeCustomFunction = async (requestBody: any, workspaceId?: string, orgId?: string) => {
+const executeCustomFunction = async (requestBody: any, workspaceId?: string, orgId?: string, canViewVariables?: boolean) => {
     const appServer = getRunningExpressApp()
     const executeData = {
         appDataSource: appServer.AppDataSource,
         componentNodes: appServer.nodesPool.componentNodes,
         data: requestBody,
         isExecuteCustomFunction: true,
+        canViewVariables,
         orgId,
         workspaceId
     }

packages/server/src/utils/executeCustomNodeFunction.ts

@@ -11,13 +11,15 @@ export const executeCustomNodeFunction = async ({
     componentNodes,
     data,
     workspaceId,
-    orgId
+    orgId,
+    canViewVariables
 }: {
     appDataSource: DataSource
     componentNodes: IComponentNodes
     data: any
     workspaceId?: string
     orgId?: string
+    canViewVariables?: boolean
 }) => {
     try {
         const body = data
@@ -43,7 +45,8 @@ export const executeCustomNodeFunction = async ({
                     appDataSource,
                     databaseEntities,
                     workspaceId,
-                    orgId
+                    orgId,
+                    skipVariables: !canViewVariables
                 }
 
                 const returnData = await newNodeInstance.init(nodeData, '', options)