fix: release sandbox and auth prop validation

activepieces · Jan 4, 2024 · ab48eee · ab48eee
1 parent 2d1b7e6
commit ab48eee
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 29 deletions.
diff --git a/.github/workflows/build-cloud-image.yml b/.github/workflows/build-cloud-image.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   Release:
     env:
-      MY_VERSION: appsumo2
+      MY_VERSION: appsumo3
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code

diff --git a/packages/backend/src/app/flows/flow-version/flow-version.service.ts b/packages/backend/src/app/flows/flow-version/flow-version.service.ts
@@ -362,7 +362,11 @@ async function validateAction({ projectId, settings }: { projectId: ProjectId, s
     if (isNil(action)) {
         return false
     }
-    return validateProps(action.props, settings.input)
+    const props = action.props
+    if (!isNil(piece.auth)) {
+        props.auth = piece.auth
+    }
+    return validateProps(props, settings.input)
 }
 
 async function validateTrigger({ settings, projectId }: { settings: PieceTriggerSettings, projectId: ProjectId }): Promise<boolean> {
@@ -388,7 +392,11 @@ async function validateTrigger({ settings, projectId }: { settings: PieceTrigger
     if (isNil(trigger)) {
         return false
     }
-    return validateProps(trigger.props, settings.input)
+    const props = trigger.props
+    if (!isNil(piece.auth)) {
+        props.auth = piece.auth
+    }
+    return validateProps(props, settings.input)
 }
 
 function validateProps(props: PiecePropertyMap, input: Record<string, unknown>): boolean {

diff --git a/packages/backend/src/app/workers/flow-worker/flow-worker.ts b/packages/backend/src/app/workers/flow-worker/flow-worker.ts
@@ -158,29 +158,13 @@ const loadInputAndLogFileId = async ({
             }
         }
         case ExecutionType.BEGIN:
-        default: {
-            if (!isNil(flowRun.logsFileId)) {
-                const logFile = await fileService.getOneOrThrow({
-                    fileId: flowRun.logsFileId,
-                    projectId: jobData.projectId,
-                })
-
-                const serializedExecutionOutput = logFile.data.toString('utf-8')
-                const executionOutput: ExecutionOutput = JSON.parse(
-                    serializedExecutionOutput,
-                )
-
-                jobData.payload = executionOutput.executionState.steps.trigger.output
-            }
-
             return {
                 input: {
                     triggerPayload: jobData.payload,
                     executionType: ExecutionType.BEGIN,
                     ...baseInput,
                 },
             }
-        }
     }
 }
 
@@ -205,21 +189,22 @@ async function executeFlow(jobData: OneTimeJobData): Promise<void> {
 
     await flowWorkerHooks.getHooks().preExecute({ projectId: jobData.projectId, runId: jobData.runId })
 
-    const sandbox = await getSandbox({
-        projectId: jobData.projectId,
-        flowVersion,
-        runEnvironment: jobData.environment,
-    })
-
-    logger.info(`[FlowWorker#executeFlow] flowRunId=${jobData.runId} sandboxId=${sandbox.boxId} prepareTime=${Date.now() - startTime}ms`)
 
     try {
-        
+
         const { input, logFileId } = await loadInputAndLogFileId({
             flowVersion,
             jobData,
         })
 
+        const sandbox = await getSandbox({
+            projectId: jobData.projectId,
+            flowVersion,
+            runEnvironment: jobData.environment,
+        })
+
+        logger.info(`[FlowWorker#executeFlow] flowRunId=${jobData.runId} sandboxId=${sandbox.boxId} prepareTime=${Date.now() - startTime}ms`)
+
         const { result: executionOutput } = await engineHelper.executeFlow(
             sandbox,
             input,

diff --git a/...es/ui/feature-dashboard/src/lib/pages/flows-table/empty-flows-table/demo-flow-template.ts b/...es/ui/feature-dashboard/src/lib/pages/flows-table/empty-flows-table/demo-flow-template.ts
@@ -34,7 +34,7 @@ export const demoTemplate: FlowVersionTemplate = {
       nextAction: {
         name: 'step_2',
         type: ActionType.PIECE,
-        valid: true,
+        valid: false,
         settings: {
           input: {
             cc: [],
@@ -69,5 +69,5 @@ export const demoTemplate: FlowVersionTemplate = {
       inputUiInfo: {},
     },
   },
-  valid: true,
+  valid: false,
 };