n8n 2.39.4 → 2.40.0

package/dist/public-api/v1/controllers/roles.public.controller.js

@@ -56,9 +56,9 @@ let RolesPublicController = class RolesPublicController {
             project: groupOf('project'),
         };
     }
-    async getRole(_req, _res, slug, query) {
+    async getRole(_req, _res, roleSlug, query) {
         const { withUsageCount } = query;
-        const role = await this.roleService.getRole(slug, withUsageCount);
+        const role = await this.roleService.getRole(roleSlug, withUsageCount);
         if (!isPublicRole(role)) {
             throw new not_found_error_1.NotFoundError('Role not found');
         }
@@ -78,8 +78,8 @@ let RolesPublicController = class RolesPublicController {
         });
         return toRolePublicDto({ ...role, roleType: createRole.roleType });
     }
-    async updateRole(req, _res, slug, updateRole) {
-        const role = await this.roleService.getRole(slug);
+    async updateRole(req, _res, roleSlug, updateRole) {
+        const role = await this.roleService.getRole(roleSlug);
         if (!isPublicRole(role)) {
             throw new not_found_error_1.NotFoundError('Role not found');
         }
@@ -89,14 +89,14 @@ let RolesPublicController = class RolesPublicController {
             user: req.user,
         });
         const result = await this.roleService.updateCustomRole({
-            slug,
+            slug: roleSlug,
             newRole: updateRole,
             userId: req.user.id,
         });
         return toRolePublicDto({ ...result, roleType: role.roleType });
     }
-    async deleteRole(req, _res, slug, query) {
-        const role = await this.roleService.getRole(slug);
+    async deleteRole(req, _res, roleSlug, query) {
+        const role = await this.roleService.getRole(roleSlug);
         if (!isPublicRole(role)) {
             throw new not_found_error_1.NotFoundError('Role not found');
         }
@@ -110,7 +110,7 @@ let RolesPublicController = class RolesPublicController {
             ? query.reassignRoleSlug
             : undefined;
         const result = await this.roleService.removeCustomRole({
-            slug,
+            slug: roleSlug,
             reassignRoleSlug,
             userId: req.user.id,
         });
@@ -131,14 +131,14 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], RolesPublicController.prototype, "getAllRoles", null);
 __decorate([
-    (0, decorators_1.Get)('/:slug'),
+    (0, decorators_1.Get)('/:roleSlug'),
     (0, decorators_1.ApiKeyScope)('role:read'),
     (0, decorators_1.ApiSummary)('Retrieve a role'),
     (0, decorators_1.ApiDescription)('Returns a single role with its scopes. Set `withUsageCount` to include how many users and projects use the role.'),
     (0, decorators_1.ApiTags)(['Role']),
     (0, decorators_1.ApiResponse)(200, api_types_1.RoleGetPublicDto),
     (0, decorators_1.ApiErrorResponse)(404),
-    __param(2, (0, decorators_1.Param)('slug')),
+    __param(2, (0, decorators_1.Param)('roleSlug', api_types_1.roleSlugParamSchema)),
     __param(3, decorators_1.Query),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, String, api_types_1.RoleListQueryPublicDto]),
@@ -158,7 +158,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], RolesPublicController.prototype, "createRole", null);
 __decorate([
-    (0, decorators_1.Put)('/:slug'),
+    (0, decorators_1.Put)('/:roleSlug'),
     (0, decorators_1.ApiKeyScope)({ anyOf: ['role:manage', 'role:manageProject'] }),
     (0, decorators_1.Licensed)(constants_1.LICENSE_FEATURES.CUSTOM_ROLES),
     (0, decorators_1.ApiSummary)('Update a custom role'),
@@ -166,14 +166,14 @@ __decorate([
     (0, decorators_1.ApiTags)(['Role']),
     (0, decorators_1.ApiResponse)(200, api_types_1.RolePublicDto),
     (0, decorators_1.ApiErrorResponse)(404),
-    __param(2, (0, decorators_1.Param)('slug')),
+    __param(2, (0, decorators_1.Param)('roleSlug', api_types_1.roleSlugParamSchema)),
     __param(3, decorators_1.Body),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, String, api_types_1.UpdateRolePublicDto]),
     __metadata("design:returntype", Promise)
 ], RolesPublicController.prototype, "updateRole", null);
 __decorate([
-    (0, decorators_1.Delete)('/:slug'),
+    (0, decorators_1.Delete)('/:roleSlug'),
     (0, decorators_1.ApiKeyScope)({ anyOf: ['role:manage', 'role:manageProject'] }),
     (0, decorators_1.Licensed)(constants_1.LICENSE_FEATURES.CUSTOM_ROLES),
     (0, decorators_1.ApiSummary)('Delete a custom role'),
@@ -181,7 +181,7 @@ __decorate([
     (0, decorators_1.ApiTags)(['Role']),
     (0, decorators_1.ApiResponse)(200, api_types_1.RolePublicDto),
     (0, decorators_1.ApiErrorResponse)(404),
-    __param(2, (0, decorators_1.Param)('slug')),
+    __param(2, (0, decorators_1.Param)('roleSlug', api_types_1.roleSlugParamSchema)),
     __param(3, decorators_1.Query),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, String, api_types_1.RoleDeleteQueryDto]),

package/dist/public-api/v1/controllers/roles.public.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"roles.public.controller.js","sourceRoot":"","sources":["../../../../src/public-api/v1/controllers/roles.public.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"roles.public.controller.js","sourceRoot":"","sources":["../../../../src/public-api/v1/controllers/roles.public.controller.ts"],"names":[],"mappings":"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"}

package/dist/public-api/v1/controllers/source-control.public.controller.d.ts

@@ -1,6 +1,7 @@
-import { SourceControlPushRequestPublicDto, SourceControlPushResponsePublicDto, SourceControlStatusPublicDto, SourceControlStatusQueryPublicDto } from '@n8n/api-types';
+import { PullWorkFolderRequestDto, SourceControlPushRequestPublicDto, SourceControlPushResponsePublicDto, SourceControlStatusPublicDto, SourceControlStatusQueryPublicDto } from '@n8n/api-types';
 import type { AuthenticatedRequest } from '@n8n/db';
 import type { Response } from 'express';
+import { EventService } from '../../../events/event.service';
 import { SourceControlPreferencesService } from '../../../modules/source-control.ee/source-control-preferences.service.ee';
 import { SourceControlScopedService } from '../../../modules/source-control.ee/source-control-scoped.service';
 import { SourceControlService } from '../../../modules/source-control.ee/source-control.service.ee';
@@ -8,7 +9,9 @@ export declare class SourceControlPublicController {
     private readonly sourceControlService;
     private readonly sourceControlPreferencesService;
     private readonly sourceControlScopedService;
-    constructor(sourceControlService: SourceControlService, sourceControlPreferencesService: SourceControlPreferencesService, sourceControlScopedService: SourceControlScopedService);
+    private readonly eventService;
+    constructor(sourceControlService: SourceControlService, sourceControlPreferencesService: SourceControlPreferencesService, sourceControlScopedService: SourceControlScopedService, eventService: EventService);
     getSourceControlStatus(req: AuthenticatedRequest, _res: Response, query: SourceControlStatusQueryPublicDto): Promise<SourceControlStatusPublicDto>;
     pushSourceControl(req: AuthenticatedRequest, _res: Response, body: SourceControlPushRequestPublicDto): Promise<SourceControlPushResponsePublicDto>;
+    pullSourceControl(req: AuthenticatedRequest, res: Response, body: PullWorkFolderRequestDto): Promise<void>;
 }

package/dist/public-api/v1/controllers/source-control.public.controller.js

@@ -18,15 +18,18 @@ const constants_1 = require("@n8n/constants");
 const decorators_1 = require("@n8n/decorators");
 const bad_request_error_1 = require("../../../errors/response-errors/bad-request.error");
 const conflict_error_1 = require("../../../errors/response-errors/conflict.error");
+const event_service_1 = require("../../../events/event.service");
+const source_control_helper_ee_1 = require("../../../modules/source-control.ee/source-control-helper.ee");
 const source_control_preferences_service_ee_1 = require("../../../modules/source-control.ee/source-control-preferences.service.ee");
 const source_control_scoped_service_1 = require("../../../modules/source-control.ee/source-control-scoped.service");
 const source_control_service_ee_1 = require("../../../modules/source-control.ee/source-control.service.ee");
 const tags = ['SourceControl'];
 let SourceControlPublicController = class SourceControlPublicController {
-    constructor(sourceControlService, sourceControlPreferencesService, sourceControlScopedService) {
+    constructor(sourceControlService, sourceControlPreferencesService, sourceControlScopedService, eventService) {
         this.sourceControlService = sourceControlService;
         this.sourceControlPreferencesService = sourceControlPreferencesService;
         this.sourceControlScopedService = sourceControlScopedService;
+        this.eventService = eventService;
     }
     async getSourceControlStatus(req, _res, query) {
         await this.sourceControlScopedService.ensureIsAllowedToGetStatus(req);
@@ -58,6 +61,29 @@ let SourceControlPublicController = class SourceControlPublicController {
         }
         return { data: result.statusResult };
     }
+    async pullSourceControl(req, res, body) {
+        if (!this.sourceControlPreferencesService.isSourceControlConnected()) {
+            res
+                .status(400)
+                .json({ status: 'Error', message: 'Source Control is not connected to a repository' });
+            return;
+        }
+        try {
+            const result = await this.sourceControlService.pullWorkfolder(req.user, body);
+            if (result.statusCode === 200) {
+                this.eventService.emit('source-control-user-pulled-api', {
+                    ...(0, source_control_helper_ee_1.getTrackingInformationFromPullResult)(req.user.id, result.statusResult),
+                    forced: body.force ?? false,
+                });
+                res.status(200).json(result.statusResult);
+                return;
+            }
+            res.status(409).json(result.statusResult);
+        }
+        catch (error) {
+            res.status(400).send(error.message);
+        }
+    }
 };
 exports.SourceControlPublicController = SourceControlPublicController;
 __decorate([
@@ -65,7 +91,7 @@ __decorate([
     (0, decorators_1.Licensed)(constants_1.LICENSE_FEATURES.SOURCE_CONTROL),
     (0, decorators_1.ApiKeyScope)('sourceControl:read'),
     (0, decorators_1.ApiSummary)('Preview pending source control changes'),
-    (0, decorators_1.ApiDescription)('Previews the pending changes between the instance and the connected Git repository in either the `push` or `pull` direction.'),
+    (0, decorators_1.ApiDescription)('Previews the pending changes between the instance and the connected Git branch in either the `push` or `pull` direction.'),
     (0, decorators_1.ApiTags)(tags),
     (0, decorators_1.ApiResponse)(200, api_types_1.SourceControlStatusPublicDto),
     __param(2, decorators_1.Query),
@@ -78,7 +104,7 @@ __decorate([
     (0, decorators_1.Licensed)(constants_1.LICENSE_FEATURES.SOURCE_CONTROL),
     (0, decorators_1.ApiKeyScope)('sourceControl:push'),
     (0, decorators_1.ApiSummary)('Push local source control changes'),
-    (0, decorators_1.ApiDescription)('Commits and pushes the selected files to the connected Git repository. Each entry in ' +
+    (0, decorators_1.ApiDescription)('Commits and pushes the selected files to the connected Git branch. Each entry in ' +
         '`fileNames` is resolved against a fresh preview of the pending changes.'),
     (0, decorators_1.ApiTags)(tags),
     (0, decorators_1.ApiResponse)(200, api_types_1.SourceControlPushResponsePublicDto),
@@ -93,8 +119,28 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object, api_types_1.SourceControlPushRequestPublicDto]),
     __metadata("design:returntype", Promise)
 ], SourceControlPublicController.prototype, "pushSourceControl", null);
+__decorate([
+    (0, decorators_1.Post)('/pull'),
+    (0, decorators_1.Licensed)(constants_1.LICENSE_FEATURES.SOURCE_CONTROL),
+    (0, decorators_1.ApiKeyScope)('sourceControl:pull'),
+    (0, decorators_1.ApiSummary)('Pull changes from the remote repository'),
+    (0, decorators_1.ApiDescription)('Fetches changes from the connected Git branch into the instance.'),
+    (0, decorators_1.ApiTags)(tags),
+    (0, decorators_1.ApiResponse)(200, api_types_1.SourceControlPullResponsePublicDto),
+    (0, decorators_1.ApiErrorResponse)(400),
+    (0, decorators_1.ApiErrorResponse)(409, {
+        dto: api_types_1.SourceControlPullResponsePublicDto,
+        description: 'Conflict due to uncommitted local changes or merge conflicts. The response body lists ' +
+            'every file in the pull diff; files causing the conflict have `conflict: true` or ' +
+            '`status: modified`. Retry with `force: true` to discard local changes.',
+    }),
+    __param(2, (0, decorators_1.Body)({ required: true })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, api_types_1.PullWorkFolderRequestDto]),
+    __metadata("design:returntype", Promise)
+], SourceControlPublicController.prototype, "pullSourceControl", null);
 exports.SourceControlPublicController = SourceControlPublicController = __decorate([
     (0, decorators_1.PublicApiController)('/source-control'),
-    __metadata("design:paramtypes", [source_control_service_ee_1.SourceControlService, source_control_preferences_service_ee_1.SourceControlPreferencesService, source_control_scoped_service_1.SourceControlScopedService])
+    __metadata("design:paramtypes", [source_control_service_ee_1.SourceControlService, source_control_preferences_service_ee_1.SourceControlPreferencesService, source_control_scoped_service_1.SourceControlScopedService, event_service_1.EventService])
 ], SourceControlPublicController);
 //# sourceMappingURL=source-control.public.controller.js.map

package/dist/public-api/v1/controllers/source-control.public.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"source-control.public.controller.js","sourceRoot":"","sources":["../../../../src/public-api/v1/controllers/source-control.public.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"source-control.public.controller.js","sourceRoot":"","sources":["../../../../src/public-api/v1/controllers/source-control.public.controller.ts"],"names":[],"mappings":"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"}

package/dist/public-api/v1/controllers/tags.public.controller.d.ts

@@ -1,4 +1,4 @@
-import { ListTagsQueryDto, TagListPublicDto } from '@n8n/api-types';
+import { CreateTagPublicDto, ListTagsQueryDto, TagListPublicDto, TagPublicDto } from '@n8n/api-types';
 import type { AuthenticatedRequest } from '@n8n/db';
 import type { Response } from 'express';
 import { TagService } from '../../../services/tag.service';
@@ -6,4 +6,6 @@ export declare class TagsPublicController {
     private readonly tagService;
     constructor(tagService: TagService);
     getTags(_req: AuthenticatedRequest, _res: Response, query: ListTagsQueryDto): Promise<TagListPublicDto>;
+    createTag(_req: AuthenticatedRequest, _res: Response, body: CreateTagPublicDto): Promise<TagPublicDto>;
+    getTag(_req: AuthenticatedRequest, _res: Response, tagId: string): Promise<TagPublicDto>;
 }

package/dist/public-api/v1/controllers/tags.public.controller.js

@@ -15,8 +15,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TagsPublicController = void 0;
 const api_types_1 = require("@n8n/api-types");
 const decorators_1 = require("@n8n/decorators");
+const conflict_error_1 = require("../../../errors/response-errors/conflict.error");
+const not_found_error_1 = require("../../../errors/response-errors/not-found.error");
 const pagination_service_1 = require("../../../public-api/v1/shared/services/pagination.service");
 const tag_service_1 = require("../../../services/tag.service");
+const tags = ['Tags'];
+const toTagPublicDto = (tag) => ({
+    id: tag.id,
+    name: tag.name,
+    createdAt: tag.createdAt.toISOString(),
+    updatedAt: tag.updatedAt.toISOString(),
+});
 let TagsPublicController = class TagsPublicController {
     constructor(tagService) {
         this.tagService = tagService;
@@ -25,11 +34,7 @@ let TagsPublicController = class TagsPublicController {
         const { offset, limit } = (0, pagination_service_1.resolveOffsetPagination)(query);
         const { data, count } = await this.tagService.getPaginated({ offset, limit });
         return {
-            data: data.map((tag) => ({
-                ...tag,
-                createdAt: tag.createdAt.toISOString(),
-                updatedAt: tag.updatedAt.toISOString(),
-            })),
+            data: data.map(toTagPublicDto),
             nextCursor: (0, pagination_service_1.encodeNextCursor)({
                 offset,
                 limit,
@@ -37,6 +42,25 @@ let TagsPublicController = class TagsPublicController {
             }),
         };
     }
+    async createTag(_req, _res, body) {
+        const newTag = this.tagService.toEntity({ name: body.name });
+        try {
+            return toTagPublicDto(await this.tagService.save(newTag, 'create'));
+        }
+        catch {
+            throw new conflict_error_1.ConflictError('Tag already exists');
+        }
+    }
+    async getTag(_req, _res, tagId) {
+        let tag;
+        try {
+            tag = await this.tagService.getById(tagId);
+        }
+        catch {
+            throw new not_found_error_1.NotFoundError('Not Found');
+        }
+        return toTagPublicDto(tag);
+    }
 };
 exports.TagsPublicController = TagsPublicController;
 __decorate([
@@ -44,13 +68,39 @@ __decorate([
     (0, decorators_1.ApiKeyScope)('tag:list'),
     (0, decorators_1.ApiSummary)('Retrieve all tags'),
     (0, decorators_1.ApiDescription)('Retrieve all tags from your instance.'),
-    (0, decorators_1.ApiTags)(['Tags']),
+    (0, decorators_1.ApiTags)(tags),
     (0, decorators_1.ApiResponse)(200, api_types_1.TagListPublicDto),
     __param(2, decorators_1.Query),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, api_types_1.ListTagsQueryDto]),
     __metadata("design:returntype", Promise)
 ], TagsPublicController.prototype, "getTags", null);
+__decorate([
+    (0, decorators_1.Post)('/'),
+    (0, decorators_1.ApiKeyScope)('tag:create'),
+    (0, decorators_1.ApiSummary)('Create a tag'),
+    (0, decorators_1.ApiDescription)('Create a tag in your instance.'),
+    (0, decorators_1.ApiTags)(tags),
+    (0, decorators_1.ApiResponse)(201, api_types_1.TagPublicDto),
+    (0, decorators_1.ApiErrorResponse)(409),
+    __param(2, decorators_1.Body),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, api_types_1.CreateTagPublicDto]),
+    __metadata("design:returntype", Promise)
+], TagsPublicController.prototype, "createTag", null);
+__decorate([
+    (0, decorators_1.Get)('/:tagId'),
+    (0, decorators_1.ApiKeyScope)('tag:read'),
+    (0, decorators_1.ApiSummary)('Retrieves a tag'),
+    (0, decorators_1.ApiDescription)('Retrieves a tag.'),
+    (0, decorators_1.ApiTags)(tags),
+    (0, decorators_1.ApiResponse)(200, api_types_1.TagPublicDto),
+    (0, decorators_1.ApiErrorResponse)(404),
+    __param(2, (0, decorators_1.Param)('tagId', api_types_1.tagIdParamSchema)),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, String]),
+    __metadata("design:returntype", Promise)
+], TagsPublicController.prototype, "getTag", null);
 exports.TagsPublicController = TagsPublicController = __decorate([
     (0, decorators_1.PublicApiController)('/tags'),
     __metadata("design:paramtypes", [tag_service_1.TagService])

package/dist/public-api/v1/controllers/tags.public.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"tags.public.controller.js","sourceRoot":"","sources":["../../../../src/public-api/v1/controllers/tags.public.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAoE;AAEpE,gDASyB;AAGzB,2FAG4D;AAC5D,wDAAoD;AAG7C,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,YAA6B,UAAsB;0BAAtB,UAAU;IAAe,CAAC;IAQjD,AAAN,KAAK,CAAC,OAAO,CACZ,IAA0B,EAC1B,IAAc,EACP,KAAuB;QAE9B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,4CAAuB,EAAC,KAAK,CAAC,CAAC;QAEzD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAE9E,OAAO;YACN,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACxB,GAAG,GAAG;gBACN,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE;gBACtC,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE;aACtC,CAAC,CAAC;YACH,UAAU,EAAE,IAAA,qCAAgB,EAAC;gBAC5B,MAAM;gBACN,KAAK;gBACL,oBAAoB,EAAE,KAAK;aAC3B,CAAC;SACF,CAAC;IACH,CAAC;CACD,CAAA;;AAtBM;IANL,IAAA,gBAAG,EAAC,GAAG,CAAC;IACR,IAAA,wBAAW,EAAC,UAAU,CAAC;IACvB,IAAA,uBAAU,EAAC,mBAAmB,CAAC;IAC/B,IAAA,2BAAc,EAAC,uCAAuC,CAAC;IACvD,IAAA,oBAAO,EAAC,CAAC,MAAM,CAAC,CAAC;IACjB,IAAA,wBAAW,EAAC,GAAG,EAAE,4BAAgB,CAAC;IAIjC,WAAA,kBAAK,CAAA;;qDAAQ,4BAAgB;;mDAkB9B;+BA9BW,oBAAoB;IADhC,IAAA,gCAAmB,EAAC,OAAO,CAAC;qCAEa,wBAAU;GADvC,oBAAoB,CA+BhC"}
+{"version":3,"file":"tags.public.controller.js","sourceRoot":"","sources":["../../../../src/public-api/v1/controllers/tags.public.controller.ts"],"names":[],"mappings":"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"}

package/dist/public-api/v1/controllers/variables.public.controller.d.ts

@@ -0,0 +1,12 @@
+import { CreateVariablePublicDto, ListVariablesQueryDto, UpdateVariablePublicDto, VariableListPublicDto } from '@n8n/api-types';
+import type { AuthenticatedRequest } from '@n8n/db';
+import type { Response } from 'express';
+import { VariablesService } from '../../../environments.ee/variables/variables.service.ee';
+export declare class VariablesPublicController {
+    private readonly variablesService;
+    constructor(variablesService: VariablesService);
+    getVariables(req: AuthenticatedRequest, _res: Response, query: ListVariablesQueryDto): Promise<VariableListPublicDto>;
+    createVariable(req: AuthenticatedRequest, _res: Response, payload: CreateVariablePublicDto): Promise<void>;
+    updateVariable(req: AuthenticatedRequest, _res: Response, id: string, payload: UpdateVariablePublicDto): Promise<void>;
+    deleteVariable(req: AuthenticatedRequest, _res: Response, id: string): Promise<void>;
+}

package/dist/public-api/v1/controllers/variables.public.controller.js

@@ -0,0 +1,127 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VariablesPublicController = void 0;
+const api_types_1 = require("@n8n/api-types");
+const constants_1 = require("@n8n/constants");
+const decorators_1 = require("@n8n/decorators");
+const project_mapper_1 = require("../../../public-api/v1/shared/project.mapper");
+const pagination_service_1 = require("../../../public-api/v1/shared/services/pagination.service");
+const variables_service_ee_1 = require("../../../environments.ee/variables/variables.service.ee");
+const tags = ['Variables'];
+function toVariablePublic(variable) {
+    return {
+        id: variable.id,
+        key: variable.key,
+        value: variable.value ?? '',
+        type: variable.type,
+        project: variable.project ? (0, project_mapper_1.toPublicProject)(variable.project) : null,
+    };
+}
+let VariablesPublicController = class VariablesPublicController {
+    constructor(variablesService) {
+        this.variablesService = variablesService;
+    }
+    async getVariables(req, _res, query) {
+        const { offset, limit } = (0, pagination_service_1.resolveOffsetPagination)(query);
+        const { projectId, state } = query;
+        const variables = await this.variablesService.getAllForUser(req.user, {
+            state,
+            projectId: projectId === api_types_1.GLOBAL_PROJECT_ID_FILTER ? null : projectId,
+        });
+        const { data, nextCursor } = (0, pagination_service_1.paginateArray)(variables, { offset, limit });
+        return { data: data.map(toVariablePublic), nextCursor };
+    }
+    async createVariable(req, _res, payload) {
+        const { key, value, projectId } = payload;
+        await this.variablesService.create(req.user, {
+            key,
+            value,
+            type: api_types_1.VARIABLE_TYPE_DEFAULT,
+            projectId,
+        });
+    }
+    async updateVariable(req, _res, id, payload) {
+        const { key, value, projectId } = payload;
+        await this.variablesService.update(req.user, id, {
+            key,
+            value,
+            projectId,
+        });
+    }
+    async deleteVariable(req, _res, id) {
+        await this.variablesService.deleteForUser(req.user, id);
+    }
+};
+exports.VariablesPublicController = VariablesPublicController;
+__decorate([
+    (0, decorators_1.Get)('/'),
+    (0, decorators_1.Licensed)(constants_1.LICENSE_FEATURES.VARIABLES),
+    (0, decorators_1.ApiKeyScope)('variable:list'),
+    (0, decorators_1.ApiSummary)('Retrieve variables'),
+    (0, decorators_1.ApiDescription)('Retrieve variables from your instance.'),
+    (0, decorators_1.ApiTags)(tags),
+    (0, decorators_1.ApiResponse)(200, api_types_1.VariableListPublicDto),
+    __param(2, decorators_1.Query),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, api_types_1.ListVariablesQueryDto]),
+    __metadata("design:returntype", Promise)
+], VariablesPublicController.prototype, "getVariables", null);
+__decorate([
+    (0, decorators_1.Post)('/'),
+    (0, decorators_1.Licensed)(constants_1.LICENSE_FEATURES.VARIABLES),
+    (0, decorators_1.ApiKeyScope)('variable:create'),
+    (0, decorators_1.ApiSummary)('Create a variable'),
+    (0, decorators_1.ApiDescription)('Create a variable in your instance.'),
+    (0, decorators_1.ApiTags)(tags),
+    (0, decorators_1.ApiResponse)(201),
+    __param(2, decorators_1.Body),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, api_types_1.CreateVariablePublicDto]),
+    __metadata("design:returntype", Promise)
+], VariablesPublicController.prototype, "createVariable", null);
+__decorate([
+    (0, decorators_1.Put)('/:id'),
+    (0, decorators_1.Licensed)(constants_1.LICENSE_FEATURES.VARIABLES),
+    (0, decorators_1.ApiKeyScope)('variable:update'),
+    (0, decorators_1.ApiSummary)('Update a variable'),
+    (0, decorators_1.ApiDescription)('Update a variable from your instance.'),
+    (0, decorators_1.ApiTags)(tags),
+    (0, decorators_1.ApiResponse)(204),
+    (0, decorators_1.ApiErrorResponse)(404),
+    __param(2, (0, decorators_1.Param)('id', api_types_1.variableIdParamSchema)),
+    __param(3, decorators_1.Body),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, String, api_types_1.UpdateVariablePublicDto]),
+    __metadata("design:returntype", Promise)
+], VariablesPublicController.prototype, "updateVariable", null);
+__decorate([
+    (0, decorators_1.Delete)('/:id'),
+    (0, decorators_1.Licensed)(constants_1.LICENSE_FEATURES.VARIABLES),
+    (0, decorators_1.ApiKeyScope)('variable:delete'),
+    (0, decorators_1.ApiSummary)('Delete a variable'),
+    (0, decorators_1.ApiDescription)('Delete a variable from your instance.'),
+    (0, decorators_1.ApiTags)(tags),
+    (0, decorators_1.ApiResponse)(204),
+    (0, decorators_1.ApiErrorResponse)(404),
+    __param(2, (0, decorators_1.Param)('id', api_types_1.variableIdParamSchema)),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, String]),
+    __metadata("design:returntype", Promise)
+], VariablesPublicController.prototype, "deleteVariable", null);
+exports.VariablesPublicController = VariablesPublicController = __decorate([
+    (0, decorators_1.PublicApiController)('/variables'),
+    __metadata("design:paramtypes", [variables_service_ee_1.VariablesService])
+], VariablesPublicController);
+//# sourceMappingURL=variables.public.controller.js.map

package/dist/public-api/v1/controllers/variables.public.controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"variables.public.controller.js","sourceRoot":"","sources":["../../../../src/public-api/v1/controllers/variables.public.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CASwB;AACxB,8CAAkD;AAElD,gDAgByB;AAGzB,0EAAwE;AACxE,2FAG4D;AAC5D,2FAAoF;AAEpF,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;AAE3B,SAAS,gBAAgB,CAAC,QAAmB;IAC5C,OAAO;QACN,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,GAAG,EAAE,QAAQ,CAAC,GAAG;QAGjB,KAAK,EAAE,QAAQ,CAAC,KAAK,IAAI,EAAE;QAC3B,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,gCAAe,EAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;KACpE,CAAC;AACH,CAAC;AAGM,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IACrC,YAA6B,gBAAkC;gCAAlC,gBAAgB;IAAqB,CAAC;IAS7D,AAAN,KAAK,CAAC,YAAY,CACjB,GAAyB,EACzB,IAAc,EACP,KAA4B;QAEnC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,4CAAuB,EAAC,KAAK,CAAC,CAAC;QACzD,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;QAEnC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE;YACrE,KAAK;YACL,SAAS,EAAE,SAAS,KAAK,oCAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;SACpE,CAAC,CAAC;QAEH,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,kCAAa,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAEzE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,UAAU,EAAE,CAAC;IACzD,CAAC;IASK,AAAN,KAAK,CAAC,cAAc,CACnB,GAAyB,EACzB,IAAc,EACR,OAAgC;QAEtC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAE1C,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;YAC5C,GAAG;YACH,KAAK;YAEL,IAAI,EAAE,iCAAqB;YAC3B,SAAS;SACT,CAAC,CAAC;IACJ,CAAC;IAUK,AAAN,KAAK,CAAC,cAAc,CACnB,GAAyB,EACzB,IAAc,EACsB,EAAU,EACxC,OAAgC;QAEtC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAE1C,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE;YAChD,GAAG;YACH,KAAK;YACL,SAAS;SACT,CAAC,CAAC;IACJ,CAAC;IAUK,AAAN,KAAK,CAAC,cAAc,CACnB,GAAyB,EACzB,IAAc,EACsB,EAAU;QAE9C,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACzD,CAAC;CACD,CAAA;;AA/EM;IAPL,IAAA,gBAAG,EAAC,GAAG,CAAC;IACR,IAAA,qBAAQ,EAAC,4BAAgB,CAAC,SAAS,CAAC;IACpC,IAAA,wBAAW,EAAC,eAAe,CAAC;IAC5B,IAAA,uBAAU,EAAC,oBAAoB,CAAC;IAChC,IAAA,2BAAc,EAAC,wCAAwC,CAAC;IACxD,IAAA,oBAAO,EAAC,IAAI,CAAC;IACb,IAAA,wBAAW,EAAC,GAAG,EAAE,iCAAqB,CAAC;IAItC,WAAA,kBAAK,CAAA;;qDAAQ,iCAAqB;;6DAanC;AASK;IAPL,IAAA,iBAAI,EAAC,GAAG,CAAC;IACT,IAAA,qBAAQ,EAAC,4BAAgB,CAAC,SAAS,CAAC;IACpC,IAAA,wBAAW,EAAC,iBAAiB,CAAC;IAC9B,IAAA,uBAAU,EAAC,mBAAmB,CAAC;IAC/B,IAAA,2BAAc,EAAC,qCAAqC,CAAC;IACrD,IAAA,oBAAO,EAAC,IAAI,CAAC;IACb,IAAA,wBAAW,EAAC,GAAG,CAAC;IAIf,WAAA,iBAAI,CAAA;;qDAAU,mCAAuB;;+DAWtC;AAUK;IARL,IAAA,gBAAG,EAAC,MAAM,CAAC;IACX,IAAA,qBAAQ,EAAC,4BAAgB,CAAC,SAAS,CAAC;IACpC,IAAA,wBAAW,EAAC,iBAAiB,CAAC;IAC9B,IAAA,uBAAU,EAAC,mBAAmB,CAAC;IAC/B,IAAA,2BAAc,EAAC,uCAAuC,CAAC;IACvD,IAAA,oBAAO,EAAC,IAAI,CAAC;IACb,IAAA,wBAAW,EAAC,GAAG,CAAC;IAChB,IAAA,6BAAgB,EAAC,GAAG,CAAC;IAIpB,WAAA,IAAA,kBAAK,EAAC,IAAI,EAAE,iCAAqB,CAAC,CAAA;IAClC,WAAA,iBAAI,CAAA;;6DAAU,mCAAuB;;+DAStC;AAUK;IARL,IAAA,mBAAM,EAAC,MAAM,CAAC;IACd,IAAA,qBAAQ,EAAC,4BAAgB,CAAC,SAAS,CAAC;IACpC,IAAA,wBAAW,EAAC,iBAAiB,CAAC;IAC9B,IAAA,uBAAU,EAAC,mBAAmB,CAAC;IAC/B,IAAA,2BAAc,EAAC,uCAAuC,CAAC;IACvD,IAAA,oBAAO,EAAC,IAAI,CAAC;IACb,IAAA,wBAAW,EAAC,GAAG,CAAC;IAChB,IAAA,6BAAgB,EAAC,GAAG,CAAC;IAIpB,WAAA,IAAA,kBAAK,EAAC,IAAI,EAAE,iCAAqB,CAAC,CAAA;;;;+DAGnC;oCAxFW,yBAAyB;IADrC,IAAA,gCAAmB,EAAC,YAAY,CAAC;qCAEc,uCAAgB;GADnD,yBAAyB,CAyFrC"}

package/dist/public-api/v1/controllers/workflows.public.controller.d.ts

@@ -41,7 +41,7 @@ export declare class WorkflowsPublicController {
     activateWorkflow(req: AuthenticatedRequest, res: Response, workflowId: string, body: ActivateWorkflowPublicDto): Promise<WorkflowPublishPublicDto>;
     deactivateWorkflow(req: AuthenticatedRequest, res: Response, workflowId: string): Promise<WorkflowPublicDto>;
     getWorkflowHistory(req: AuthenticatedRequest, _res: Response, workflowId: string, query: ListWorkflowHistoryQueryDto): Promise<WorkflowVersionHistoryListPublicDto>;
-    getWorkflowVersion(req: AuthenticatedRequest, _res: Response, workflowId: string, versionId: string): Promise<WorkflowVersionPublicDto>;
+    getWorkflowVersion(req: AuthenticatedRequest, _res: Response, workflowId: string, workflowVersionId: string): Promise<WorkflowVersionPublicDto>;
     getWorkflowTags(req: AuthenticatedRequest, _res: Response, workflowId: string): Promise<WorkflowTagsPublicDto>;
     updateWorkflowTags(req: AuthenticatedRequest, _res: Response, workflowId: string, body: TagIdsPublicDto): Promise<WorkflowTagsPublicDto>;
 }