n8n 1.91.0 → 1.92.0

package/dist/services/folder.service.d.ts

@@ -1,6 +1,6 @@
 import type { CreateFolderDto, DeleteFolderDto, UpdateFolderDto } from '@n8n/api-types';
+import { Folder } from '@n8n/db';
 import type { EntityManager } from '@n8n/typeorm';
-import { Folder } from '../databases/entities/folder';
 import { FolderTagMappingRepository } from '../databases/repositories/folder-tag-mapping.repository';
 import { FolderRepository } from '../databases/repositories/folder.repository';
 import { WorkflowRepository } from '../databases/repositories/workflow.repository';
@@ -20,11 +20,13 @@ export declare class FolderService {
         parentFolderId: string | null;
         parentFolder: Folder | null;
         subFolders: Folder[];
-        workflows: import("../databases/entities/workflow-entity").WorkflowEntity[];
-        tags: import("../databases/entities/tag-entity").TagEntity[];
+        workflows: import("@n8n/db").WorkflowEntity[];
+        tags: import("@n8n/db").TagEntity[];
         id: string;
+        generateId(): void;
         createdAt: Date;
         updatedAt: Date;
+        setUpdateDate(): void;
         workflowCount: boolean;
         subFolderCount: number;
     }>;
@@ -38,5 +40,5 @@ export declare class FolderService {
         totalSubFolders: number;
         totalWorkflows: number;
     }>;
-    getManyAndCount(projectId: string, options: ListQuery.Options): Promise<[import("../databases/entities/folder").FolderWithWorkflowAndSubFolderCount[], number]>;
+    getManyAndCount(projectId: string, options: ListQuery.Options): Promise<[import("@n8n/db").FolderWithWorkflowAndSubFolderCount[], number]>;
 }

package/dist/services/folder.service.js

@@ -10,9 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FolderService = void 0;
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const n8n_workflow_1 = require("n8n-workflow");
-const folder_1 = require("../databases/entities/folder");
 const folder_tag_mapping_repository_1 = require("../databases/repositories/folder-tag-mapping.repository");
 const folder_repository_1 = require("../databases/repositories/folder.repository");
 const workflow_repository_1 = require("../databases/repositories/workflow.repository");
@@ -108,7 +108,7 @@ let FolderService = class FolderService {
         return await this.folderRepository.manager.transaction(async (tx) => {
             await this.folderRepository.moveAllToFolder(folderId, transferToFolderId, tx);
             await this.workflowRepository.moveAllToFolder(folderId, transferToFolderId, tx);
-            await tx.delete(folder_1.Folder, { id: folderId });
+            await tx.delete(db_1.Folder, { id: folderId });
             return;
         });
     }

package/dist/services/folder.service.js.map

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

package/dist/services/hooks.service.d.ts

@@ -1,13 +1,9 @@
+import type { Settings, CredentialsEntity, User, WorkflowEntity, AuthUser } from '@n8n/db';
 import type { FindManyOptions, FindOneOptions, FindOptionsWhere } from '@n8n/typeorm';
 import type { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPartialEntity';
 import RudderStack, { type constructorOptions } from '@rudderstack/rudder-sdk-node';
 import type { NextFunction, Response } from 'express';
 import { AuthService } from '../auth/auth.service';
-import type { AuthUser } from '../databases/entities/auth-user';
-import type { CredentialsEntity } from '../databases/entities/credentials-entity';
-import type { Settings } from '../databases/entities/settings';
-import type { User } from '../databases/entities/user';
-import type { WorkflowEntity } from '../databases/entities/workflow-entity';
 import { AuthUserRepository } from '../databases/repositories/auth-user.repository';
 import { CredentialsRepository } from '../databases/repositories/credentials.repository';
 import { SettingsRepository } from '../databases/repositories/settings.repository';

package/dist/services/hooks.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.service.js","sourceRoot":"","sources":["../../src/services/hooks.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gCAAkC;AAIlC,mFAAoF;AAGpF,sDAAkD;AAMlD,wFAAmF;AACnF,4FAAwF;AACxF,sFAAkF;AAClF,8EAA0E;AAC1E,sFAAkF;AAGlF,0DAAsD;AAO/C,IAAM,YAAY,GAAlB,MAAM,YAAY;IACxB,YACkB,WAAwB,EACxB,WAAwB,EACxB,cAA8B,EAC9B,kBAAsC,EACtC,kBAAsC,EACtC,qBAA4C,EAC5C,kBAAsC;QANtC,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,uBAAkB,GAAlB,kBAAkB,CAAoB;IACrD,CAAC;IAKJ,KAAK,CAAC,WAAW,CAAC,KAAW,EAAE,UAAwB;QACtD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC9D,CAAC;IAMD,WAAW,CAAC,GAAa,EAAE,IAAc;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IAOD,KAAK,CAAC,WAAW,CAAC,MAAgC;QACjD,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAKD,KAAK,CAAC,QAAQ,CAAC,IAAU;QACxB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,MAAkC,EAAE,GAAqC;QAC7F,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,MAAuC;QAC3D,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAMD,KAAK,CAAC,gBAAgB,CAAC,MAA0C;QAChE,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAMD,KAAK,CAAC,aAAa,CAAC,MAAiC;QACpD,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,GAAyB,EAAE,GAAa,EAAE,IAAkB;QAChF,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,oBAAoB,CAAC,GAAW,EAAE,OAA2B;QAC5D,OAAO,IAAI,yBAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;IAMD,aAAa;QACZ,OAAO;YACN,IAAI,EAAE,IAAI,CAAC,cAAc;YACzB,QAAQ,EAAE,IAAI,CAAC,kBAAkB;YACjC,WAAW,EAAE,IAAI,CAAC,qBAAqB;YACvC,QAAQ,EAAE,IAAI,CAAC,kBAAkB;SACjC,CAAC;IACH,CAAC;CACD,CAAA;AAlGY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,YAAO,GAAE;qCAGsB,0BAAW;QACX,0BAAW;QACR,gCAAc;QACV,wCAAkB;QAClB,wCAAkB;QACf,8CAAqB;QACxB,yCAAkB;GAR5C,YAAY,CAkGxB"}
+{"version":3,"file":"hooks.service.js","sourceRoot":"","sources":["../../src/services/hooks.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,gCAAkC;AAIlC,mFAAoF;AAGpF,sDAAkD;AAClD,wFAAmF;AACnF,4FAAwF;AACxF,sFAAkF;AAClF,8EAA0E;AAC1E,sFAAkF;AAGlF,0DAAsD;AAO/C,IAAM,YAAY,GAAlB,MAAM,YAAY;IACxB,YACkB,WAAwB,EACxB,WAAwB,EACxB,cAA8B,EAC9B,kBAAsC,EACtC,kBAAsC,EACtC,qBAA4C,EAC5C,kBAAsC;QANtC,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,uBAAkB,GAAlB,kBAAkB,CAAoB;IACrD,CAAC;IAKJ,KAAK,CAAC,WAAW,CAAC,KAAW,EAAE,UAAwB;QACtD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC9D,CAAC;IAMD,WAAW,CAAC,GAAa,EAAE,IAAc;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IAOD,KAAK,CAAC,WAAW,CAAC,MAAgC;QACjD,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAKD,KAAK,CAAC,QAAQ,CAAC,IAAU;QACxB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,MAAkC,EAAE,GAAqC;QAC7F,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,MAAuC;QAC3D,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAMD,KAAK,CAAC,gBAAgB,CAAC,MAA0C;QAChE,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAMD,KAAK,CAAC,aAAa,CAAC,MAAiC;QACpD,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,GAAyB,EAAE,GAAa,EAAE,IAAkB;QAChF,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,oBAAoB,CAAC,GAAW,EAAE,OAA2B;QAC5D,OAAO,IAAI,yBAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;IAMD,aAAa;QACZ,OAAO;YACN,IAAI,EAAE,IAAI,CAAC,cAAc;YACzB,QAAQ,EAAE,IAAI,CAAC,kBAAkB;YACjC,WAAW,EAAE,IAAI,CAAC,qBAAqB;YACvC,QAAQ,EAAE,IAAI,CAAC,kBAAkB;SACjC,CAAC;IACH,CAAC;CACD,CAAA;AAlGY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,YAAO,GAAE;qCAGsB,0BAAW;QACX,0BAAW;QACR,gCAAc;QACV,wCAAkB;QAClB,wCAAkB;QACf,8CAAqB;QACxB,yCAAkB;GAR5C,YAAY,CAkGxB"}

package/dist/services/import.service.d.ts

@@ -1,8 +1,8 @@
+import type { IWorkflowDb } from '@n8n/db';
 import { Logger } from 'n8n-core';
 import { type IWorkflowBase } from 'n8n-workflow';
 import { CredentialsRepository } from '../databases/repositories/credentials.repository';
 import { TagRepository } from '../databases/repositories/tag.repository';
-import type { IWorkflowDb } from '../interfaces';
 export declare class ImportService {
     private readonly logger;
     private readonly credentialsRepository;

package/dist/services/import.service.js

@@ -43,13 +43,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImportService = void 0;
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const uuid_1 = require("uuid");
-const project_1 = require("../databases/entities/project");
-const shared_workflow_1 = require("../databases/entities/shared-workflow");
-const workflow_entity_1 = require("../databases/entities/workflow-entity");
-const workflow_tag_mapping_1 = require("../databases/entities/workflow-tag-mapping");
 const credentials_repository_1 = require("../databases/repositories/credentials.repository");
 const tag_repository_1 = require("../databases/repositories/tag.repository");
 const Db = __importStar(require("../db"));
@@ -84,18 +81,18 @@ let ImportService = class ImportService {
                     workflow.active = false;
                     this.logger.info(`Deactivating workflow "${workflow.name}". Remember to activate later.`);
                 }
-                const exists = workflow.id ? await tx.existsBy(workflow_entity_1.WorkflowEntity, { id: workflow.id }) : false;
-                const upsertResult = await tx.upsert(workflow_entity_1.WorkflowEntity, workflow, ['id']);
+                const exists = workflow.id ? await tx.existsBy(db_1.WorkflowEntity, { id: workflow.id }) : false;
+                const upsertResult = await tx.upsert(db_1.WorkflowEntity, workflow, ['id']);
                 const workflowId = upsertResult.identifiers.at(0)?.id;
-                const personalProject = await tx.findOneByOrFail(project_1.Project, { id: projectId });
+                const personalProject = await tx.findOneByOrFail(db_1.Project, { id: projectId });
                 if (!exists) {
-                    await tx.upsert(shared_workflow_1.SharedWorkflow, { workflowId, projectId: personalProject.id, role: 'workflow:owner' }, ['workflowId', 'projectId']);
+                    await tx.upsert(db_1.SharedWorkflow, { workflowId, projectId: personalProject.id, role: 'workflow:owner' }, ['workflowId', 'projectId']);
                 }
                 if (!workflow.tags?.length)
                     continue;
                 await this.tagRepository.setTags(tx, this.dbTags, workflow);
                 for (const tag of workflow.tags) {
-                    await tx.upsert(workflow_tag_mapping_1.WorkflowTagMapping, { tagId: tag.id, workflowId }, [
+                    await tx.upsert(db_1.WorkflowTagMapping, { tagId: tag.id, workflowId }, [
                         'tagId',
                         'workflowId',
                     ]);

package/dist/services/import.service.js.map

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

package/dist/services/ownership.service.d.ts

@@ -1,10 +1,8 @@
-import type { Project } from '../databases/entities/project';
-import type { User } from '../databases/entities/user';
+import type { Project, User, ListQueryDb } from '@n8n/db';
 import { ProjectRelationRepository } from '../databases/repositories/project-relation.repository';
 import { ProjectRepository } from '../databases/repositories/project.repository';
 import { SharedWorkflowRepository } from '../databases/repositories/shared-workflow.repository';
 import { UserRepository } from '../databases/repositories/user.repository';
-import type { ListQuery } from '../requests';
 import { CacheService } from '../services/cache/cache.service';
 export declare class OwnershipService {
     private cacheService;
@@ -15,7 +13,7 @@ export declare class OwnershipService {
     constructor(cacheService: CacheService, userRepository: UserRepository, projectRepository: ProjectRepository, projectRelationRepository: ProjectRelationRepository, sharedWorkflowRepository: SharedWorkflowRepository);
     getWorkflowProjectCached(workflowId: string): Promise<Project>;
     getPersonalProjectOwnerCached(projectId: string): Promise<User | null>;
-    addOwnedByAndSharedWith(rawWorkflow: ListQuery.Workflow.WithSharing): ListQuery.Workflow.WithOwnedByAndSharedWith;
-    addOwnedByAndSharedWith(rawCredential: ListQuery.Credentials.WithSharing): ListQuery.Credentials.WithOwnedByAndSharedWith;
+    addOwnedByAndSharedWith(rawWorkflow: ListQueryDb.Workflow.WithSharing): ListQueryDb.Workflow.WithOwnedByAndSharedWith;
+    addOwnedByAndSharedWith(rawCredential: ListQueryDb.Credentials.WithSharing): ListQueryDb.Credentials.WithOwnedByAndSharedWith;
     getInstanceOwner(): Promise<User>;
 }

package/dist/services/ownership.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"ownership.service.js","sourceRoot":"","sources":["../../src/services/ownership.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAIlC,sGAAiG;AACjG,oFAAgF;AAChF,oGAA+F;AAC/F,8EAA0E;AAE1E,kEAA8D;AAGvD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC5B,YACS,YAA0B,EAC1B,cAA8B,EAC9B,iBAAoC,EACpC,yBAAoD,EACpD,wBAAkD;QAJlD,iBAAY,GAAZ,YAAY,CAAc;QAC1B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,6BAAwB,GAAxB,wBAAwB,CAA0B;IACxD,CAAC;IAKJ,KAAK,CAAC,wBAAwB,CAAC,UAAkB;QAChD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CACvD,kBAAkB,EAClB,UAAU,CACV,CAAC;QAEF,IAAI,WAAW;YAAE,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAEnE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,aAAa,CAAC;YACxE,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE;YAC7C,SAAS,EAAE,CAAC,SAAS,CAAC;SACtB,CAAC,CAAC;QAEH,KAAK,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC;QAE7F,OAAO,cAAc,CAAC,OAAO,CAAC;IAC/B,CAAC;IAMD,KAAK,CAAC,6BAA6B,CAAC,SAAiB;QACpD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAO,eAAe,EAAE,SAAS,CAAC,CAAC;QAE3F,IAAI,WAAW;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAEhE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAC5F,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,IAAI,CAAC;QACxC,KAAK,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAExE,OAAO,KAAK,CAAC;IACd,CAAC;IAQD,uBAAuB,CACtB,SAA6E;QAE7E,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;QAChC,MAAM,MAAM,GAAG,SAEkC,CAAC;QAElD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;YACrB,WAAW,EAAE,IAAI;YACjB,kBAAkB,EAAE,EAAE;SACtB,CAAC,CAAC;QAEH,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC;QACf,CAAC;QAED,KAAK,MAAM,YAAY,IAAI,MAAM,EAAE,CAAC;YACnC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC;YAEvC,IAAI,IAAI,KAAK,kBAAkB,IAAI,IAAI,KAAK,gBAAgB,EAAE,CAAC;gBAC9D,MAAM,CAAC,WAAW,GAAG;oBACpB,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;iBAClB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC;oBAC9B,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;iBAClB,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAED,KAAK,CAAC,gBAAgB;QACrB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YAC9C,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE;SAC/B,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAjGY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,YAAO,GAAE;qCAGc,4BAAY;QACV,gCAAc;QACX,sCAAiB;QACT,uDAAyB;QAC1B,qDAAwB;GAN/C,gBAAgB,CAiG5B"}
+{"version":3,"file":"ownership.service.js","sourceRoot":"","sources":["../../src/services/ownership.service.ts"],"names":[],"mappings":"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"}

package/dist/services/project.service.ee.d.ts

@@ -1,10 +1,9 @@
 import type { CreateProjectDto, ProjectRole, ProjectType, UpdateProjectDto } from '@n8n/api-types';
+import type { User } from '@n8n/db';
+import { Project, ProjectRelation } from '@n8n/db';
 import { type Scope } from '@n8n/permissions';
 import type { EntityManager } from '@n8n/typeorm';
 import { UserError } from 'n8n-workflow';
-import { Project } from '../databases/entities/project';
-import { ProjectRelation } from '../databases/entities/project-relation';
-import type { User } from '../databases/entities/user';
 import { ProjectRelationRepository } from '../databases/repositories/project-relation.repository';
 import { ProjectRepository } from '../databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '../databases/repositories/shared-credentials.repository';

package/dist/services/project.service.ee.js

@@ -44,11 +44,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectService = exports.UnlicensedProjectRoleError = exports.TeamProjectOverQuotaError = void 0;
 const constants_1 = require("@n8n/constants");
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const n8n_workflow_1 = require("n8n-workflow");
-const project_1 = require("../databases/entities/project");
-const project_relation_1 = require("../databases/entities/project-relation");
 const project_relation_repository_1 = require("../databases/repositories/project-relation.repository");
 const project_repository_1 = require("../databases/repositories/project.repository");
 const shared_credentials_repository_1 = require("../databases/repositories/shared-credentials.repository");
@@ -210,10 +209,10 @@ let ProjectService = class ProjectService {
         }
     }
     async pruneRelations(em, project) {
-        await em.delete(project_relation_1.ProjectRelation, { projectId: project.id });
+        await em.delete(db_1.ProjectRelation, { projectId: project.id });
     }
     async addManyRelations(em, project, relations) {
-        await em.insert(project_relation_1.ProjectRelation, relations.map((v) => this.projectRelationRepository.create({
+        await em.insert(db_1.ProjectRelation, relations.map((v) => this.projectRelationRepository.create({
             projectId: project.id,
             userId: v.userId,
             role: v.role,
@@ -234,7 +233,7 @@ let ProjectService = class ProjectService {
                 },
             };
         }
-        return await em.findOne(project_1.Project, {
+        return await em.findOne(db_1.Project, {
             where,
         });
     }

package/dist/services/project.service.ee.js.map

@@ -1 +1 @@
-{"version":3,"file":"project.service.ee.js","sourceRoot":"","sources":["../../src/services/project.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAAyD;AACzD,gCAA6C;AAK7C,0CAAuC;AACvC,+CAAyC;AAEzC,0DAAuD;AACvD,4EAAwE;AAExE,sGAAiG;AACjG,oFAAgF;AAChF,0GAAqG;AACrG,oGAA+F;AAC/F,kFAA6E;AAC7E,8EAA0E;AAC1E,8EAAyE;AACzE,uCAAoC;AAEpC,yDAAqD;AACrD,iDAA6C;AAE7C,MAAa,yBAA0B,SAAQ,wBAAS;IACvD,YAAY,KAAa;QACxB,KAAK,CACJ,+FAA+F,KAAK,iBAAiB,CACrH,CAAC;IACH,CAAC;CACD;AAND,8DAMC;AAED,MAAa,0BAA2B,SAAQ,wBAAS;IACxD,YAAY,IAAiB;QAC5B,KAAK,CAAC,8CAA8C,IAAI,IAAI,CAAC,CAAC;IAC/D,CAAC;CACD;AAJD,gEAIC;AAGM,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,YACkB,wBAAkD,EAClD,iBAAoC,EACpC,yBAAoD,EACpD,WAAwB,EACxB,2BAAwD,EACxD,YAA0B,EAC1B,OAAgB;QANhB,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,gBAAW,GAAX,WAAW,CAAa;QACxB,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,iBAAY,GAAZ,YAAY,CAAc;QAC1B,YAAO,GAAP,OAAO,CAAS;IAC/B,CAAC;IAEJ,IAAY,eAAe;QAC1B,OAAO,kDAAO,8BAA8B,IAAE,IAAI,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAC1E,cAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAC9B,CAAC;IACH,CAAC;IAED,IAAY,kBAAkB;QAC7B,OAAO,kDAAO,mCAAmC,IAAE,IAAI,CAAC,CAAC,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAClF,cAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,CACjC,CAAC;IACH,CAAC;IAED,IAAY,aAAa;QACxB,OAAO,kDAAO,2BAA2B,IAAE,IAAI,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CACrE,cAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAC5B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAClB,IAAU,EACV,SAAiB,EACjB,EAAE,gBAAgB,KAAoC,EAAE;QAExD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC;QACnD,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC;QAEzD,IAAI,SAAS,KAAK,gBAAgB,EAAE,CAAC;YACpC,MAAM,IAAI,mCAAe,CACxB,qHAAqH,CACrH,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,MAAM,IAAI,+BAAa,CAAC,mCAAmC,SAAS,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,aAAa,GAAmB,IAAI,CAAC;QACzC,IAAI,gBAAgB,EAAE,CAAC;YACtB,aAAa,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,EAAE;gBACtE,mBAAmB;gBACnB,iBAAiB;aACjB,CAAC,CAAC;YAEH,IAAI,CAAC,aAAa,EAAE,CAAC;gBACpB,MAAM,IAAI,+BAAa,CACtB,6CAA6C,aAAa,sFAAsF,CAChJ,CAAC;YACH,CAAC;QACF,CAAC;QAGD,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC7B,MAAM,IAAI,gCAAc,CACvB,0CAA0C,SAAS,0BAA0B,CAC7E,CAAC;QACH,CAAC;QAGD,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC;YACrE,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;SACxD,CAAC,CAAC;QAEH,IAAI,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAC5C,oBAAoB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,EAC/C,aAAa,CAAC,EAAE,CAChB,CAAC;QACH,CAAC;aAAM,CAAC;YACP,KAAK,MAAM,cAAc,IAAI,oBAAoB,EAAE,CAAC;gBACnD,MAAM,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;YAC/D,CAAC;QACF,CAAC;QAGD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC;YACpE,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE;YAC1D,SAAS,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;SAChC,CAAC,CAAC;QAEH,IAAI,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,2BAA2B,CAAC,SAAS,CAC/C,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,EAC9C,aAAa,CAAC,EAAE,CAChB,CAAC;QACH,CAAC;aAAM,CAAC;YACP,KAAK,MAAM,gBAAgB,IAAI,gBAAgB,EAAE,CAAC;gBACjD,MAAM,kBAAkB,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YACxE,CAAC;QACF,CAAC;QAGD,IAAI,aAAa,EAAE,CAAC;YACnB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC;YAC/C,MAAM,aAAa,CAAC,2BAA2B,CAAC,OAAO,CAAC,EAAE,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;QAC/E,CAAC;QASD,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAI9C,CAAC;IAMD,KAAK,CAAC,wBAAwB,CAAC,UAAkB;QAChD,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,IAAU;QAErC,IAAI,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC;YACzC,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;QAC5C,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,UAAoB;QAClD,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,SAAe,EAAE,IAAsB;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;QACjD,IACC,KAAK,KAAK,mCAAuB;YACjC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EACzE,CAAC;YACF,MAAM,IAAI,yBAAyB,CAAC,KAAK,CAAC,CAAC;QAC5C,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAChD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CACxD,CAAC;QAGF,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;QAE9D,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,aAAa,CAClB,SAAiB,EACjB,IAA6C;QAE7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;QAE1F,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtB,MAAM,IAAI,gCAAc,CAAC,mBAAmB,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAU;QAClC,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,IAAU;QAC1C,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC;YAChD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;YAC1B,SAAS,EAAE,CAAC,SAAS,CAAC;SACtB,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB,CACzB,SAAiB,EACjB,SAAuD;QAEvD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC;YAC1D,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAA,aAAG,EAAC,UAAU,CAAC,EAAE;YAC/C,SAAS,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE;SACrC,CAAC,CAAC;QAGH,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;YAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;YAG/E,IAAI,QAAQ,EAAE,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3E,MAAM,IAAI,0BAA0B,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC9C,CAAC;QACF,CAAC;QAED,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YACrE,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YACvC,MAAM,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,yCAAyC,CAAC,SAAS,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,yCAAyC,CAAC,SAAiB;QAChE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC;YAC1D,KAAK,EAAE;gBACN,SAAS;gBACT,IAAI,EAAE,kBAAkB;aACxB;YACD,MAAM,EAAE,CAAC,eAAe,CAAC;SACzB,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CACjC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,8BAA8B,KAAK,CAAC,aAAa,EAAE,CAAC,CAC1E,CAAC;QACH,CAAC;IACF,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EAAiB,EAAE,OAAgB;QACvD,MAAM,EAAE,CAAC,MAAM,CAAC,kCAAe,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,gBAAgB,CACrB,EAAiB,EACjB,OAAgB,EAChB,SAAuD;QAEvD,MAAM,EAAE,CAAC,MAAM,CACd,kCAAe,EACf,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC;YACrC,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,IAAI,EAAE,CAAC,CAAC,IAAI;SACZ,CAAC,CACF,CACD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,mBAAmB,CACxB,IAAU,EACV,SAAiB,EACjB,MAAe,EACf,aAA6B;QAE7B,MAAM,EAAE,GAAG,aAAa,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;QAC3D,IAAI,KAAK,GAA8B;YACtC,EAAE,EAAE,SAAS;SACb,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;YACrD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAExE,KAAK,GAAG;gBACP,GAAG,KAAK;gBACR,gBAAgB,EAAE;oBACjB,IAAI,EAAE,IAAA,YAAE,EAAC,YAAY,CAAC;oBACtB,MAAM,EAAE,IAAI,CAAC,EAAE;iBACf;aACD,CAAC;QACH,CAAC;QAED,OAAO,MAAM,EAAE,CAAC,OAAO,CAAC,iBAAO,EAAE;YAChC,KAAK;SACL,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,SAAiB,EAAE,MAAc,EAAE,IAAiB;QACjE,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC;YAChD,SAAS;YACT,MAAM;YACN,IAAI;SACJ,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB;QACjC,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC;YACjD,KAAK,EAAE;gBACN,EAAE,EAAE,SAAS;aACb;SACD,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,SAAiB;QAC1C,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC;YAChD,KAAK,EAAE,EAAE,SAAS,EAAE;YACpB,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;SACzB,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,MAAc;QAC/C,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;YACxC,KAAK,EAAE;gBACN,gBAAgB,EAAE;oBACjB,MAAM;oBACN,IAAI,EAAE,IAAA,YAAE,EAAC,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC;iBACpD;aACD;SACD,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,gBAAgB;QACrB,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;IACxD,CAAC;CACD,CAAA;AAtTY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,YAAO,GAAE;qCAGmC,qDAAwB;QAC/B,sCAAiB;QACT,uDAAyB;QACvC,0BAAW;QACK,2DAA2B;QAC1C,4BAAY;QACjB,iBAAO;GARtB,cAAc,CAsT1B"}
+{"version":3,"file":"project.service.ee.js","sourceRoot":"","sources":["../../src/services/project.service.ee.ts"],"names":[],"mappings":"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"}

package/dist/services/pruning/pruning.service.d.ts

@@ -1,20 +1,18 @@
 import { ExecutionsConfig } from '@n8n/config';
 import { BinaryDataService, InstanceSettings, Logger } from 'n8n-core';
 import { ExecutionRepository } from '../../databases/repositories/execution.repository';
-import { OrchestrationService } from '../orchestration.service';
 export declare class PruningService {
     private readonly logger;
     private readonly instanceSettings;
     private readonly executionRepository;
     private readonly binaryDataService;
-    private readonly orchestrationService;
     private readonly executionsConfig;
     private softDeletionInterval;
     private hardDeletionTimeout;
     private readonly rates;
     private readonly batchSize;
     private isShuttingDown;
-    constructor(logger: Logger, instanceSettings: InstanceSettings, executionRepository: ExecutionRepository, binaryDataService: BinaryDataService, orchestrationService: OrchestrationService, executionsConfig: ExecutionsConfig);
+    constructor(logger: Logger, instanceSettings: InstanceSettings, executionRepository: ExecutionRepository, binaryDataService: BinaryDataService, executionsConfig: ExecutionsConfig);
     init(): void;
     get isEnabled(): boolean;
     startPruning(): void;

package/dist/services/pruning/pruning.service.js

@@ -19,14 +19,12 @@ const node_assert_1 = require("node:assert");
 const constants_1 = require("../../constants");
 const execution_repository_1 = require("../../databases/repositories/execution.repository");
 const db_1 = require("../../db");
-const orchestration_service_1 = require("../orchestration.service");
 let PruningService = class PruningService {
-    constructor(logger, instanceSettings, executionRepository, binaryDataService, orchestrationService, executionsConfig) {
+    constructor(logger, instanceSettings, executionRepository, binaryDataService, executionsConfig) {
         this.logger = logger;
         this.instanceSettings = instanceSettings;
         this.executionRepository = executionRepository;
         this.binaryDataService = binaryDataService;
-        this.orchestrationService = orchestrationService;
         this.executionsConfig = executionsConfig;
         this.rates = {
             softDeletion: this.executionsConfig.pruneDataIntervals.softDelete * constants_1.Time.minutes.toMilliseconds,
@@ -40,10 +38,6 @@ let PruningService = class PruningService {
         (0, node_assert_1.strict)(this.instanceSettings.instanceRole !== 'unset', 'Instance role is not set');
         if (this.instanceSettings.isLeader)
             this.startPruning();
-        if (this.instanceSettings.isMultiMain) {
-            this.orchestrationService.multiMainSetup.on('leader-takeover', () => this.startPruning());
-            this.orchestrationService.multiMainSetup.on('leader-stepdown', () => this.stopPruning());
-        }
     }
     get isEnabled() {
         return (this.executionsConfig.pruneData &&
@@ -55,12 +49,14 @@ let PruningService = class PruningService {
             return;
         this.scheduleRollingSoftDeletions();
         this.scheduleNextHardDeletion();
+        this.logger.debug('Started pruning timers');
     }
     stopPruning() {
         if (!this.isEnabled)
             return;
         clearInterval(this.softDeletionInterval);
         clearTimeout(this.hardDeletionTimeout);
+        this.logger.debug('Stopped pruning timers');
     }
     scheduleRollingSoftDeletions(rateMs = this.rates.softDeletion) {
         this.softDeletionInterval = setInterval(async () => await this.softDelete(), this.rates.softDeletion);
@@ -113,6 +109,18 @@ let PruningService = class PruningService {
     }
 };
 exports.PruningService = PruningService;
+__decorate([
+    (0, decorators_1.OnLeaderTakeover)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], PruningService.prototype, "startPruning", null);
+__decorate([
+    (0, decorators_1.OnLeaderStepdown)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], PruningService.prototype, "stopPruning", null);
 __decorate([
     (0, decorators_1.OnShutdown)(),
     __metadata("design:type", Function),
@@ -125,7 +133,6 @@ exports.PruningService = PruningService = __decorate([
         n8n_core_1.InstanceSettings,
         execution_repository_1.ExecutionRepository,
         n8n_core_1.BinaryDataService,
-        orchestration_service_1.OrchestrationService,
         config_1.ExecutionsConfig])
 ], PruningService);
 //# sourceMappingURL=pruning.service.js.map

package/dist/services/pruning/pruning.service.js.map

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

package/dist/services/public-api-key.service.d.ts

@@ -1,11 +1,11 @@
 import type { UpdateApiKeyRequestDto } from '@n8n/api-types';
 import type { CreateApiKeyRequestDto } from '@n8n/api-types/src/dto/api-keys/create-api-key-request.dto';
+import { ApiKey } from '@n8n/db';
+import type { User } from '@n8n/db';
 import type { GlobalRole, ApiKeyScope } from '@n8n/permissions';
 import type { EntityManager } from '@n8n/typeorm';
 import type { NextFunction, Request, Response } from 'express';
 import type { OpenAPIV3 } from 'openapi-types';
-import { ApiKey } from '../databases/entities/api-key';
-import type { User } from '../databases/entities/user';
 import { ApiKeyRepository } from '../databases/repositories/api-key.repository';
 import { UserRepository } from '../databases/repositories/user.repository';
 import { EventService } from '../events/event.service';
@@ -26,8 +26,10 @@ export declare class PublicApiKeyService {
         label: string;
         scopes: ApiKeyScope[];
         id: string;
+        generateId(): void;
         createdAt: Date;
         updatedAt: Date;
+        setUpdateDate(): void;
     }[]>;
     deleteApiKeyForUser(user: User, apiKeyId: string): Promise<void>;
     updateApiKeyForUser(user: User, apiKeyId: string, { label, scopes }: UpdateApiKeyRequestDto): Promise<void>;

package/dist/services/public-api-key.service.js

@@ -10,9 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PublicApiKeyService = void 0;
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const jsonwebtoken_1 = require("jsonwebtoken");
-const api_key_1 = require("../databases/entities/api-key");
 const api_key_repository_1 = require("../databases/repositories/api-key.repository");
 const user_repository_1 = require("../databases/repositories/user.repository");
 const event_service_1 = require("../events/event.service");
@@ -61,7 +61,7 @@ let PublicApiKeyService = class PublicApiKeyService {
     async getUserForApiKey(apiKey) {
         return await this.userRepository
             .createQueryBuilder('user')
-            .innerJoin(api_key_1.ApiKey, 'apiKey', 'apiKey.userId = user.id')
+            .innerJoin(db_1.ApiKey, 'apiKey', 'apiKey.userId = user.id')
             .where('apiKey.apiKey = :apiKey', { apiKey })
             .select('user')
             .getOne();
@@ -135,11 +135,11 @@ let PublicApiKeyService = class PublicApiKeyService {
     async removeOwnerOnlyScopesFromApiKeys(user, tx) {
         const manager = tx ?? this.apiKeyRepository.manager;
         const ownerOnlyScopes = (0, permissions_ee_1.getOwnerOnlyApiKeyScopes)();
-        const userApiKeys = await manager.find(api_key_1.ApiKey, {
+        const userApiKeys = await manager.find(db_1.ApiKey, {
             where: { userId: user.id },
         });
         const keysWithOwnerScopes = userApiKeys.filter((apiKey) => apiKey.scopes.some((scope) => ownerOnlyScopes.includes(scope)));
-        return await Promise.all(keysWithOwnerScopes.map(async (currentApiKey) => await manager.update(api_key_1.ApiKey, currentApiKey.id, {
+        return await Promise.all(keysWithOwnerScopes.map(async (currentApiKey) => await manager.update(db_1.ApiKey, currentApiKey.id, {
             scopes: currentApiKey.scopes.filter((scope) => !ownerOnlyScopes.includes(scope)),
         })));
     }

package/dist/services/public-api-key.service.js.map

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

package/dist/services/role.service.d.ts

@@ -1,12 +1,7 @@
 import type { ProjectRole } from '@n8n/api-types';
+import type { CredentialsEntity, CredentialSharingRole, SharedCredentials, SharedWorkflow, WorkflowSharingRole, User, ListQueryDb, ScopesField, ProjectRelation } from '@n8n/db';
 import type { GlobalRole, Resource, Scope } from '@n8n/permissions';
-import type { CredentialsEntity } from '../databases/entities/credentials-entity';
-import type { ProjectRelation } from '../databases/entities/project-relation';
-import type { CredentialSharingRole, SharedCredentials } from '../databases/entities/shared-credentials';
-import type { SharedWorkflow, WorkflowSharingRole } from '../databases/entities/shared-workflow';
-import type { User } from '../databases/entities/user';
 import { License } from '../license';
-import type { ListQuery } from '../requests';
 export type RoleNamespace = 'global' | 'project' | 'credential' | 'workflow';
 export interface RoleMap {
     global: GlobalRole[];
@@ -15,9 +10,6 @@ export interface RoleMap {
     workflow: WorkflowSharingRole[];
 }
 export type AllRoleTypes = GlobalRole | ProjectRole | WorkflowSharingRole | CredentialSharingRole;
-export type ScopesField = {
-    scopes: Scope[];
-};
 export declare class RoleService {
     private readonly license;
     constructor(license: License);
@@ -29,9 +21,9 @@ export declare class RoleService {
     getRoleName(role: AllRoleTypes): string;
     getRoleScopes(role: GlobalRole | ProjectRole | WorkflowSharingRole | CredentialSharingRole, filters?: Resource[]): Scope[];
     getScopesBy(projectRoles: Set<ProjectRole>): Set<Scope>;
-    addScopes(rawWorkflow: ListQuery.Workflow.WithSharing | ListQuery.Workflow.WithOwnedByAndSharedWith, user: User, userProjectRelations: ProjectRelation[]): ListQuery.Workflow.WithScopes;
+    addScopes(rawWorkflow: ListQueryDb.Workflow.WithSharing | ListQueryDb.Workflow.WithOwnedByAndSharedWith, user: User, userProjectRelations: ProjectRelation[]): ListQueryDb.Workflow.WithScopes;
     addScopes(rawCredential: CredentialsEntity, user: User, userProjectRelations: ProjectRelation[]): CredentialsEntity & ScopesField;
-    addScopes(rawCredential: ListQuery.Credentials.WithSharing | ListQuery.Credentials.WithOwnedByAndSharedWith, user: User, userProjectRelations: ProjectRelation[]): ListQuery.Credentials.WithScopes;
+    addScopes(rawCredential: ListQueryDb.Credentials.WithSharing | ListQueryDb.Credentials.WithOwnedByAndSharedWith, user: User, userProjectRelations: ProjectRelation[]): ListQueryDb.Credentials.WithScopes;
     combineResourceScopes(type: 'workflow' | 'credential', user: User, shared: SharedCredentials[] | SharedWorkflow[], userProjectRelations: ProjectRelation[]): Scope[];
     isRoleLicensed(role: AllRoleTypes): boolean;
 }

package/dist/services/role.service.js

@@ -14,27 +14,24 @@ const di_1 = require("@n8n/di");
 const permissions_1 = require("@n8n/permissions");
 const n8n_workflow_1 = require("n8n-workflow");
 const license_1 = require("../license");
-const global_roles_1 = require("../permissions.ee/global-roles");
-const project_roles_1 = require("../permissions.ee/project-roles");
-const resource_roles_1 = require("../permissions.ee/resource-roles");
 const GLOBAL_SCOPE_MAP = {
-    'global:owner': global_roles_1.GLOBAL_OWNER_SCOPES,
-    'global:admin': global_roles_1.GLOBAL_ADMIN_SCOPES,
-    'global:member': global_roles_1.GLOBAL_MEMBER_SCOPES,
+    'global:owner': permissions_1.GLOBAL_OWNER_SCOPES,
+    'global:admin': permissions_1.GLOBAL_ADMIN_SCOPES,
+    'global:member': permissions_1.GLOBAL_MEMBER_SCOPES,
 };
 const PROJECT_SCOPE_MAP = {
-    'project:admin': project_roles_1.REGULAR_PROJECT_ADMIN_SCOPES,
-    'project:personalOwner': project_roles_1.PERSONAL_PROJECT_OWNER_SCOPES,
-    'project:editor': project_roles_1.PROJECT_EDITOR_SCOPES,
-    'project:viewer': project_roles_1.PROJECT_VIEWER_SCOPES,
+    'project:admin': permissions_1.REGULAR_PROJECT_ADMIN_SCOPES,
+    'project:personalOwner': permissions_1.PERSONAL_PROJECT_OWNER_SCOPES,
+    'project:editor': permissions_1.PROJECT_EDITOR_SCOPES,
+    'project:viewer': permissions_1.PROJECT_VIEWER_SCOPES,
 };
 const CREDENTIALS_SHARING_SCOPE_MAP = {
-    'credential:owner': resource_roles_1.CREDENTIALS_SHARING_OWNER_SCOPES,
-    'credential:user': resource_roles_1.CREDENTIALS_SHARING_USER_SCOPES,
+    'credential:owner': permissions_1.CREDENTIALS_SHARING_OWNER_SCOPES,
+    'credential:user': permissions_1.CREDENTIALS_SHARING_USER_SCOPES,
 };
 const WORKFLOW_SHARING_SCOPE_MAP = {
-    'workflow:owner': resource_roles_1.WORKFLOW_SHARING_OWNER_SCOPES,
-    'workflow:editor': resource_roles_1.WORKFLOW_SHARING_EDITOR_SCOPES,
+    'workflow:owner': permissions_1.WORKFLOW_SHARING_OWNER_SCOPES,
+    'workflow:editor': permissions_1.WORKFLOW_SHARING_EDITOR_SCOPES,
 };
 const ALL_MAPS = {
     global: GLOBAL_SCOPE_MAP,