n8n 2.34.3 → 2.35.0

package/dist/modules/n8n-packages/entities/tag/tag-import-decision.d.ts

@@ -1,4 +1,4 @@
-import type { TagRef, TagRename, TagResolutionFailure, TagResolutionFailureKind } from './tag.types';
+import type { TagReconcile, TagRef, TagRename, TagResolutionFailure, TagResolutionFailureKind } from './tag.types';
 import { TagConflictPolicy, TagMissingMode } from '../../n8n-packages.types';
 export type TagDecisionFailure = Omit<TagResolutionFailure, 'kind' | 'sourceId' | 'name' | 'usedByWorkflows'> & {
     kind: Exclude<TagResolutionFailureKind, 'permission-denied'>;
@@ -14,6 +14,9 @@ export type TagEffect = {
 } | {
     action: 'rename';
     rename: TagRename;
+} | {
+    action: 'reconcile';
+    reconcile: TagReconcile;
 } | {
     action: 'drop';
     tag: TagRef;

package/dist/modules/n8n-packages/entities/tag/tag-import-decision.js

@@ -4,7 +4,7 @@ exports.decideTagImportAction = decideTagImportAction;
 const n8n_packages_types_1 = require("../../n8n-packages.types");
 const TAG_NAME_MAX_LENGTH = 24;
 const TAG_ID_MAX_LENGTH = 36;
-const FORBIDDEN_NAME_CHARS = /[\p{Cc}\p{Cs}]/u;
+const FORBIDDEN_CHARS = /[\p{Cc}\p{Cs}]/u;
 function decideTagImportAction(requirement, targetTagWithSameId, nameHolder, missingMode, conflictPolicy) {
     const sourceId = requirement.id;
     const name = requirement.name.trim();
@@ -44,6 +44,12 @@ function decideForAbsentId(sourceId, name, nameHolder, missingMode, conflictPoli
         if (conflictPolicy === n8n_packages_types_1.TagConflictPolicy.Skip) {
             return { action: 'drop', tag: { id: sourceId, name } };
         }
+        if (conflictPolicy === n8n_packages_types_1.TagConflictPolicy.Rename) {
+            return (invalidId(sourceId, name) ?? {
+                action: 'reconcile',
+                reconcile: { id: sourceId, name, oldId: nameHolder.id },
+            });
+        }
         return {
             action: 'fail',
             failure: { kind: 'name-collision', sourceId, name, existingTagId: nameHolder.id },
@@ -53,7 +59,7 @@ function decideForAbsentId(sourceId, name, nameHolder, missingMode, conflictPoli
         invalidId(sourceId, name) ?? { action: 'create', tag: { id: sourceId, name } });
 }
 function invalidName(name, sourceId) {
-    if (FORBIDDEN_NAME_CHARS.test(name)) {
+    if (FORBIDDEN_CHARS.test(name)) {
         return { action: 'fail', failure: { kind: 'invalid-name', sourceId, name } };
     }
     const length = [...name].length;
@@ -62,8 +68,9 @@ function invalidName(name, sourceId) {
     return { action: 'fail', failure: { kind: 'invalid-name', sourceId, name } };
 }
 function invalidId(sourceId, name) {
-    if (sourceId.length <= TAG_ID_MAX_LENGTH)
+    if (sourceId.length <= TAG_ID_MAX_LENGTH && !FORBIDDEN_CHARS.test(sourceId)) {
         return undefined;
+    }
     return { action: 'fail', failure: { kind: 'invalid-id', sourceId, name } };
 }
 //# sourceMappingURL=tag-import-decision.js.map

package/dist/modules/n8n-packages/entities/tag/tag-import-decision.js.map

@@ -1 +1 @@
-{"version":3,"file":"tag-import-decision.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/tag/tag-import-decision.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tag-import-decision.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/tag/tag-import-decision.ts"],"names":[],"mappings":"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"}

package/dist/modules/n8n-packages/entities/tag/tag-importer.d.ts

@@ -1,9 +1,7 @@
 import { GlobalConfig } from '@n8n/config';
 import { TagService } from '../../../../services/tag.service';
-import type { TagImportPlan, TagImportRequest } from './tag.types';
+import type { ReferencingWorkflow, TagImportPlan, TagImportRequest } from './tag.types';
 import type { ImportContext } from '../../n8n-packages.types';
-import type { PreparedWorkflow } from '../workflow/workflow-import.types';
-type ReferencingWorkflow = Pick<PreparedWorkflow, 'sourceWorkflowId' | 'tagIds'>;
 export declare class TagImporter {
     private readonly tagService;
     private readonly globalConfig;
@@ -11,4 +9,3 @@ export declare class TagImporter {
     plan(context: ImportContext, request: TagImportRequest, appliedWorkflows: ReferencingWorkflow[]): Promise<TagImportPlan>;
     apply(context: ImportContext, plan: TagImportPlan): Promise<void>;
 }
-export {};

package/dist/modules/n8n-packages/entities/tag/tag-importer.js

@@ -17,6 +17,7 @@ const n8n_workflow_1 = require("n8n-workflow");
 const forbidden_error_1 = require("../../../../errors/response-errors/forbidden.error");
 const tag_service_1 = require("../../../../services/tag.service");
 const tag_import_decision_1 = require("./tag-import-decision");
+const tag_types_1 = require("./tag.types");
 let TagImporter = class TagImporter {
     constructor(tagService, globalConfig) {
         this.tagService = tagService;
@@ -27,6 +28,7 @@ let TagImporter = class TagImporter {
             matched: [],
             creations: [],
             renames: [],
+            reconciles: [],
             dropped: [],
             failures: [],
         };
@@ -56,6 +58,8 @@ let TagImporter = class TagImporter {
                 plan.creations.push(effect.tag);
             else if (effect.action === 'rename')
                 plan.renames.push(effect.rename);
+            else if (effect.action === 'reconcile')
+                plan.reconciles.push(effect.reconcile);
             else if (effect.action === 'drop')
                 plan.dropped.push(effect.tag);
             else
@@ -67,28 +71,32 @@ let TagImporter = class TagImporter {
             .map(({ sourceWorkflowId }) => sourceWorkflowId);
         plan.failures = decisionFailures.map((failure) => ({
             ...failure,
-            usedByWorkflows: sortedUnique(sourceWorkflowIdsReferencing(failure.sourceId)),
+            usedByWorkflows: (0, tag_types_1.sortedUnique)(sourceWorkflowIdsReferencing(failure.sourceId)),
         }));
         if (plan.creations.length > 0 && !(0, permissions_1.hasGlobalScope)(context.user, 'tag:create')) {
             plan.failures.push(permissionFailure('tag:create', plan.creations.map(({ id }) => id), sourceWorkflowIdsReferencing));
         }
-        if (plan.renames.length > 0 && !(0, permissions_1.hasGlobalScope)(context.user, 'tag:update')) {
-            plan.failures.push(permissionFailure('tag:update', plan.renames.map(({ id }) => id), sourceWorkflowIdsReferencing));
+        const updatedTagIds = [...plan.renames, ...plan.reconciles].map(({ id }) => id);
+        if (updatedTagIds.length > 0 && !(0, permissions_1.hasGlobalScope)(context.user, 'tag:update')) {
+            plan.failures.push(permissionFailure('tag:update', updatedTagIds, sourceWorkflowIdsReferencing));
         }
         return plan;
     }
     async apply(context, plan) {
-        if (plan.creations.length === 0 && plan.renames.length === 0)
+        if (plan.creations.length === 0 && plan.renames.length === 0 && plan.reconciles.length === 0) {
             return;
+        }
         if (plan.creations.length > 0 && !(0, permissions_1.hasGlobalScope)(context.user, 'tag:create')) {
             throw new forbidden_error_1.ForbiddenError('User is missing a scope required to create a tag');
         }
-        if (plan.renames.length > 0 && !(0, permissions_1.hasGlobalScope)(context.user, 'tag:update')) {
-            throw new forbidden_error_1.ForbiddenError('User is missing a scope required to rename a tag');
+        if ((plan.renames.length > 0 || plan.reconciles.length > 0) &&
+            !(0, permissions_1.hasGlobalScope)(context.user, 'tag:update')) {
+            throw new forbidden_error_1.ForbiddenError('User is missing a scope required to rename or reconcile a tag');
         }
         const existingById = new Map((await this.tagService.getByIds([
             ...plan.creations.map(({ id }) => id),
             ...plan.renames.map(({ id }) => id),
+            ...plan.reconciles.flatMap(({ id, oldId }) => [id, oldId]),
         ])).map((tag) => [tag.id, tag]));
         for (const creation of plan.creations) {
             if (existingById.has(creation.id))
@@ -101,6 +109,13 @@ let TagImporter = class TagImporter {
                 continue;
             await this.tagService.save(this.tagService.toEntity({ id: rename.id, name: rename.to }), 'update');
         }
+        for (const reconcile of plan.reconciles) {
+            if (existingById.has(reconcile.id))
+                continue;
+            if (!existingById.has(reconcile.oldId))
+                continue;
+            await this.tagService.reconcileTagId(reconcile.oldId, reconcile.id);
+        }
     }
 };
 exports.TagImporter = TagImporter;
@@ -111,9 +126,6 @@ exports.TagImporter = TagImporter = __decorate([
 function toTagRef(tag) {
     return { id: tag.id, name: tag.name };
 }
-function sortedUnique(values) {
-    return [...new Set(values)].sort();
-}
 function duplicateWrittenNameFailures(plan) {
     const nameCounts = new Map();
     const writtenNames = [
@@ -136,7 +148,7 @@ function permissionFailure(missingScope, tagIds, sourceWorkflowIdsReferencing) {
     return {
         kind: 'permission-denied',
         missingScope,
-        usedByWorkflows: sortedUnique(tagIds.flatMap(sourceWorkflowIdsReferencing)),
+        usedByWorkflows: (0, tag_types_1.sortedUnique)(tagIds.flatMap(sourceWorkflowIdsReferencing)),
     };
 }
 //# sourceMappingURL=tag-importer.js.map

package/dist/modules/n8n-packages/entities/tag/tag-importer.js.map

@@ -1 +1 @@
-{"version":3,"file":"tag-importer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/tag/tag-importer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tag-importer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/tag/tag-importer.ts"],"names":[],"mappings":"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"}

package/dist/modules/n8n-packages/entities/tag/tag.types.d.ts

@@ -1,5 +1,6 @@
 import type { TagConflictPolicy, TagMissingMode } from '../../n8n-packages.types';
 import type { PackageTagRequirement } from '../../spec/requirements.schema';
+import type { PreparedWorkflow } from '../workflow/workflow-import.types';
 export interface WorkflowTagUsage {
     workflowId: string;
     tag: {
@@ -23,6 +24,11 @@ export interface TagRename {
     from: string;
     to: string;
 }
+export interface TagReconcile {
+    id: string;
+    name: string;
+    oldId: string;
+}
 export type TagResolutionFailureKind = 'rename-drift' | 'name-collision' | 'invalid-name' | 'invalid-id' | 'permission-denied';
 export type TagResolutionFailure = {
     kind: TagResolutionFailureKind;
@@ -42,7 +48,14 @@ export interface TagImportPlan {
     matched: TagRef[];
     creations: TagRef[];
     renames: TagRename[];
+    reconciles: TagReconcile[];
     dropped: TagRef[];
     failures: TagResolutionFailure[];
 }
+export type ReferencingWorkflow = Pick<PreparedWorkflow, 'sourceWorkflowId' | 'tagIds'>;
 export declare function droppedTagIds(plan: TagImportPlan): ReadonlySet<string>;
+export declare function sortedUnique(values: string[]): string[];
+export declare function contestedReconcileTargetFailures(scopes: Array<{
+    tagPlan: TagImportPlan;
+    workflows: ReferencingWorkflow[];
+}>): TagResolutionFailure[];

package/dist/modules/n8n-packages/entities/tag/tag.types.js

@@ -2,9 +2,45 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compareTagsByName = void 0;
 exports.droppedTagIds = droppedTagIds;
+exports.sortedUnique = sortedUnique;
+exports.contestedReconcileTargetFailures = contestedReconcileTargetFailures;
 const compareTagsByName = (a, b) => a.name.localeCompare(b.name, 'en') || a.id.localeCompare(b.id, 'en');
 exports.compareTagsByName = compareTagsByName;
 function droppedTagIds(plan) {
     return new Set(plan.dropped.map(({ id }) => id));
 }
+function sortedUnique(values) {
+    return [...new Set(values)].sort();
+}
+function contestedReconcileTargetFailures(scopes) {
+    const reconcilesByKey = new Map();
+    for (const { tagPlan } of scopes) {
+        for (const reconcile of tagPlan.reconciles) {
+            reconcilesByKey.set(JSON.stringify([reconcile.id, reconcile.oldId]), reconcile);
+        }
+    }
+    if (reconcilesByKey.size === 0)
+        return [];
+    const reconciles = [...reconcilesByKey.values()];
+    const claimedTargetIds = new Set(scopes.flatMap(({ tagPlan }) => [
+        ...tagPlan.matched.map(({ id }) => id),
+        ...tagPlan.renames.map(({ id }) => id),
+    ]));
+    const oldIdCounts = new Map();
+    for (const { oldId } of reconciles) {
+        oldIdCounts.set(oldId, (oldIdCounts.get(oldId) ?? 0) + 1);
+    }
+    const sourceWorkflowIdsReferencing = (tagId) => scopes.flatMap(({ workflows }) => workflows
+        .filter(({ tagIds }) => tagIds?.includes(tagId))
+        .map(({ sourceWorkflowId }) => sourceWorkflowId));
+    return reconciles
+        .filter(({ oldId }) => claimedTargetIds.has(oldId) || (oldIdCounts.get(oldId) ?? 0) > 1)
+        .map(({ id, name, oldId }) => ({
+        kind: 'name-collision',
+        sourceId: id,
+        name,
+        existingTagId: oldId,
+        usedByWorkflows: sortedUnique(sourceWorkflowIdsReferencing(id)),
+    }));
+}
 //# sourceMappingURL=tag.types.js.map

package/dist/modules/n8n-packages/entities/tag/tag.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"tag.types.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/tag/tag.types.ts"],"names":[],"mappings":";;;;AASO,MAAM,iBAAiB,GAAG,CAChC,CAA+B,EAC/B,CAA+B,EAC9B,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;AAH7D,QAAA,iBAAiB,GAAjB,iBAAiB,CAG4C;AAsD1E,uBAA8B,IAAmB;IAChD,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAClD,CAAC"}
+{"version":3,"file":"tag.types.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/tag/tag.types.ts"],"names":[],"mappings":"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"}

package/dist/modules/n8n-packages/entities/variable/variable-importer.d.ts

@@ -1,15 +1,16 @@
 import { VariablesService } from '../../../../environments.ee/variables/variables.service.ee';
-import type { VariableApplyResult, VariableCreation, VariableImportPlan, VariableImportRequest, VariableLimitFailure, VariableResolutionFailure } from './variable.types';
+import type { VariableApplyResult, VariableConflict, VariableCreation, VariableImportPlan, VariableImportRequest, VariableLimitFailure, VariableOverwrite, VariableResolutionFailure } from './variable.types';
 import type { ImportContext } from '../../n8n-packages.types';
 export declare class VariableImporter {
     private readonly variablesService;
     constructor(variablesService: VariablesService);
-    plan(context: ImportContext, request: VariableImportRequest, options?: {
-        projectPendingCreation?: boolean;
-    }): Promise<VariableImportPlan>;
+    plan(context: ImportContext, request: VariableImportRequest): Promise<VariableImportPlan>;
     quotaFailure(creations: VariableCreation[]): Promise<VariableLimitFailure | undefined>;
     blockingFailures(request: VariableImportRequest, plan: VariableImportPlan): VariableResolutionFailure[];
+    blockingConflicts(request: VariableImportRequest, plan: VariableImportPlan): VariableConflict[];
     apply(context: ImportContext, plan: VariableImportPlan): Promise<VariableApplyResult>;
     private variableExistsAtDestination;
-    private assertCanCreate;
+    private targetScopes;
+    assertCanCreate(context: ImportContext, creations: VariableCreation[], projectPendingCreation: boolean): Promise<void>;
+    assertCanUpdate(context: ImportContext, overwrites: VariableOverwrite[]): Promise<void>;
 }

package/dist/modules/n8n-packages/entities/variable/variable-importer.js

@@ -19,14 +19,16 @@ const variable_count_limit_reached_error_1 = require("../../../../errors/variabl
 const check_access_1 = require("../../../../permissions.ee/check-access");
 const variable_missing_mode_1 = require("./variable-missing-mode");
 const variable_types_1 = require("./variable.types");
+const n8n_packages_types_1 = require("../../n8n-packages.types");
 let VariableImporter = class VariableImporter {
     constructor(variablesService) {
         this.variablesService = variablesService;
     }
-    async plan(context, request, options = {}) {
+    async plan(context, request) {
         const requirements = request.requirements ?? [];
-        if (requirements.length === 0)
-            return { matched: [], missing: [], creations: [] };
+        if (requirements.length === 0) {
+            return { matched: [], missing: [], creations: [], conflicts: [], overwrites: [] };
+        }
         const allVariables = await this.variablesService.getAllCached();
         const variablesByKey = new Map();
         for (const variable of allVariables) {
@@ -39,26 +41,46 @@ let VariableImporter = class VariableImporter {
         const matched = [];
         const missing = [];
         const creations = [];
-        const createStub = (0, variable_missing_mode_1.variableMissingModeCreates)(request.missingMode);
+        const conflicts = [];
+        const overwrites = [];
+        const createsMissing = (0, variable_missing_mode_1.variableMissingModeCreates)(request.missingMode);
+        const usesPackageValue = (0, variable_missing_mode_1.variableMissingModeUsesPackageValue)(request.missingMode);
+        const comparesValues = request.conflictPolicy !== n8n_packages_types_1.VariableConflictPolicy.KeepExisting;
+        const overwritesConflicts = request.conflictPolicy === n8n_packages_types_1.VariableConflictPolicy.Overwrite;
         for (const requirement of requirements) {
             const picked = (0, n8n_workflow_1.pickVariableForProject)(variablesByKey.get(requirement.name) ?? [], requirement.name, context.projectId);
             if (picked) {
                 matched.push(requirement.name);
+                const packageValue = requirement.packageValue;
+                if (!comparesValues || !packageValue || packageValue === picked.value) {
+                    continue;
+                }
+                const scope = picked.project ? { projectId: picked.project.id } : {};
+                const usedByWorkflows = [...new Set(requirement.usedByWorkflows)].sort();
+                conflicts.push({ name: requirement.name, ...scope, usedByWorkflows });
+                if (overwritesConflicts) {
+                    overwrites.push({
+                        variableId: picked.id,
+                        name: requirement.name,
+                        ...scope,
+                        value: packageValue,
+                        usedByWorkflows,
+                    });
+                }
                 continue;
             }
             missing.push((0, variable_types_1.createFailure)(requirement));
-            if (createStub) {
+            if (createsMissing) {
+                const value = usesPackageValue ? requirement.packageValue : undefined;
                 creations.push({
                     name: requirement.name,
                     ...(requirement.globalPlacement ? {} : { projectId: context.projectId }),
+                    ...(value !== undefined ? { value } : {}),
                     usedByWorkflows: [...new Set(requirement.usedByWorkflows)].sort(),
                 });
             }
         }
-        if (creations.length > 0) {
-            await this.assertCanCreate(context, creations, options.projectPendingCreation ?? false);
-        }
-        return { matched, missing, creations };
+        return { matched, missing, creations, conflicts, overwrites };
     }
     async quotaFailure(creations) {
         if (creations.length === 0)
@@ -68,10 +90,13 @@ let VariableImporter = class VariableImporter {
     blockingFailures(request, plan) {
         return (0, variable_missing_mode_1.variableBlockingFailures)(request.missingMode, plan);
     }
+    blockingConflicts(request, plan) {
+        return request.conflictPolicy === n8n_packages_types_1.VariableConflictPolicy.Fail ? plan.conflicts : [];
+    }
     async apply(context, plan) {
+        const created = [];
         const stubbed = [];
         const skippedExisting = [];
-        let createdCount = 0;
         for (const creation of plan.creations) {
             if (await this.variableExistsAtDestination(creation)) {
                 skippedExisting.push(creation.name);
@@ -81,11 +106,15 @@ let VariableImporter = class VariableImporter {
                 await this.variablesService.create(context.user, {
                     key: creation.name,
                     type: 'string',
-                    value: '',
+                    value: creation.value ?? '',
                     ...(creation.projectId ? { projectId: creation.projectId } : {}),
                 });
-                stubbed.push(creation.name);
-                createdCount += 1;
+                if (creation.value) {
+                    created.push(creation.name);
+                }
+                else {
+                    stubbed.push(creation.name);
+                }
             }
             catch (error) {
                 if (error instanceof variable_count_limit_reached_error_1.VariableCountLimitReachedError &&
@@ -96,10 +125,21 @@ let VariableImporter = class VariableImporter {
                 throw error;
             }
         }
+        const updated = [];
+        for (const overwrite of plan.overwrites) {
+            const current = await this.variablesService.getCached(overwrite.variableId);
+            if (!current || current.value === overwrite.value)
+                continue;
+            await this.variablesService.update(context.user, overwrite.variableId, {
+                value: overwrite.value,
+            });
+            updated.push(overwrite.name);
+        }
         return {
+            created: [...new Set(created)],
             stubbed: [...new Set(stubbed)],
             skippedExisting: [...new Set(skippedExisting)],
-            createdCount,
+            updated: [...new Set(updated)],
         };
     }
     async variableExistsAtDestination(creation) {
@@ -107,21 +147,45 @@ let VariableImporter = class VariableImporter {
         const allVariables = await this.variablesService.getAllCached();
         return allVariables.some((variable) => (0, variable_types_1.destinationKey)({ name: variable.key, projectId: variable.project?.id }) === destination);
     }
+    targetScopes(targets, skipProjectId) {
+        const projectIds = new Set();
+        for (const { projectId } of targets) {
+            if (projectId && projectId !== skipProjectId)
+                projectIds.add(projectId);
+        }
+        return {
+            touchesGlobal: targets.some(({ projectId }) => !projectId),
+            projectIds,
+        };
+    }
     async assertCanCreate(context, creations, projectPendingCreation) {
-        const needsGlobal = creations.some((creation) => !creation.projectId);
-        const needsProject = creations.some((creation) => creation.projectId);
-        if (needsGlobal && !(0, permissions_1.hasGlobalScope)(context.user, 'variable:create')) {
+        const { touchesGlobal, projectIds } = this.targetScopes(creations, projectPendingCreation ? context.projectId : undefined);
+        if (touchesGlobal && !(0, permissions_1.hasGlobalScope)(context.user, 'variable:create')) {
             throw new forbidden_error_1.ForbiddenError('You are not allowed to create global variables');
         }
-        if (needsProject && !projectPendingCreation) {
-            const allowed = await (0, check_access_1.userHasScopes)(context.user, ['projectVariable:create'], false, {
-                projectId: context.projectId,
+        for (const projectId of projectIds) {
+            const projectVariableCreationAllowed = await (0, check_access_1.userHasScopes)(context.user, ['projectVariable:create'], false, {
+                projectId,
             });
-            if (!allowed) {
+            if (!projectVariableCreationAllowed) {
                 throw new forbidden_error_1.ForbiddenError('You are not allowed to create variables in this project');
             }
         }
     }
+    async assertCanUpdate(context, overwrites) {
+        const { touchesGlobal, projectIds } = this.targetScopes(overwrites);
+        if (touchesGlobal && !(0, permissions_1.hasGlobalScope)(context.user, 'variable:update')) {
+            throw new forbidden_error_1.ForbiddenError('You are not allowed to update global variables');
+        }
+        for (const projectId of projectIds) {
+            const projectVariableUpdateAllowed = await (0, check_access_1.userHasScopes)(context.user, ['projectVariable:update'], false, {
+                projectId,
+            });
+            if (!projectVariableUpdateAllowed) {
+                throw new forbidden_error_1.ForbiddenError('You are not allowed to update variables in this project');
+            }
+        }
+    }
 };
 exports.VariableImporter = VariableImporter;
 exports.VariableImporter = VariableImporter = __decorate([

package/dist/modules/n8n-packages/entities/variable/variable-importer.js.map

@@ -1 +1 @@
-{"version":3,"file":"variable-importer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/variable/variable-importer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"variable-importer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/variable/variable-importer.ts"],"names":[],"mappings":"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"}

package/dist/modules/n8n-packages/entities/variable/variable-missing-mode.d.ts

@@ -1,4 +1,5 @@
 import type { VariableImportPlan, VariableResolutionFailure } from './variable.types';
 import { VariableMissingMode } from '../../n8n-packages.types';
 export declare function variableMissingModeCreates(mode: VariableMissingMode): boolean;
+export declare function variableMissingModeUsesPackageValue(mode: VariableMissingMode): boolean;
 export declare function variableBlockingFailures(mode: VariableMissingMode, plan: VariableImportPlan): VariableResolutionFailure[];

package/dist/modules/n8n-packages/entities/variable/variable-missing-mode.js

@@ -1,16 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.variableMissingModeCreates = variableMissingModeCreates;
+exports.variableMissingModeUsesPackageValue = variableMissingModeUsesPackageValue;
 exports.variableBlockingFailures = variableBlockingFailures;
 const n8n_packages_types_1 = require("../../n8n-packages.types");
 const ON_MISSING_VARIABLE = {
-    [n8n_packages_types_1.VariableMissingMode.DoNothing]: { creates: false, blocks: false },
-    [n8n_packages_types_1.VariableMissingMode.MustPreexist]: { creates: false, blocks: true },
-    [n8n_packages_types_1.VariableMissingMode.CreateStub]: { creates: true, blocks: false },
+    [n8n_packages_types_1.VariableMissingMode.DoNothing]: { creates: false, usesPackageValue: false, blocks: false },
+    [n8n_packages_types_1.VariableMissingMode.MustPreexist]: { creates: false, usesPackageValue: false, blocks: true },
+    [n8n_packages_types_1.VariableMissingMode.CreateStub]: { creates: true, usesPackageValue: false, blocks: false },
+    [n8n_packages_types_1.VariableMissingMode.CreateWithValue]: { creates: true, usesPackageValue: true, blocks: false },
 };
 function variableMissingModeCreates(mode) {
     return ON_MISSING_VARIABLE[mode].creates;
 }
+function variableMissingModeUsesPackageValue(mode) {
+    return ON_MISSING_VARIABLE[mode].usesPackageValue;
+}
 function variableBlockingFailures(mode, plan) {
     return ON_MISSING_VARIABLE[mode].blocks ? plan.missing : [];
 }

package/dist/modules/n8n-packages/entities/variable/variable-missing-mode.js.map

@@ -1 +1 @@
-{"version":3,"file":"variable-missing-mode.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/variable/variable-missing-mode.ts"],"names":[],"mappings":";;;;AACA,iEAA+D;AAK/D,MAAM,mBAAmB,GAAuD;IAC/E,CAAC,wCAAmB,CAAC,SAAS,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;IAClE,CAAC,wCAAmB,CAAC,YAAY,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE;IACpE,CAAC,wCAAmB,CAAC,UAAU,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE;CAClE,CAAC;AAGF,oCAA2C,IAAyB;IACnE,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;AAC1C,CAAC;AAGD,kCACC,IAAyB,EACzB,IAAwB;IAExB,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7D,CAAC"}
+{"version":3,"file":"variable-missing-mode.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/variable/variable-missing-mode.ts"],"names":[],"mappings":";;;;;AACA,iEAA+D;AAO/D,MAAM,mBAAmB,GAAuD;IAC/E,CAAC,wCAAmB,CAAC,SAAS,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;IAC3F,CAAC,wCAAmB,CAAC,YAAY,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE;IAC7F,CAAC,wCAAmB,CAAC,UAAU,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;IAC3F,CAAC,wCAAmB,CAAC,eAAe,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE;CAC/F,CAAC;AAGF,oCAA2C,IAAyB;IACnE,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;AAC1C,CAAC;AAGD,6CAAoD,IAAyB;IAC5E,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC;AACnD,CAAC;AAGD,kCACC,IAAyB,EACzB,IAAwB;IAExB,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7D,CAAC"}

package/dist/modules/n8n-packages/entities/variable/variable.exporter.d.ts

@@ -8,6 +8,7 @@ export declare class VariableExporter {
     private readonly variableSerializer;
     constructor(variablesService: VariablesService, sharedWorkflowRepository: SharedWorkflowRepository, variableSerializer: VariableSerializer);
     export(request: VariableExportRequest): Promise<VariableExportResult>;
+    private serializeOrBlock;
     private resolveRequirements;
     private resolveBaseDir;
     private resolveWorkflowProjects;