From 98fbbf70793b79c51286c597a9097bae145146d7 Mon Sep 17 00:00:00 2001 From: Dmitrii Date: Thu, 27 Aug 2026 06:23:44 +0000 Subject: [PATCH] refactor(API): De-Express variables create/update/delete paths (#37168) --- .../cli/src/errors/variable-validation.error.ts | 4 ++-- .../v1/handlers/variables/variables.handler.ts | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/cli/src/errors/variable-validation.error.ts b/packages/cli/src/errors/variable-validation.error.ts index 4e5a97407e3..166659bafab 100644 --- a/packages/cli/src/errors/variable-validation.error.ts +++ b/packages/cli/src/errors/variable-validation.error.ts @@ -1,3 +1,3 @@ -import { UnexpectedError } from 'n8n-workflow'; +import { UserError } from 'n8n-workflow'; -export class VariableValidationError extends UnexpectedError {} +export class VariableValidationError extends UserError {} diff --git a/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts b/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts index ad3676f6c3b..34e3f0d84db 100644 --- a/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts +++ b/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts @@ -2,11 +2,6 @@ import { CreateVariableRequestDto, UpdateVariableRequestDto } from '@n8n/api-typ import type { AuthenticatedRequest } from '@n8n/db'; import { Container } from '@n8n/di'; -import { VariablesController } from '@/environments.ee/variables/variables.controller.ee'; -import { VariablesService } from '@/environments.ee/variables/variables.service.ee'; -import { BadRequestError } from '@/errors/response-errors/bad-request.error'; -import type { VariablesRequest } from '@/requests'; - import type { PublicAPIEndpoint } from '../../shared/handler.types'; import { apiKeyHasScopeWithGlobalScopeFallback, @@ -15,6 +10,10 @@ import { } from '../../shared/middlewares/global.middleware'; import { paginateArray } from '../../shared/services/pagination.service'; +import { VariablesService } from '@/environments.ee/variables/variables.service.ee'; +import { BadRequestError } from '@/errors/response-errors/bad-request.error'; +import type { VariablesRequest } from '@/requests'; + type VariablesHandlers = { createVariable: PublicAPIEndpoint; updateVariable: PublicAPIEndpoint>; @@ -31,7 +30,7 @@ const variablesHandlers: VariablesHandlers = { if (payload.error) { throw new BadRequestError(payload.error.errors[0]?.message ?? 'Invalid request body'); } - await Container.get(VariablesController).createVariable(req, res, payload.data); + await Container.get(VariablesService).create(req.user, payload.data); return res.status(201).send(); }, @@ -44,7 +43,7 @@ const variablesHandlers: VariablesHandlers = { if (payload.error) { throw new BadRequestError(payload.error.errors[0]?.message ?? 'Invalid request body'); } - await Container.get(VariablesController).updateVariable(req, res, payload.data); + await Container.get(VariablesService).update(req.user, req.params.id, payload.data); return res.status(204).send(); }, @@ -53,7 +52,7 @@ const variablesHandlers: VariablesHandlers = { isLicensed('feat:variables'), apiKeyHasScopeWithGlobalScopeFallback({ scope: 'variable:delete' }), async (req, res) => { - await Container.get(VariablesController).deleteVariable(req); + await Container.get(VariablesService).deleteForUser(req.user, req.params.id); return res.status(204).send(); },