n8n 1.114.2 → 1.115.0

package/dist/environments.ee/source-control/source-control.controller.ee.js

@@ -81,6 +81,7 @@ let SourceControlController = class SourceControlController {
                 connected: resultingPreferences.connected,
                 readOnlyInstance: resultingPreferences.branchReadOnly,
                 repoType: (0, source_control_helper_ee_1.getRepoType)(resultingPreferences.repositoryUrl),
+                connectionType: resultingPreferences.connectionType,
             });
             return resultingPreferences;
         }
@@ -116,6 +117,7 @@ let SourceControlController = class SourceControlController {
                 connected: resultingPreferences.connected,
                 readOnlyInstance: resultingPreferences.branchReadOnly,
                 repoType: (0, source_control_helper_ee_1.getRepoType)(resultingPreferences.repositoryUrl),
+                connectionType: resultingPreferences.connectionType,
             });
             return resultingPreferences;
         }

package/dist/environments.ee/source-control/source-control.controller.ee.js.map

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

package/dist/environments.ee/source-control/source-control.service.ee.d.ts

@@ -56,7 +56,7 @@ export declare class SourceControlService {
         statusResult: SourceControlledFile[];
     }>;
     getStatus(user: User, options: SourceControlGetStatus): Promise<{
-        type: "workflow" | "credential" | "file" | "tags" | "variables" | "folders";
+        type: "workflow" | "project" | "credential" | "file" | "tags" | "variables" | "folders";
         status: "unknown" | "new" | "modified" | "deleted" | "created" | "renamed" | "conflicted" | "ignored" | "staged";
         id: string;
         name: string;
@@ -91,7 +91,7 @@ export declare class SourceControlService {
         foldersMissingInRemote: import("./types/exportable-folders").ExportableFolder[];
         foldersModifiedInEither: import("./types/exportable-folders").ExportableFolder[];
         sourceControlledFiles: {
-            type: "workflow" | "credential" | "file" | "tags" | "variables" | "folders";
+            type: "workflow" | "project" | "credential" | "file" | "tags" | "variables" | "folders";
             status: "unknown" | "new" | "modified" | "deleted" | "created" | "renamed" | "conflicted" | "ignored" | "staged";
             id: string;
             name: string;

package/dist/environments.ee/source-control/types/exportable-project.d.ts

@@ -0,0 +1,12 @@
+import type { RemoteResourceOwner } from './resource-owner';
+export interface ExportableProject {
+    id: string;
+    name: string;
+    icon: {
+        type: 'emoji' | 'icon';
+        value: string;
+    } | null;
+    description: string | null;
+    type: 'team';
+    owner: RemoteResourceOwner;
+}

package/dist/environments.ee/source-control/types/exportable-project.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=exportable-project.js.map

package/dist/environments.ee/source-control/types/exportable-project.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"exportable-project.js","sourceRoot":"","sources":["../../../../src/environments.ee/source-control/types/exportable-project.ts"],"names":[],"mappings":""}

package/dist/environments.ee/variables/variables.controller.ee.d.ts

@@ -1,12 +1,19 @@
-import { VariableListRequestDto } from '@n8n/api-types';
-import { VariablesRequest } from '../../requests';
+import { CreateVariableRequestDto, VariableListRequestDto } from '@n8n/api-types';
+import { AuthenticatedRequest } from '@n8n/db';
+import type { Response } from 'express';
 import { VariablesService } from './variables.service.ee';
 export declare class VariablesController {
     private readonly variablesService;
     constructor(variablesService: VariablesService);
-    getVariables(_req: unknown, _res: unknown, query: VariableListRequestDto): Promise<import("@n8n/db").Variables[]>;
-    createVariable(req: VariablesRequest.Create): Promise<import("@n8n/db").Variables>;
-    getVariable(req: VariablesRequest.Get): Promise<import("@n8n/db").Variables>;
-    updateVariable(req: VariablesRequest.Update): Promise<import("@n8n/db").Variables>;
-    deleteVariable(req: VariablesRequest.Delete): Promise<boolean>;
+    getVariables(req: AuthenticatedRequest, _res: unknown, query: VariableListRequestDto): Promise<import("@n8n/db").Variables[]>;
+    createVariable(req: AuthenticatedRequest, _res: Response, payload: CreateVariableRequestDto): Promise<import("@n8n/db").Variables>;
+    getVariable(req: AuthenticatedRequest<{
+        id: string;
+    }>): Promise<import("@n8n/db").Variables>;
+    updateVariable(req: AuthenticatedRequest<{
+        id: string;
+    }>, _res: Response, payload: CreateVariableRequestDto): Promise<import("@n8n/db").Variables>;
+    deleteVariable(req: AuthenticatedRequest<{
+        id: string;
+    }>): Promise<boolean>;
 }

package/dist/environments.ee/variables/variables.controller.ee.js

@@ -24,14 +24,12 @@ let VariablesController = class VariablesController {
     constructor(variablesService) {
         this.variablesService = variablesService;
     }
-    async getVariables(_req, _res, query) {
-        return await this.variablesService.getAllCached(query.state);
+    async getVariables(req, _res, query) {
+        return await this.variablesService.getAllForUser(req.user, query);
     }
-    async createVariable(req) {
-        const variable = req.body;
-        delete variable.id;
+    async createVariable(req, _res, payload) {
         try {
-            return await this.variablesService.create(variable);
+            return await this.variablesService.create(req.user, payload);
         }
         catch (error) {
             if (error instanceof variable_count_limit_reached_error_1.VariableCountLimitReachedError) {
@@ -44,19 +42,16 @@ let VariablesController = class VariablesController {
         }
     }
     async getVariable(req) {
-        const id = req.params.id;
-        const variable = await this.variablesService.getCached(id);
+        const variable = await this.variablesService.getForUser(req.user, req.params.id);
         if (variable === null) {
             throw new not_found_error_1.NotFoundError(`Variable with id ${req.params.id} not found`);
         }
         return variable;
     }
-    async updateVariable(req) {
+    async updateVariable(req, _res, payload) {
         const id = req.params.id;
-        const variable = req.body;
-        delete variable.id;
         try {
-            return await this.variablesService.update(id, variable);
+            return await this.variablesService.update(req.user, id, payload);
         }
         catch (error) {
             if (error instanceof variable_count_limit_reached_error_1.VariableCountLimitReachedError) {
@@ -69,15 +64,13 @@ let VariablesController = class VariablesController {
         }
     }
     async deleteVariable(req) {
-        const id = req.params.id;
-        await this.variablesService.delete(id);
+        await this.variablesService.deleteForUser(req.user, req.params.id);
         return true;
     }
 };
 exports.VariablesController = VariablesController;
 __decorate([
     (0, decorators_1.Get)('/'),
-    (0, decorators_1.GlobalScope)('variable:list'),
     __param(2, decorators_1.Query),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, api_types_1.VariableListRequestDto]),
@@ -86,14 +79,13 @@ __decorate([
 __decorate([
     (0, decorators_1.Post)('/'),
     (0, decorators_1.Licensed)('feat:variables'),
-    (0, decorators_1.GlobalScope)('variable:create'),
+    __param(2, decorators_1.Body),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
+    __metadata("design:paramtypes", [Object, Object, api_types_1.CreateVariableRequestDto]),
     __metadata("design:returntype", Promise)
 ], VariablesController.prototype, "createVariable", null);
 __decorate([
     (0, decorators_1.Get)('/:id'),
-    (0, decorators_1.GlobalScope)('variable:read'),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
@@ -101,14 +93,13 @@ __decorate([
 __decorate([
     (0, decorators_1.Patch)('/:id'),
     (0, decorators_1.Licensed)('feat:variables'),
-    (0, decorators_1.GlobalScope)('variable:update'),
+    __param(2, decorators_1.Body),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
+    __metadata("design:paramtypes", [Object, Object, api_types_1.CreateVariableRequestDto]),
     __metadata("design:returntype", Promise)
 ], VariablesController.prototype, "updateVariable", null);
 __decorate([
     (0, decorators_1.Delete)('/:id'),
-    (0, decorators_1.GlobalScope)('variable:delete'),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)

package/dist/environments.ee/variables/variables.controller.ee.js.map

@@ -1 +1 @@
-{"version":3,"file":"variables.controller.ee.js","sourceRoot":"","sources":["../../../src/environments.ee/variables/variables.controller.ee.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"variables.controller.ee.js","sourceRoot":"","sources":["../../../src/environments.ee/variables/variables.controller.ee.ts"],"names":[],"mappings":"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"}

package/dist/environments.ee/variables/variables.service.ee.d.ts

@@ -1,22 +1,32 @@
-import type { Variables } from '@n8n/db';
+import { CreateVariableRequestDto, UpdateVariableRequestDto } from '@n8n/api-types';
+import { LicenseState } from '@n8n/backend-common';
+import type { User, Variables } from '@n8n/db';
 import { VariablesRepository } from '@n8n/db';
+import { Scope } from '@n8n/permissions';
 import { EventService } from '../../events/event.service';
-import { License } from '../../license';
 import { CacheService } from '../../services/cache/cache.service';
+import { ProjectService } from '../../services/project.service.ee';
 export declare class VariablesService {
     private readonly cacheService;
     private readonly variablesRepository;
     private readonly eventService;
-    private readonly license;
-    constructor(cacheService: CacheService, variablesRepository: VariablesRepository, eventService: EventService, license: License);
-    getAllCached(state?: 'empty'): Promise<Variables[]>;
-    getCount(): Promise<number>;
+    private readonly licenseState;
+    private readonly projectService;
+    constructor(cacheService: CacheService, variablesRepository: VariablesRepository, eventService: EventService, licenseState: LicenseState, projectService: ProjectService);
+    private findAll;
+    private isAuthorizedForVariable;
+    getAllCached(): Promise<Variables[]>;
     getCached(id: string): Promise<Variables | null>;
-    delete(id: string): Promise<void>;
     updateCache(): Promise<void>;
-    findAll(): Promise<Variables[]>;
-    validateVariable(variable: Omit<Variables, 'id'>): void;
-    create(variable: Omit<Variables, 'id'>): Promise<Variables>;
-    update(id: string, variable: Omit<Variables, 'id'>): Promise<Variables>;
+    getAllForUser(user: User, filter?: {
+        state?: 'empty';
+        projectId?: string | null;
+    }): Promise<Variables[]>;
+    getForUser(user: User, variableId: string, scope?: Scope): Promise<Variables | null>;
+    deleteForUser(user: User, id: string): Promise<void>;
+    delete(id: string): Promise<void>;
     private canCreateNewVariable;
+    validateUniqueVariable(key: string, projectId?: string, id?: string): Promise<void>;
+    create(user: User, variable: CreateVariableRequestDto): Promise<Variables>;
+    update(user: User, id: string, variable: UpdateVariableRequestDto): Promise<Variables>;
 }

package/dist/environments.ee/variables/variables.service.ee.js

@@ -10,34 +10,55 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VariablesService = void 0;
+const backend_common_1 = require("@n8n/backend-common");
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
+const permissions_1 = require("@n8n/permissions");
+const feature_not_licensed_error_1 = require("../../errors/feature-not-licensed.error");
+const forbidden_error_1 = require("../../errors/response-errors/forbidden.error");
+const not_found_error_1 = require("../../errors/response-errors/not-found.error");
 const variable_count_limit_reached_error_1 = require("../../errors/variable-count-limit-reached.error");
-const variable_validation_error_1 = require("../../errors/variable-validation.error");
 const event_service_1 = require("../../events/event.service");
-const license_1 = require("../../license");
 const cache_service_1 = require("../../services/cache/cache.service");
+const project_service_ee_1 = require("../../services/project.service.ee");
+const projectVariableScopes = {
+    'variable:list': 'projectVariable:list',
+    'variable:read': 'projectVariable:read',
+    'variable:create': 'projectVariable:create',
+    'variable:update': 'projectVariable:update',
+    'variable:delete': 'projectVariable:delete',
+};
 let VariablesService = class VariablesService {
-    constructor(cacheService, variablesRepository, eventService, license) {
+    constructor(cacheService, variablesRepository, eventService, licenseState, projectService) {
         this.cacheService = cacheService;
         this.variablesRepository = variablesRepository;
         this.eventService = eventService;
-        this.license = license;
+        this.licenseState = licenseState;
+        this.projectService = projectService;
     }
-    async getAllCached(state) {
-        let variables = await this.cacheService.get('variables', {
-            refreshFn: async () => await this.findAll(),
+    async findAll() {
+        const variables = await this.variablesRepository.find({
+            relations: ['project'],
         });
-        if (variables === undefined) {
-            return [];
-        }
-        if (state === 'empty') {
-            variables = variables.filter((v) => v.value === '');
+        return variables;
+    }
+    async isAuthorizedForVariable(user, scope, projectId) {
+        if (!projectId) {
+            return (0, permissions_1.hasGlobalScope)(user, scope);
         }
-        return variables.map((v) => this.variablesRepository.create(v));
+        const projectVariableScope = projectVariableScopes[scope];
+        if (!projectVariableScope)
+            throw new Error(`No project variable scope mapping for scope "${scope}"`);
+        const project = await this.projectService.getProjectWithScope(user, projectId, [
+            projectVariableScope,
+        ]);
+        return !!project;
     }
-    async getCount() {
-        return (await this.getAllCached()).length;
+    async getAllCached() {
+        const variables = await this.cacheService.get('variables', {
+            refreshFn: async () => await this.findAll(),
+        });
+        return variables ?? [];
     }
     async getCached(id) {
         const variables = await this.getAllCached();
@@ -45,58 +66,116 @@ let VariablesService = class VariablesService {
         if (!foundVariable) {
             return null;
         }
-        return this.variablesRepository.create(foundVariable);
-    }
-    async delete(id) {
-        await this.variablesRepository.delete(id);
-        await this.updateCache();
+        return foundVariable;
     }
     async updateCache() {
         const variables = await this.findAll();
         await this.cacheService.set('variables', variables);
     }
-    async findAll() {
-        return await this.variablesRepository.find();
+    async getAllForUser(user, filter = {}) {
+        const allCachedVariables = await this.getAllCached();
+        const canListGlobalVariables = (0, permissions_1.hasGlobalScope)(user, 'variable:list');
+        const projectIds = await this.projectService.getProjectIdsWithScope(user, [
+            'projectVariable:list',
+        ]);
+        const userHasAccess = (variable) => (!variable.project && canListGlobalVariables) ||
+            (variable.project &&
+                projectIds.includes(variable.project.id));
+        const stateAndProjectFilter = (variable) => (filter.state !== 'empty' || variable.value === '') &&
+            (typeof filter.projectId === 'undefined' ||
+                (variable.project?.id ?? null) === filter.projectId);
+        return allCachedVariables.filter((variable) => userHasAccess(variable) && stateAndProjectFilter(variable));
     }
-    validateVariable(variable) {
-        if (variable.key.length > 50) {
-            throw new variable_validation_error_1.VariableValidationError('key cannot be longer than 50 characters');
+    async getForUser(user, variableId, scope = 'variable:read') {
+        const variable = await this.getCached(variableId);
+        if (!variable) {
+            return null;
         }
-        if (variable.key.replace(/[A-Za-z0-9_]/g, '').length !== 0) {
-            throw new variable_validation_error_1.VariableValidationError('key can only contain characters A-Za-z0-9_');
+        const userHasAccess = await this.isAuthorizedForVariable(user, scope, variable.project?.id);
+        if (!userHasAccess) {
+            throw new forbidden_error_1.ForbiddenError('You are not allowed to access this variable');
         }
-        if (variable.value?.length > 255) {
-            throw new variable_validation_error_1.VariableValidationError('value cannot be longer than 255 characters');
+        return variable;
+    }
+    async deleteForUser(user, id) {
+        const existingVariable = await this.getCached(id);
+        const userHasRight = await this.isAuthorizedForVariable(user, 'variable:delete', existingVariable?.project?.id);
+        if (!userHasRight) {
+            throw new forbidden_error_1.ForbiddenError('You are not allowed to delete this variable');
         }
+        await this.delete(id);
+    }
+    async delete(id) {
+        await this.variablesRepository.delete(id);
+        await this.updateCache();
     }
-    async create(variable) {
-        if (!this.canCreateNewVariable(await this.getCount())) {
+    async canCreateNewVariable() {
+        if (!this.licenseState.isVariablesLicensed()) {
+            throw new feature_not_licensed_error_1.FeatureNotLicensedError('feat:variables');
+        }
+        const limit = this.licenseState.getMaxVariables();
+        if (limit === -1) {
+            return;
+        }
+        const variablesCount = (await this.getAllCached()).length;
+        if (limit <= variablesCount) {
             throw new variable_count_limit_reached_error_1.VariableCountLimitReachedError('Variables limit reached');
         }
-        this.validateVariable(variable);
+    }
+    async validateUniqueVariable(key, projectId, id) {
+        const existingVariablesByKey = (await this.getAllCached()).filter((v) => v.key === key && (!id || v.id !== id));
+        if (!projectId && existingVariablesByKey.find((v) => !v.project)) {
+            throw new variable_count_limit_reached_error_1.VariableCountLimitReachedError(`A global variable with key "${key}" already exists`);
+        }
+        if (projectId && existingVariablesByKey.find((v) => v.project?.id === projectId)) {
+            throw new variable_count_limit_reached_error_1.VariableCountLimitReachedError(`A variable with key "${key}" already exists in the specified project`);
+        }
+    }
+    async create(user, variable) {
+        const userHasRight = await this.isAuthorizedForVariable(user, 'variable:create', variable.projectId);
+        if (!userHasRight) {
+            throw new forbidden_error_1.ForbiddenError(`You are not allowed to create a variable${variable.projectId ? ' in this project' : ''}`);
+        }
+        await this.canCreateNewVariable();
+        await this.validateUniqueVariable(variable.key, variable.projectId);
         this.eventService.emit('variable-created');
         const saveResult = await this.variablesRepository.save({
             ...variable,
+            project: variable.projectId ? { id: variable.projectId } : null,
             id: (0, db_1.generateNanoId)(),
         }, { transaction: false });
         await this.updateCache();
         return saveResult;
     }
-    async update(id, variable) {
-        this.validateVariable(variable);
-        await this.variablesRepository.update(id, variable);
-        await this.updateCache();
-        return (await this.getCached(id));
-    }
-    canCreateNewVariable(variableCount) {
-        if (!this.license.isVariablesEnabled()) {
-            return false;
+    async update(user, id, variable) {
+        const existingVariable = await this.getCached(id);
+        if (!existingVariable) {
+            throw new not_found_error_1.NotFoundError(`Variable with id ${id} not found`);
         }
-        const limit = this.license.getVariablesLimit();
-        if (limit === -1) {
-            return true;
+        const userHasRightOnExistingVariable = await this.isAuthorizedForVariable(user, 'variable:update', existingVariable?.project?.id);
+        if (!userHasRightOnExistingVariable) {
+            throw new forbidden_error_1.ForbiddenError('You are not allowed to update this variable');
+        }
+        let newProjectId = existingVariable.project?.id;
+        if (typeof variable.projectId !== 'undefined') {
+            newProjectId = variable.projectId ?? undefined;
+        }
+        if (existingVariable?.project?.id !== newProjectId) {
+            const userHasRightOnNewProject = await this.isAuthorizedForVariable(user, 'variable:update', newProjectId);
+            if (!userHasRightOnNewProject) {
+                throw new forbidden_error_1.ForbiddenError(`You are not allowed to move this variable to ${variable.projectId ? 'the specified project' : 'the global scope'}`);
+            }
         }
-        return limit > variableCount;
+        if (variable.key) {
+            await this.validateUniqueVariable(variable.key, newProjectId, id);
+        }
+        await this.variablesRepository.update(id, {
+            key: variable.key,
+            value: variable.value,
+            project: variable.projectId ? { id: variable.projectId } : null,
+        });
+        await this.updateCache();
+        return (await this.getCached(id));
     }
 };
 exports.VariablesService = VariablesService;
@@ -105,6 +184,7 @@ exports.VariablesService = VariablesService = __decorate([
     __metadata("design:paramtypes", [cache_service_1.CacheService,
         db_1.VariablesRepository,
         event_service_1.EventService,
-        license_1.License])
+        backend_common_1.LicenseState,
+        project_service_ee_1.ProjectService])
 ], VariablesService);
 //# sourceMappingURL=variables.service.ee.js.map

package/dist/environments.ee/variables/variables.service.ee.js.map

@@ -1 +1 @@
-{"version":3,"file":"variables.service.ee.js","sourceRoot":"","sources":["../../../src/environments.ee/variables/variables.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAA8D;AAC9D,gCAAkC;AAElC,oGAA6F;AAC7F,kFAA6E;AAC7E,0DAAsD;AACtD,uCAAoC;AACpC,kEAA8D;AAGvD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC5B,YACkB,YAA0B,EAC1B,mBAAwC,EACxC,YAA0B,EAC1B,OAAgB;QAHhB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,YAAO,GAAP,OAAO,CAAS;IAC/B,CAAC;IAEJ,KAAK,CAAC,YAAY,CAAC,KAAe;QACjC,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE;YACxD,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE;SAC3C,CAAC,CAAC;QAEH,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,EAAE,CAAC;QACX,CAAC;QAED,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;YACvB,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,OAAO,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EAAU;QACzB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,aAAa,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC;QACb,CAAC;QACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,aAAmC,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACtB,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,WAAW;QAEhB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACvC,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,OAAO;QACZ,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;IAC9C,CAAC;IAED,gBAAgB,CAAC,QAA+B;QAC/C,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;YAC9B,MAAM,IAAI,mDAAuB,CAAC,yCAAyC,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,mDAAuB,CAAC,4CAA4C,CAAC,CAAC;QACjF,CAAC;QACD,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,CAAC;YAClC,MAAM,IAAI,mDAAuB,CAAC,4CAA4C,CAAC,CAAC;QACjF,CAAC;IACF,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAA+B;QAC3C,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;YACvD,MAAM,IAAI,mEAA8B,CAAC,yBAAyB,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAEhC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CACrD;YACC,GAAG,QAAQ;YACX,EAAE,EAAE,IAAA,mBAAc,GAAE;SACpB,EACD,EAAE,WAAW,EAAE,KAAK,EAAE,CACtB,CAAC;QACF,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,UAAU,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,QAA+B;QACvD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAChC,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QACpD,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAE,CAAC;IACpC,CAAC;IAEO,oBAAoB,CAAC,aAAqB;QACjD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;YACxC,OAAO,KAAK,CAAC;QACd,CAAC;QAGD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAC/C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC;QACb,CAAC;QACD,OAAO,KAAK,GAAG,aAAa,CAAC;IAC9B,CAAC;CACD,CAAA;AArGY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,YAAO,GAAE;qCAGuB,4BAAY;QACL,wBAAmB;QAC1B,4BAAY;QACjB,iBAAO;GALtB,gBAAgB,CAqG5B"}
+{"version":3,"file":"variables.service.ee.js","sourceRoot":"","sources":["../../../src/environments.ee/variables/variables.service.ee.ts"],"names":[],"mappings":"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"}

package/dist/evaluation.ee/test-runner/test-runner.service.ee.js

@@ -165,7 +165,7 @@ let TestRunnerService = TestRunnerService_1 = class TestRunnerService {
         const executionId = await this.workflowRunner.run(data);
         (0, node_assert_1.default)(executionId);
         abortSignal.addEventListener('abort', () => {
-            this.activeExecutions.stopExecution(executionId);
+            this.activeExecutions.stopExecution(executionId, new n8n_workflow_1.ManualExecutionCancelledError(executionId));
         });
         const executionData = await this.activeExecutions.getPostExecutePromise(executionId);
         (0, node_assert_1.default)(executionData);