n8n 2.27.4 → 2.28.1

package/dist/modules/n8n-packages/entities/credential/id-based-credential-matcher.d.ts

@@ -2,12 +2,11 @@ import { SharedCredentialsRepository } from '@n8n/db';
 import { CredentialTypes } from '../../../../credential-types';
 import { CredentialsFinderService } from '../../../../credentials/credentials-finder.service';
 import { CredentialsService } from '../../../../credentials/credentials.service';
-import { CredentialMatcher, type CredentialMatcherContext } from './credential-matcher';
-import type { ImportBindingMap } from '../../n8n-packages.types';
+import { CredentialMatcher, type CredentialMatcherContext, type ResolvedCredentialMatch } from './credential-matcher';
 import type { PackageCredentialRequirement } from '../../spec/requirements.schema';
 export declare class IdBasedCredentialMatcher extends CredentialMatcher {
     private readonly credentialsService;
     constructor(credentialsFinderService: CredentialsFinderService, sharedCredentialsRepository: SharedCredentialsRepository, credentialTypes: CredentialTypes, credentialsService: CredentialsService);
-    protected resolve(known: PackageCredentialRequirement[], context: CredentialMatcherContext): Promise<ImportBindingMap>;
-    private findResolvableCredentialIds;
+    protected resolve(known: PackageCredentialRequirement[], context: CredentialMatcherContext): Promise<Map<string, ResolvedCredentialMatch>>;
+    private findUsableCredentialTypesById;
 }

package/dist/modules/n8n-packages/entities/credential/id-based-credential-matcher.js

@@ -22,23 +22,22 @@ let IdBasedCredentialMatcher = class IdBasedCredentialMatcher extends credential
         this.credentialsService = credentialsService;
     }
     async resolve(known, context) {
+        if (known.length === 0) {
+            return new Map();
+        }
         const bindings = context.credentialBindings;
-        const targetIds = known.map((reference) => bindings?.get(reference.id) ?? reference.id);
-        const resolvableIds = await this.findResolvableCredentialIds(targetIds, context.targetProject, context.user);
+        const usableTypesById = await this.findUsableCredentialTypesById(context.projectId, context.user);
         return new Map(known.flatMap((reference) => {
             const targetId = bindings?.get(reference.id) ?? reference.id;
-            if (!resolvableIds.has(targetId))
+            const targetType = usableTypesById.get(targetId);
+            if (targetType === undefined)
                 return [];
-            return [[reference.id, targetId]];
+            return [[reference.id, { targetId, targetType }]];
         }));
     }
-    async findResolvableCredentialIds(candidateIds, targetProject, user) {
-        const uniqueIds = new Set(candidateIds);
-        if (uniqueIds.size === 0) {
-            return new Set();
-        }
-        const usableCredentials = await this.credentialsService.getCredentialsAUserCanUseInAWorkflow(user, { projectId: targetProject.id });
-        return new Set(usableCredentials.map((credential) => credential.id).filter((id) => uniqueIds.has(id)));
+    async findUsableCredentialTypesById(projectId, user) {
+        const usableCredentials = await this.credentialsService.getCredentialsAUserCanUseInAWorkflow(user, { projectId });
+        return new Map(usableCredentials.map((credential) => [credential.id, credential.type]));
     }
 };
 exports.IdBasedCredentialMatcher = IdBasedCredentialMatcher;

package/dist/modules/n8n-packages/entities/credential/id-based-credential-matcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"id-based-credential-matcher.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/credential/id-based-credential-matcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAsD;AAEtD,gCAAkC;AAElC,yDAAqD;AACrD,yFAAoF;AACpF,2EAAuE;AAEvE,6DAAwF;AAKjF,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,sCAAiB;IAC9D,YACC,wBAAkD,EAClD,2BAAwD,EACxD,eAAgC,EACf,kBAAsC;QAEvD,KAAK,CAAC,wBAAwB,EAAE,2BAA2B,EAAE,eAAe,CAAC,CAAC;QAF7D,uBAAkB,GAAlB,kBAAkB,CAAoB;IAGxD,CAAC;IAES,KAAK,CAAC,OAAO,CACtB,KAAqC,EACrC,OAAiC;QAEjC,MAAM,QAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC;QAC5C,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC;QACxF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAC3D,SAAS,EACT,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,IAAI,CACZ,CAAC;QAEF,OAAO,IAAI,GAAG,CACb,KAAK,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC3B,MAAM,QAAQ,GAAG,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC;YAC7D,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAAE,OAAO,EAAE,CAAC;YAC5C,OAAO,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,QAAQ,CAAU,CAAC,CAAC;QAC5C,CAAC,CAAC,CACF,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACxC,YAAsB,EACtB,aAAsB,EACtB,IAAU;QAEV,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;QACxC,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,GAAG,EAAE,CAAC;QAClB,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oCAAoC,CAC3F,IAAI,EACJ,EAAE,SAAS,EAAE,aAAa,CAAC,EAAE,EAAE,CAC/B,CAAC;QAEF,OAAO,IAAI,GAAG,CACb,iBAAiB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CACtF,CAAC;IACH,CAAC;CACD,CAAA;AAlDY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,YAAO,GAAE;qCAGkB,qDAAwB;QACrB,gCAA2B;QACvC,kCAAe;QACK,wCAAkB;GAL5C,wBAAwB,CAkDpC"}
+{"version":3,"file":"id-based-credential-matcher.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/credential/id-based-credential-matcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAsD;AAEtD,gCAAkC;AAElC,yDAAqD;AACrD,yFAAoF;AACpF,2EAAuE;AAEvE,6DAI8B;AAIvB,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,sCAAiB;IAC9D,YACC,wBAAkD,EAClD,2BAAwD,EACxD,eAAgC,EACf,kBAAsC;QAEvD,KAAK,CAAC,wBAAwB,EAAE,2BAA2B,EAAE,eAAe,CAAC,CAAC;QAF7D,uBAAkB,GAAlB,kBAAkB,CAAoB;IAGxD,CAAC;IAES,KAAK,CAAC,OAAO,CACtB,KAAqC,EACrC,OAAiC;QAEjC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,GAAG,EAAE,CAAC;QAClB,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC;QAC5C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAC/D,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,IAAI,CACZ,CAAC;QAEF,OAAO,IAAI,GAAG,CACb,KAAK,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC3B,MAAM,QAAQ,GAAG,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC;YAC7D,MAAM,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACjD,IAAI,UAAU,KAAK,SAAS;gBAAE,OAAO,EAAE,CAAC;YACxC,OAAO,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAU,CAAC,CAAC;QAC5D,CAAC,CAAC,CACF,CAAC;IACH,CAAC;IAGO,KAAK,CAAC,6BAA6B,CAC1C,SAAiB,EACjB,IAAU;QAEV,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oCAAoC,CAC3F,IAAI,EACJ,EAAE,SAAS,EAAE,CACb,CAAC;QAEF,OAAO,IAAI,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzF,CAAC;CACD,CAAA;AA9CY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,YAAO,GAAE;qCAGkB,qDAAwB;QACrB,gCAA2B;QACvC,kCAAe;QACK,wCAAkB;GAL5C,wBAAwB,CA8CpC"}

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

@@ -1,11 +1,10 @@
-import type { User, WorkflowEntity } from '@n8n/db';
+import type { WorkflowEntity } from '@n8n/db';
 import type { WorkflowIdConflict } from './workflow-import-match.service';
-import type { WorkflowPublishingPolicy } from './workflow-publishing-policy.types';
-export interface WorkflowImportContext {
-    user: User;
-    projectId: string;
-    folderId: string | null;
+import type { WorkflowPublishingOutcome, WorkflowPublishingPolicy } from './workflow-publishing-policy.types';
+import type { ImportContext } from '../../n8n-packages.types';
+export interface WorkflowImportContext extends ImportContext {
     publishingPolicy: WorkflowPublishingPolicy;
+    publishBlockedSourceWorkflowIds: ReadonlySet<string>;
 }
 export interface PreparedWorkflow {
     entity: WorkflowEntity;
@@ -52,4 +51,5 @@ export interface WorkflowImportOutcome {
     status: 'created' | 'updated' | 'skipped';
     workflow: WorkflowEntity;
     sourceWorkflowId: string;
+    publishing: WorkflowPublishingOutcome;
 }

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

@@ -3,7 +3,7 @@ import { WorkflowService } from '../../../../workflows/workflow.service';
 import { WorkflowImportMatchService } from './workflow-import-match.service';
 import type { PreparedWorkflow, WorkflowImportContext, WorkflowImportOutcome, WorkflowImportPlan } from './workflow-import.types';
 import { WorkflowPublisher } from './workflow-publisher';
-import type { ImportWorkflowProperties, PackageImportBindings } from '../../n8n-packages.types';
+import type { ImportContext, ImportWorkflowProperties, PackageImportBindings } from '../../n8n-packages.types';
 export interface WorkflowImportResult {
     outcomes: WorkflowImportOutcome[];
     bindings: PackageImportBindings;
@@ -14,9 +14,9 @@ export declare class WorkflowImporter {
     private readonly workflowService;
     private readonly workflowPublisher;
     constructor(workflowImportMatchService: WorkflowImportMatchService, workflowCreationService: WorkflowCreationService, workflowService: WorkflowService, workflowPublisher: WorkflowPublisher);
-    plan(context: WorkflowImportContext, prepared: PreparedWorkflow[], options: ImportWorkflowProperties): Promise<WorkflowImportPlan>;
+    plan(context: ImportContext, prepared: PreparedWorkflow[], options: ImportWorkflowProperties): Promise<WorkflowImportPlan>;
     private collectIdConflicts;
-    apply(plan: WorkflowImportPlan, context: WorkflowImportContext, bindings: PackageImportBindings): Promise<WorkflowImportResult>;
+    apply(context: WorkflowImportContext, plan: WorkflowImportPlan, bindings: PackageImportBindings): Promise<WorkflowImportResult>;
     private applyItem;
     private persistWorkflow;
 }

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

@@ -79,26 +79,27 @@ let WorkflowImporter = class WorkflowImporter {
             ];
         });
     }
-    async apply(plan, context, bindings) {
+    async apply(context, plan, bindings) {
         const workflowBindings = new Map(bindings.workflows);
         const outcomes = [];
         for (const item of plan.items) {
-            const outcome = await this.applyItem(item, context, bindings);
+            const outcome = await this.applyItem(context, item, bindings);
             outcomes.push(outcome);
             workflowBindings.set(outcome.sourceWorkflowId, outcome.workflow.id);
         }
         return { outcomes, bindings: { ...bindings, workflows: workflowBindings } };
     }
-    async applyItem(item, context, bindings) {
+    async applyItem(context, item, bindings) {
         if (item.action === 'skip') {
             return {
                 status: 'skipped',
                 workflow: item.existing,
                 sourceWorkflowId: item.sourceWorkflowId,
+                publishing: { state: 'unchanged' },
             };
         }
-        const savedWorkflow = await this.persistWorkflow(context, item, bindings.credentials);
-        const workflow = await this.workflowPublisher.apply(context.user, item, savedWorkflow, context.publishingPolicy);
+        const savedWorkflow = await this.persistWorkflow(context, item, bindings);
+        const { workflow, publishing } = await this.workflowPublisher.apply(context.user, item, savedWorkflow, context.publishingPolicy, context.publishBlockedSourceWorkflowIds);
         workflow.parentFolder =
             workflow.parentFolder ??
                 savedWorkflow.parentFolder ??
@@ -108,11 +109,12 @@ let WorkflowImporter = class WorkflowImporter {
             status: item.action === 'create' ? 'created' : 'updated',
             workflow,
             sourceWorkflowId: item.sourceWorkflowId,
+            publishing,
         };
     }
-    async persistWorkflow(context, item, credentialBindings) {
+    async persistWorkflow(context, item, bindings) {
         if (item.action === 'create') {
-            const entity = prepareEntityForPersist(item.entity, credentialBindings, item.decidedId);
+            const entity = prepareEntityForPersist(item.entity, bindings, item.decidedId);
             return await this.workflowCreationService.createWorkflow(context.user, entity, {
                 projectId: context.projectId,
                 parentFolderId: context.folderId ?? undefined,
@@ -121,7 +123,7 @@ let WorkflowImporter = class WorkflowImporter {
                 sourceWorkflowId: item.sourceWorkflowId,
             });
         }
-        const entity = prepareEntityForPersist(item.entity, credentialBindings);
+        const entity = prepareEntityForPersist(item.entity, bindings);
         return await this.workflowService.update(context.user, entity, item.existing.id, {
             publicApi: true,
             source: 'import',
@@ -136,12 +138,12 @@ exports.WorkflowImporter = WorkflowImporter = __decorate([
         workflow_service_1.WorkflowService,
         workflow_publisher_1.WorkflowPublisher])
 ], WorkflowImporter);
-function prepareEntityForPersist(source, credentialBindings, decidedId) {
+function prepareEntityForPersist(source, bindings, decidedId) {
     const entity = Object.assign(new db_1.WorkflowEntity(), source, {
         nodes: structuredClone(source.nodes),
         ...(decidedId !== undefined ? { id: decidedId } : {}),
     });
-    applyCredentialBindingsInPlace(entity, credentialBindings);
+    applyCredentialBindingsInPlace(entity, bindings.credentials);
     return entity;
 }
 function applyCredentialBindingsInPlace(entity, credentialBindings) {

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

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

package/dist/modules/n8n-packages/entities/workflow/workflow-publisher.d.ts

@@ -4,7 +4,11 @@ import { ProjectRepository } from '@n8n/db';
 import { ProjectService } from '../../../../services/project.service.ee';
 import { WorkflowService } from '../../../../workflows/workflow.service';
 import type { PersistedWorkflowPlanItem } from './workflow-import.types';
-import { WorkflowPublishingPolicy } from './workflow-publishing-policy.types';
+import { WorkflowPublishingPolicy, type WorkflowPublishingOutcome } from './workflow-publishing-policy.types';
+export interface WorkflowPublishingResult {
+    workflow: WorkflowEntity;
+    publishing: WorkflowPublishingOutcome;
+}
 export declare class WorkflowPublisher {
     private readonly logger;
     private readonly projectRepository;
@@ -12,5 +16,5 @@ export declare class WorkflowPublisher {
     private readonly workflowService;
     constructor(logger: Logger, projectRepository: ProjectRepository, projectService: ProjectService, workflowService: WorkflowService);
     assertCanPublish(user: User, projectId: string, policy: WorkflowPublishingPolicy): Promise<void>;
-    apply(user: User, item: PersistedWorkflowPlanItem, workflow: WorkflowEntity, policy: WorkflowPublishingPolicy): Promise<WorkflowEntity>;
+    apply(user: User, item: PersistedWorkflowPlanItem, workflow: WorkflowEntity, policy: WorkflowPublishingPolicy, publishBlockedSourceWorkflowIds?: ReadonlySet<string>): Promise<WorkflowPublishingResult>;
 }

package/dist/modules/n8n-packages/entities/workflow/workflow-publisher.js

@@ -42,29 +42,51 @@ let WorkflowPublisher = class WorkflowPublisher {
         }
         throw new forbidden_error_1.ForbiddenError('You do not have permission to publish workflows in this project.');
     }
-    async apply(user, item, workflow, policy) {
+    async apply(user, item, workflow, policy, publishBlockedSourceWorkflowIds) {
         const action = (0, workflow_publishing_policy_1.decideWorkflowPublishingAction)(policy, toPublishingContext(item, workflow));
         if (action === 'noop') {
-            return workflow;
+            return { workflow, publishing: { state: 'unchanged' } };
+        }
+        if (action === 'publish' && publishBlockedSourceWorkflowIds?.has(item.sourceWorkflowId)) {
+            if (workflow.activeVersionId) {
+                return {
+                    workflow,
+                    publishing: {
+                        state: 'unchanged',
+                        skippedPublishReason: 'stub-credential',
+                    },
+                };
+            }
+            return {
+                workflow,
+                publishing: { state: 'blocked', blockedReason: 'stub-credential' },
+            };
         }
         try {
             if (action === 'publish') {
-                return await this.workflowService.activateWorkflow(user, workflow.id, {
-                    versionId: workflow.versionId,
-                    source: 'import',
-                });
+                return {
+                    workflow: await this.workflowService.activateWorkflow(user, workflow.id, {
+                        versionId: workflow.versionId,
+                        source: 'import',
+                    }),
+                    publishing: { state: 'published' },
+                };
             }
-            return await this.workflowService.deactivateWorkflow(user, workflow.id, {
-                source: 'import',
-            });
+            return {
+                workflow: await this.workflowService.deactivateWorkflow(user, workflow.id, {
+                    source: 'import',
+                }),
+                publishing: { state: 'unpublished' },
+            };
         }
         catch (error) {
+            const message = (0, n8n_workflow_1.ensureError)(error).message;
             this.logger.warn('Failed to apply publishing policy to imported workflow', {
                 workflowId: workflow.id,
                 action,
-                error: (0, n8n_workflow_1.ensureError)(error).message,
+                error: message,
             });
-            return workflow;
+            return { workflow, publishing: { state: 'failed', error: message } };
         }
     }
 };

package/dist/modules/n8n-packages/entities/workflow/workflow-publisher.js.map

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

package/dist/modules/n8n-packages/entities/workflow/workflow-publishing-policy.types.d.ts

@@ -6,6 +6,14 @@ export declare const WorkflowPublishingPolicy: {
 };
 export type WorkflowPublishingPolicy = (typeof WorkflowPublishingPolicy)[keyof typeof WorkflowPublishingPolicy];
 export type PublishingAction = 'publish' | 'unpublish' | 'noop';
+export type WorkflowPublishingOutcomeState = 'published' | 'unpublished' | 'unchanged' | 'blocked' | 'failed';
+export type WorkflowPublishingBlockedReason = 'stub-credential';
+export interface WorkflowPublishingOutcome {
+    state: WorkflowPublishingOutcomeState;
+    error?: string;
+    blockedReason?: WorkflowPublishingBlockedReason;
+    skippedPublishReason?: WorkflowPublishingBlockedReason;
+}
 export interface WorkflowPublishingContext {
     status: 'created' | 'updated' | 'skipped';
     sourcePublished: boolean;

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

@@ -1,9 +1,10 @@
 import type { User } from '@n8n/db';
-import type { WorkflowPublishingPolicy } from './entities/workflow/workflow-publishing-policy.types';
+import type { WorkflowPublishingOutcome, WorkflowPublishingPolicy } from './entities/workflow/workflow-publishing-policy.types';
 export type { CredentialResolution } from './entities/credential/credential.types';
 export { WorkflowPublishingPolicy } from './entities/workflow/workflow-publishing-policy.types';
+export type { WorkflowPublishingOutcome } from './entities/workflow/workflow-publishing-policy.types';
 export type CredentialMatchingMode = 'id-only';
-export type CredentialMissingMode = 'must-preexist';
+export type CredentialMissingMode = 'must-preexist' | 'create-stub';
 export declare const WorkflowConflictPolicy: {
     readonly NewVersion: "new-version";
     readonly Fail: "fail";
@@ -35,6 +36,17 @@ export type ImportWorkflowProperties = {
     workflowPublishingPolicy: WorkflowPublishingPolicy;
     workflowIdPolicy: WorkflowIdPolicy;
 };
+export interface ImportContext {
+    user: User;
+    projectId: string;
+    folderId: string | null;
+}
+export type ImportPackageEventOptions = Omit<ImportCredentialProperties, 'credentialBindings'> & ImportWorkflowProperties;
+export type ImportAuditCredentialIds = {
+    matched: string[];
+    created: string[];
+    updated: string[];
+};
 export interface ImportedWorkflowSummary {
     sourceWorkflowId: string;
     localId: string;
@@ -42,6 +54,7 @@ export interface ImportedWorkflowSummary {
     projectId: string;
     parentFolderId: string | null;
     activeVersionId: string | null;
+    publishing: WorkflowPublishingOutcome;
     status: 'created' | 'updated' | 'skipped';
 }
 export type BlockingIssue = {
@@ -65,9 +78,11 @@ export type BlockingIssue = {
     name: string;
 } | {
     type: 'credential-unresolved';
-    kind: 'not_found' | 'unknown_type' | 'source_not_found';
+    kind: 'not_found' | 'unknown_type' | 'source_not_found' | 'type_mismatch';
     sourceId: string;
     targetId?: string;
+    expectedType?: string;
+    actualType?: string;
     usedByWorkflows: string[];
 };
 export type ImportBindingMap = Map<string, string>;
@@ -83,8 +98,13 @@ export interface ImportPackageSummary {
     sourceId: string;
     exportedAt: string;
 }
+export interface ImportCredentialSummary {
+    matched: string[];
+    stubbed: string[];
+}
 export interface ImportResult {
     package: ImportPackageSummary;
     workflows: ImportedWorkflowSummary[];
     bindings: SerializedBindings;
+    credentials: ImportCredentialSummary;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"n8n-packages.types.js","sourceRoot":"","sources":["../../../src/modules/n8n-packages/n8n-packages.types.ts"],"names":[],"mappings":";;;AAoHA,wCAMC;AAMD,8CAKC;AAhID,yGAAgG;AAAvF,4IAAA,wBAAwB,OAAA;AAMpB,QAAA,sBAAsB,GAAG;IAErC,UAAU,EAAE,aAAa;IAEzB,IAAI,EAAE,MAAM;IAEZ,IAAI,EAAE,MAAM;CACH,CAAC;AAEE,QAAA,gBAAgB,GAAG;IAE/B,GAAG,EAAE,KAAK;IAEV,MAAM,EAAE,QAAQ;CACP,CAAC;AA2FX,SAAgB,cAAc,CAAC,OAAuC,EAAE;IACvE,OAAO;QACN,SAAS,EAAE,IAAI,GAAG,EAAE;QACpB,WAAW,EAAE,IAAI,GAAG,EAAE;QACtB,GAAG,IAAI;KACP,CAAC;AACH,CAAC;AAMD,SAAgB,iBAAiB,CAAC,QAA+B;IAChE,OAAO;QACN,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC;QACjD,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC;KACrD,CAAC;AACH,CAAC"}
+{"version":3,"file":"n8n-packages.types.js","sourceRoot":"","sources":["../../../src/modules/n8n-packages/n8n-packages.types.ts"],"names":[],"mappings":";;;AAoJA,wCAMC;AAMD,8CAKC;AA7JD,yGAAgG;AAAvF,4IAAA,wBAAwB,OAAA;AAOpB,QAAA,sBAAsB,GAAG;IAErC,UAAU,EAAE,aAAa;IAEzB,IAAI,EAAE,MAAM;IAEZ,IAAI,EAAE,MAAM;CACH,CAAC;AAEE,QAAA,gBAAgB,GAAG;IAE/B,GAAG,EAAE,KAAK;IAEV,MAAM,EAAE,QAAQ;CACP,CAAC;AAuHX,SAAgB,cAAc,CAAC,OAAuC,EAAE;IACvE,OAAO;QACN,SAAS,EAAE,IAAI,GAAG,EAAE;QACpB,WAAW,EAAE,IAAI,GAAG,EAAE;QACtB,GAAG,IAAI;KACP,CAAC;AACH,CAAC;AAMD,SAAgB,iBAAiB,CAAC,QAA+B;IAChE,OAAO;QACN,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC;QACjD,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC;KACrD,CAAC;AACH,CAAC"}

package/dist/modules/oauth-jwe/oauth-jwe.schemas.d.ts

@@ -7,19 +7,19 @@ export declare const PublicJweJwkSchema: z.ZodDiscriminatedUnion<"kty", [z.ZodOb
     n: z.ZodString;
     e: z.ZodString;
 }, "strict", z.ZodTypeAny, {
+    use: "enc";
     e: string;
     kid: string;
     n: string;
     kty: "RSA";
     alg: "RSA-OAEP-256";
-    use: "enc";
 }, {
+    use: "enc";
     e: string;
     kid: string;
     n: string;
     kty: "RSA";
     alg: "RSA-OAEP-256";
-    use: "enc";
 }>, z.ZodObject<{
     kty: z.ZodLiteral<"EC">;
     kid: z.ZodString;
@@ -30,20 +30,20 @@ export declare const PublicJweJwkSchema: z.ZodDiscriminatedUnion<"kty", [z.ZodOb
     y: z.ZodString;
 }, "strict", z.ZodTypeAny, {
     y: string;
+    use: "enc";
     kid: string;
     crv: "P-256" | "P-384" | "P-521";
     x: string;
     kty: "EC";
     alg: "ECDH-ES" | "ECDH-ES+A128KW" | "ECDH-ES+A192KW" | "ECDH-ES+A256KW";
-    use: "enc";
 }, {
     y: string;
+    use: "enc";
     kid: string;
     crv: "P-256" | "P-384" | "P-521";
     x: string;
     kty: "EC";
     alg: "ECDH-ES" | "ECDH-ES+A128KW" | "ECDH-ES+A192KW" | "ECDH-ES+A256KW";
-    use: "enc";
 }>]>;
 export type PublicJweJwk = z.infer<typeof PublicJweJwkSchema>;
 export declare const JwksResponseSchema: z.ZodObject<{
@@ -55,19 +55,19 @@ export declare const JwksResponseSchema: z.ZodObject<{
         n: z.ZodString;
         e: z.ZodString;
     }, "strict", z.ZodTypeAny, {
+        use: "enc";
         e: string;
         kid: string;
         n: string;
         kty: "RSA";
         alg: "RSA-OAEP-256";
-        use: "enc";
     }, {
+        use: "enc";
         e: string;
         kid: string;
         n: string;
         kty: "RSA";
         alg: "RSA-OAEP-256";
-        use: "enc";
     }>, z.ZodObject<{
         kty: z.ZodLiteral<"EC">;
         kid: z.ZodString;
@@ -78,54 +78,54 @@ export declare const JwksResponseSchema: z.ZodObject<{
         y: z.ZodString;
     }, "strict", z.ZodTypeAny, {
         y: string;
+        use: "enc";
         kid: string;
         crv: "P-256" | "P-384" | "P-521";
         x: string;
         kty: "EC";
         alg: "ECDH-ES" | "ECDH-ES+A128KW" | "ECDH-ES+A192KW" | "ECDH-ES+A256KW";
-        use: "enc";
     }, {
         y: string;
+        use: "enc";
         kid: string;
         crv: "P-256" | "P-384" | "P-521";
         x: string;
         kty: "EC";
         alg: "ECDH-ES" | "ECDH-ES+A128KW" | "ECDH-ES+A192KW" | "ECDH-ES+A256KW";
-        use: "enc";
     }>]>, "many">;
 }, "strip", z.ZodTypeAny, {
     keys: ({
+        use: "enc";
         e: string;
         kid: string;
         n: string;
         kty: "RSA";
         alg: "RSA-OAEP-256";
-        use: "enc";
     } | {
         y: string;
+        use: "enc";
         kid: string;
         crv: "P-256" | "P-384" | "P-521";
         x: string;
         kty: "EC";
         alg: "ECDH-ES" | "ECDH-ES+A128KW" | "ECDH-ES+A192KW" | "ECDH-ES+A256KW";
-        use: "enc";
     })[];
 }, {
     keys: ({
+        use: "enc";
         e: string;
         kid: string;
         n: string;
         kty: "RSA";
         alg: "RSA-OAEP-256";
-        use: "enc";
     } | {
         y: string;
+        use: "enc";
         kid: string;
         crv: "P-256" | "P-384" | "P-521";
         x: string;
         kty: "EC";
         alg: "ECDH-ES" | "ECDH-ES+A128KW" | "ECDH-ES+A192KW" | "ECDH-ES+A256KW";
-        use: "enc";
     })[];
 }>;
 export type JwksResponse = z.infer<typeof JwksResponseSchema>;

package/dist/modules/oauth-server/oauth-consent.controller.js

@@ -43,6 +43,7 @@ let OAuthConsentController = class OAuthConsentController {
                 data: {
                     clientName: consentDetails.clientName,
                     clientId: consentDetails.clientId,
+                    redirectUri: consentDetails.redirectUri,
                     resourceName: consentDetails.resourceName,
                 },
             });

package/dist/modules/oauth-server/oauth-consent.controller.js.map

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

package/dist/modules/oauth-server/oauth-consent.service.d.ts

@@ -9,6 +9,7 @@ type ConsentDetailsResult = {
     clientName: string;
     clientId: string;
     resourceName?: string;
+    redirectUri?: string;
 } | {
     ok: false;
     reason: 'resource_unavailable';

package/dist/modules/oauth-server/oauth-consent.service.js

@@ -47,12 +47,14 @@ let OAuthConsentService = class OAuthConsentService {
                     clientName: client.name,
                     clientId: client.id,
                     resourceName: resource.displayName,
+                    redirectUri: sessionPayload.redirectUri,
                 };
             }
             return {
                 ok: true,
                 clientName: client.name,
                 clientId: client.id,
+                redirectUri: sessionPayload.redirectUri,
             };
         }
         catch (error) {

package/dist/modules/oauth-server/oauth-consent.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-consent.service.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-consent.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth-consent.service.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-consent.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/oauth-server/oauth-server.module.js

@@ -70,6 +70,6 @@ let OAuthServerModule = class OAuthServerModule {
 };
 exports.OAuthServerModule = OAuthServerModule;
 exports.OAuthServerModule = OAuthServerModule = __decorate([
-    (0, decorators_1.BackendModule)({ name: 'oauth-server', instanceTypes: ['main', 'webhook'] })
+    (0, decorators_1.BackendModule)({ name: 'oauth-server', instanceTypes: ['main', 'webhook', 'worker'] })
 ], OAuthServerModule);
 //# sourceMappingURL=oauth-server.module.js.map

package/dist/modules/oauth-server/oauth-server.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-server.module.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-server.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wFAAmF;AAEnF,gDAAgD;AAChD,gCAAoC;AACpC,uCAA4C;AAWrC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,KAAK,CAAC,IAAI;QAET,IAAI,cAAS,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;YAC7D,wDAAa,oBAAoB,GAAC,CAAC;YACnC,wDAAa,4BAA4B,GAAC,CAAC;YAC3C,wDAAa,4BAA4B,GAAC,CAAC;QAC5C,CAAC;QAKD,MAAM,EAAE,uBAAuB,EAAE,GAAG,wDACnC,+CAA+C,GAC/C,CAAC;QACF,MAAM,EAAE,iBAAiB,EAAE,GAAG,wDAAa,uBAAuB,GAAC,CAAC;QACpE,cAAS,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,gBAAgB,CAAC,cAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAE1F,MAAM,EAAE,kCAAkC,EAAE,GAAG,wDAC9C,uEAAuE,GACvE,CAAC;QACF,cAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC,gBAAgB,CACxD,cAAS,CAAC,GAAG,CAAC,kCAAkC,CAAC,CACjD,CAAC;QAEF,MAAM,EAAE,sCAAsC,EAAE,GAAG,wDAClD,4EAA4E,GAC5E,CAAC;QACF,cAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC,gBAAgB,CACxD,cAAS,CAAC,GAAG,CAAC,sCAAsC,CAAC,CACrD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,yCAAyC,GAAC,CAAC;QAChF,MAAM,EAAE,iBAAiB,EAAE,GAAG,wDAC7B,qDAAqD,GACrD,CAAC;QACF,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,+CAA+C,GAAC,CAAC;QACtF,MAAM,EAAE,YAAY,EAAE,GAAG,wDAAa,gDAAgD,GAAC,CAAC;QACxF,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,+CAA+C,GAAC,CAAC;QAEtF,OAAO,CAAC,WAAW,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,CAAU,CAAC;IAC1F,CAAC;CACD,CAAA;AA5CY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,CAAC;GAC/D,iBAAiB,CA4C7B"}
+{"version":3,"file":"oauth-server.module.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-server.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wFAAmF;AAEnF,gDAAgD;AAChD,gCAAoC;AACpC,uCAA4C;AAerC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,KAAK,CAAC,IAAI;QAET,IAAI,cAAS,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;YAC7D,wDAAa,oBAAoB,GAAC,CAAC;YACnC,wDAAa,4BAA4B,GAAC,CAAC;YAC3C,wDAAa,4BAA4B,GAAC,CAAC;QAC5C,CAAC;QAKD,MAAM,EAAE,uBAAuB,EAAE,GAAG,wDACnC,+CAA+C,GAC/C,CAAC;QACF,MAAM,EAAE,iBAAiB,EAAE,GAAG,wDAAa,uBAAuB,GAAC,CAAC;QACpE,cAAS,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,gBAAgB,CAAC,cAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAE1F,MAAM,EAAE,kCAAkC,EAAE,GAAG,wDAC9C,uEAAuE,GACvE,CAAC;QACF,cAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC,gBAAgB,CACxD,cAAS,CAAC,GAAG,CAAC,kCAAkC,CAAC,CACjD,CAAC;QAEF,MAAM,EAAE,sCAAsC,EAAE,GAAG,wDAClD,4EAA4E,GAC5E,CAAC;QACF,cAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC,gBAAgB,CACxD,cAAS,CAAC,GAAG,CAAC,sCAAsC,CAAC,CACrD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,yCAAyC,GAAC,CAAC;QAChF,MAAM,EAAE,iBAAiB,EAAE,GAAG,wDAC7B,qDAAqD,GACrD,CAAC;QACF,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,+CAA+C,GAAC,CAAC;QACtF,MAAM,EAAE,YAAY,EAAE,GAAG,wDAAa,gDAAgD,GAAC,CAAC;QACxF,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,+CAA+C,GAAC,CAAC;QAEtF,OAAO,CAAC,WAAW,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,CAAU,CAAC;IAC1F,CAAC;CACD,CAAA;AA5CY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC;GACzE,iBAAiB,CA4C7B"}

package/dist/modules/oauth-server/oauth-server.service.d.ts

@@ -31,6 +31,8 @@ export declare class OAuthServerService implements OAuthServerProvider {
     }>;
     private enforceClientLimit;
     private validateClientRegistration;
+    private isRedirectUriAllowed;
+    private isLoopbackHost;
     authorize(client: OAuthClientInformationFull, params: AuthorizationParams, res: Response): Promise<void>;
     challengeForAuthorizationCode(client: OAuthClientInformationFull, authorizationCode: string): Promise<string>;
     exchangeAuthorizationCode(client: OAuthClientInformationFull, authorizationCode: string, _codeVerifier?: string, redirectUri?: string, resource?: URL): Promise<OAuthTokens>;