More typing fixes.

packages/server/src/api/controllers/webhook.ts

@@ -10,6 +10,7 @@ import {
 } from "@budibase/types"
 import sdk from "../../sdk"
 import * as pro from "@budibase/pro"
+import { isAutomationResults } from "../../automations/triggers"
 
 const toJsonSchema = require("to-json-schema")
 const validate = require("jsonschema").validate
@@ -94,12 +95,16 @@ export async function trigger(ctx: BBContext) {
             { getResponses: true }
           )
 
+          if (triggers.isAutomationResults(response)) {
             let collectedValue = response.steps.find(
               (step: any) => step.stepId === AutomationActionStepId.COLLECT
             )
 
             ctx.status = 200
-          ctx.body = collectedValue.outputs
+            ctx.body = collectedValue?.outputs
+          } else {
+            ctx.throw(400, "Automation did not have a collect block.")
+          }
         } else {
           await triggers.externalTrigger(target, {
             body: ctx.request.body,

packages/server/src/automations/steps/triggerAutomationRun.ts

@@ -3,7 +3,6 @@ import {
   AutomationStepDefinition,
   AutomationStepType,
   AutomationIOType,
-  AutomationResults,
   Automation,
   AutomationCustomIOType,
   TriggerAutomationStepInputs,
@@ -78,7 +77,7 @@ export async function run({
       const db = context.getAppDB()
       let automation = await db.get<Automation>(inputs.automation.automationId)
 
-      const response: AutomationResults = await triggers.externalTrigger(
+      const response = await triggers.externalTrigger(
         automation,
         {
           fields: { ...fieldParams },
@@ -88,10 +87,14 @@ export async function run({
         { getResponses: true }
       )
 
+      if (triggers.isAutomationResults(response)) {
         return {
           success: true,
           value: response.steps,
         }
+      } else {
+        throw new Error("Automation did not have a collect block")
+      }
     }
   } else {
     return {

packages/server/src/automations/triggers.ts

@@ -148,6 +148,14 @@ function rowPassesFilters(row: Row, filters: SearchFilters) {
   return filteredRows.length > 0
 }
 
+export function isAutomationResults(
+  response: AutomationResults | DidNotTriggerResponse | AutomationJob
+): response is AutomationResults {
+  return (
+    response !== null && "steps" in response && Array.isArray(response.steps)
+  )
+}
+
 export async function externalTrigger(
   automation: Automation,
   params: {

packages/server/src/tests/utilities/TestConfiguration.ts

@@ -621,7 +621,7 @@ export default class TestConfiguration {
   }
 
   async unpublish() {
-    const response = await this._req(appController.unpublish, {
+    const response = await this._req(appController.unpublish, undefined, {
       appId: this.appId,
     })
     this.prodAppId = undefined