Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 17 additions & 18 deletions packages/server/src/routes/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import express from 'express'
import agentflowv2GeneratorRouter from './agentflowv2-generator'
import apikeyRouter from './apikey'
import assistantsRouter from './assistants'
import attachmentsRouter from './attachments'
Expand All @@ -9,14 +10,15 @@ import chatflowsUploadsRouter from './chatflows-uploads'
import componentsCredentialsRouter from './components-credentials'
import componentsCredentialsIconRouter from './components-credentials-icon'
import credentialsRouter from './credentials'
import customMcpServersRouter from './custom-mcp-servers'
import datasetRouter from './dataset'
import documentStoreRouter from './documentstore'
import evaluationsRouter from './evaluations'
import evaluatorsRouter from './evaluator'
import executionsRouter from './executions'
import exportImportRouter from './export-import'
import feedbackRouter from './feedback'
import fetchLinksRouter from './fetch-links'
import filesRouter from './files'
import flowConfigRouter from './flow-config'
import getUploadFileRouter from './get-upload-file'
import internalChatmessagesRouter from './internal-chat-messages'
Expand All @@ -25,52 +27,49 @@ import leadsRouter from './leads'
import loadPromptRouter from './load-prompts'
import logsRouter from './log'
import marketplacesRouter from './marketplaces'
import customMcpServersRouter from './custom-mcp-servers'
import mcpEndpointRouter from './mcp-endpoint'
import mcpServerRouter from './mcp-server'
import nodeConfigRouter from './node-configs'
import nodeCustomFunctionRouter from './node-custom-functions'
import nodeIconRouter from './node-icons'
import nodeLoadMethodRouter from './node-load-methods'
import nodesRouter from './nodes'
import nvidiaNimRouter from './nvidia-nim'
import oauth2Router from './oauth2'
import openaiAssistantsRouter from './openai-assistants'
import openaiAssistantsFileRouter from './openai-assistants-files'
import openaiAssistantsVectorStoreRouter from './openai-assistants-vector-store'
import openaiRealtimeRouter from './openai-realtime'
import pingRouter from './ping'
import predictionRouter from './predictions'
import pricingRouter from './pricing'
import promptListsRouter from './prompts-lists'
import publicChatbotRouter from './public-chatbots'
import publicChatflowsRouter from './public-chatflows'
import publicExecutionsRouter from './public-executions'
import settingsRouter from './settings'
import statsRouter from './stats'
import textToSpeechRouter from './text-to-speech'
import toolsRouter from './tools'
import upsertHistoryRouter from './upsert-history'
import validationRouter from './validation'
import variablesRouter from './variables'
import vectorRouter from './vectors'
import verifyRouter from './verify'
import versionRouter from './versions'
import webhookRouter from './webhook'
import webhookListenerRouter from './webhook-listener'
import versionRouter from './versions'
import pricingRouter from './pricing'
import nvidiaNimRouter from './nvidia-nim'
import executionsRouter from './executions'
import validationRouter from './validation'
import agentflowv2GeneratorRouter from './agentflowv2-generator'
import textToSpeechRouter from './text-to-speech'
import mcpServerRouter from './mcp-server'
import mcpEndpointRouter from './mcp-endpoint'

import authRouter from '../enterprise/routes/auth'
import accountRouter from '../enterprise/routes/account.route'
import auditRouter from '../enterprise/routes/audit'
import userRouter from '../enterprise/routes/user.route'
import authRouter from '../enterprise/routes/auth'
import loginMethodRouter from '../enterprise/routes/login-method.route'
import organizationUserRoute from '../enterprise/routes/organization-user.route'
import organizationRouter from '../enterprise/routes/organization.route'
import roleRouter from '../enterprise/routes/role.route'
import organizationUserRoute from '../enterprise/routes/organization-user.route'
import workspaceRouter from '../enterprise/routes/workspace.route'
import userRouter from '../enterprise/routes/user.route'
import workspaceUserRouter from '../enterprise/routes/workspace-user.route'
import accountRouter from '../enterprise/routes/account.route'
import loginMethodRouter from '../enterprise/routes/login-method.route'
import workspaceRouter from '../enterprise/routes/workspace.route'
import { IdentityManager } from '../IdentityManager'

const router = express.Router()
Expand Down Expand Up @@ -146,6 +145,6 @@ router.use('/workspaceuser', workspaceUserRouter)
router.use('/account', accountRouter)
router.use('/loginmethod', loginMethodRouter)
router.use('/logs', IdentityManager.checkFeatureByPlan('feat:logs'), logsRouter)
router.use('/files', IdentityManager.checkFeatureByPlan('feat:files'), filesRouter)
// router.use('/files', IdentityManager.checkFeatureByPlan('feat:files'), filesRouter)
Comment thread
yau-wd marked this conversation as resolved.

export default router
2 changes: 1 addition & 1 deletion packages/server/src/utils/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const WHITELIST_URLS = [
GithubSSO.CALLBACK_URI
]

export const API_KEY_BLACKLIST_URLS = ['/api/v1/nvidia-nim', '/api/v1/account/delete']
export const API_KEY_BLACKLIST_URLS = ['/api/v1/nvidia-nim', '/api/v1/account/delete', '/api/v1/files']

export const enum GeneralErrorMessage {
FORBIDDEN = 'Forbidden',
Expand Down
18 changes: 9 additions & 9 deletions packages/ui/src/routes/MainRoutes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { lazy } from 'react'
import MainLayout from '@/layout/MainLayout'
import Loadable from '@/ui-component/loading/Loadable'

import { RequireAuth } from '@/routes/RequireAuth'
import { DefaultRedirect } from '@/routes/DefaultRedirect'
import { RequireAuth } from '@/routes/RequireAuth'

// chatflows routing
const Chatflows = Loadable(lazy(() => import('@/views/chatflows')))
Expand Down Expand Up @@ -280,14 +280,14 @@ const MainRoutes = {
</RequireAuth>
)
},
{
path: '/files',
element: (
<RequireAuth display={'feat:files'}>
<Files />
</RequireAuth>
)
},
// {
// path: '/files',
// element: (
// <RequireAuth display={'feat:files'}>
// <Files />
// </RequireAuth>
// )
// },
{
Comment thread
yau-wd marked this conversation as resolved.
path: '/account',
element: <Account />
Expand Down