fix: dont check for valid key /appkey in create-step

Author: pregnantboy

packages/backend/src/graphql/__tests__/mutations/create-step.itest.ts

@@ -69,8 +69,8 @@ describe('createStep mutation integration tests', async () => {
       input: {
         flow: { id: testFlow.id },
         previousStep: { id: existingSteps[0].id },
-        key: 'newStep',
-        appKey: 'test-app',
+        key: 'sendMessage',
+        appKey: 'telegram-bot',
         parameters: { newParam: 'value' },
       },
     }
@@ -80,8 +80,8 @@ describe('createStep mutation integration tests', async () => {
     // Ensure the new step is returned as expected.
     expect(newStep).toBeDefined()
     expect(newStep.type).toBe('action')
-    expect(newStep.key).toBe('newStep')
-    expect(newStep.appKey).toBe('test-app')
+    expect(newStep.key).toBe('sendMessage')
+    expect(newStep.appKey).toBe('telegram-bot')
     // New step's position should be previousStep.position + 1.
     expect(newStep.position).toBe(existingSteps[0].position + 1)
 

packages/backend/src/graphql/__tests__/mutations/update-step.itest.ts

@@ -202,21 +202,44 @@ describe('updateStep mutation', () => {
   it('should set status to incomplete when key or appKey changes', async () => {
     const input = {
       ...genericInputParams,
-      key: 'newKey',
+      key: 'sendMessage',
+      appKey: 'telegram-bot',
+      //  remove connection from input for testing purposes
+      connection: { id: null } as any,
     }
 
     await updateStep(null, { input }, context)
 
     expect(patchAndFetchByIdSpy).toHaveBeenCalledWith(mockStepId, {
-      key: 'newKey',
-      appKey: 'postman',
-      connectionId: mockConnectionId,
+      key: 'sendMessage',
+      appKey: 'telegram-bot',
+      connectionId: null,
       parameters: { testParam: 'value' },
       status: 'incomplete',
       config: {},
     })
   })
 
+  it('should throw an error if the key or appKey is not found', async () => {
+    const input = {
+      ...genericInputParams,
+      key: 'invalidKey',
+    }
+
+    await expect(updateStep(null, { input }, context)).rejects.toThrow(
+      BadUserInputError,
+    )
+
+    const input2 = {
+      ...genericInputParams,
+      appKey: 'invalidAppKey',
+    }
+
+    await expect(updateStep(null, { input: input2 }, context)).rejects.toThrow(
+      BadUserInputError,
+    )
+  })
+
   it('should set status to incomplete when explicitly requested', async () => {
     const input = {
       ...genericInputParams,

packages/backend/src/graphql/mutations/create-step.ts

@@ -13,18 +13,19 @@ const createStep: MutationResolvers['createStep'] = async (
 ) => {
   const { input } = params
 
-  const triggerOrAction = await App.findTriggerOrActionByKey(
-    input.appKey,
-    input.key,
-  )
+  /**
+   * appKey and key are optional, we allow creating of empty step for if-then branches
+   */
+  if (input.appKey && input.key) {
+    const triggerOrAction = await App.findTriggerOrActionByKey(
+      input.appKey,
+      input.key,
+    )
 
-  if (!triggerOrAction) {
-    throw new BadUserInputError('No such trigger or action')
-  }
-  if ('hiddenFromUser' in triggerOrAction && triggerOrAction.hiddenFromUser) {
-    throw new BadUserInputError('Action can only be created by system')
+    if ('hiddenFromUser' in triggerOrAction && triggerOrAction.hiddenFromUser) {
+      throw new BadUserInputError('Action can only be created by system')
+    }
   }
-
   return await Step.transaction(async (trx) => {
     await trx.raw('SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;')
 

packages/backend/src/models/app.ts

@@ -5,6 +5,7 @@ import { memoize } from 'lodash'
 import apps from '@/apps'
 import appInfoConverter from '@/helpers/app-info-converter'
 import getApp from '@/helpers/get-app'
+import logger from '@/helpers/logger'
 
 class App {
   static list = Object.keys(apps)
@@ -41,11 +42,21 @@ class App {
     appKey: string,
     key: string,
   ): Promise<ITrigger | IAction> {
-    const app = await this.findOneByKey(appKey)
-    return (
-      app.triggers?.find((trigger) => trigger.key === key) ||
-      app.actions?.find((action) => action.key === key)
-    )
+    try {
+      const app = await this.findOneByKey(appKey)
+      return (
+        app.triggers?.find((trigger) => trigger.key === key) ||
+        app.actions?.find((action) => action.key === key)
+      )
+    } catch {
+      logger.error({
+        event: 'findTriggerOrActionByKey',
+        message: 'No such trigger or action',
+        appKey,
+        key,
+      })
+      return null
+    }
   }
 
   static getAllAppsWithFunctions = memoize(async () => {