Skip to content

fix: return proper status codes for invalid/non-existent chatflow IDs #5456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: return proper status codes for invalid/non-existent chatflow IDs #5456

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion packages/server/src/services/chatflows/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { ChatMessageFeedback } from '../../database/entities/ChatMessageFeedback
import { UpsertHistory } from '../../database/entities/UpsertHistory'
import { Workspace } from '../../enterprise/database/entities/workspace.entity'
import { getWorkspaceSearchOptions } from '../../enterprise/utils/ControllerServiceUtils'
import { isInvalidUUID } from '../../enterprise/utils/validation.util'
import { InternalFlowiseError } from '../../errors/internalFlowiseError'
import { getErrorMessage } from '../../errors/utils'
import documentStoreService from '../../services/documentstore'
Expand All @@ -21,7 +22,8 @@ import logger from '../../utils/logger'
import { updateStorageUsage } from '../../utils/quotaUsage'

export const enum ChatflowErrorMessage {
INVALID_CHATFLOW_TYPE = 'Invalid Chatflow Type'
INVALID_CHATFLOW_TYPE = 'Invalid Chatflow Type',
INVALID_CHATFLOW_ID = 'Invalid Chatflow ID'
}

export function validateChatflowType(type: ChatflowType | undefined) {
Expand Down Expand Up @@ -242,6 +244,11 @@ const getChatflowByApiKey = async (apiKeyId: string, keyonly?: unknown): Promise

const getChatflowById = async (chatflowId: string, workspaceId?: string): Promise<any> => {
try {
// Validate UUID format
if (isInvalidUUID(chatflowId)) {
throw new InternalFlowiseError(StatusCodes.BAD_REQUEST, ChatflowErrorMessage.INVALID_CHATFLOW_ID)
}

const appServer = getRunningExpressApp()
const dbResponse = await appServer.AppDataSource.getRepository(ChatFlow).findOne({
where: {
Expand All @@ -254,6 +261,11 @@ const getChatflowById = async (chatflowId: string, workspaceId?: string): Promis
}
return dbResponse
} catch (error) {
// Preserve InternalFlowiseError status codes (e.g., BAD_REQUEST, NOT_FOUND)
if (error instanceof InternalFlowiseError) {
throw error
}
// Wrap unexpected errors as 500
throw new InternalFlowiseError(
StatusCodes.INTERNAL_SERVER_ERROR,
`Error: chatflowsService.getChatflowById - ${getErrorMessage(error)}`
Expand Down