n8n 1.90.2 → 1.91.0

package/dist/databases/repositories/credentials.repository.d.ts

@@ -1,12 +1,8 @@
-import type { Scope } from '@n8n/permissions';
 import { DataSource, Repository } from '@n8n/typeorm';
 import type { ListQuery } from '../../requests';
-import { RoleService } from '../../services/role.service';
 import { CredentialsEntity } from '../entities/credentials-entity';
-import type { User } from '../entities/user';
 export declare class CredentialsRepository extends Repository<CredentialsEntity> {
-    readonly roleService: RoleService;
-    constructor(dataSource: DataSource, roleService: RoleService);
+    constructor(dataSource: DataSource);
     findStartingWith(credentialName: string): Promise<CredentialsEntity[]>;
     findMany(listQueryOptions?: ListQuery.Options & {
         includeData?: boolean;
@@ -18,5 +14,4 @@ export declare class CredentialsRepository extends Repository<CredentialsEntity>
     findAllPersonalCredentials(): Promise<CredentialsEntity[]>;
     findAllCredentialsForWorkflow(workflowId: string): Promise<CredentialsEntity[]>;
     findAllCredentialsForProject(projectId: string): Promise<CredentialsEntity[]>;
-    findCredentialsForUser(user: User, scopes: Scope[]): Promise<CredentialsEntity[]>;
 }

package/dist/databases/repositories/credentials.repository.js

@@ -12,12 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CredentialsRepository = void 0;
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
-const role_service_1 = require("../../services/role.service");
 const credentials_entity_1 = require("../entities/credentials-entity");
 let CredentialsRepository = class CredentialsRepository extends typeorm_1.Repository {
-    constructor(dataSource, roleService) {
+    constructor(dataSource) {
         super(credentials_entity_1.CredentialsEntity, dataSource.manager);
-        this.roleService = roleService;
     }
     async findStartingWith(credentialName) {
         return await this.find({
@@ -96,31 +94,10 @@ let CredentialsRepository = class CredentialsRepository extends typeorm_1.Reposi
     async findAllCredentialsForProject(projectId) {
         return await this.findBy({ shared: { projectId } });
     }
-    async findCredentialsForUser(user, scopes) {
-        let where = {};
-        if (!user.hasGlobalScope(scopes, { mode: 'allOf' })) {
-            const projectRoles = this.roleService.rolesWithScope('project', scopes);
-            const credentialRoles = this.roleService.rolesWithScope('credential', scopes);
-            where = {
-                ...where,
-                shared: {
-                    role: (0, typeorm_1.In)(credentialRoles),
-                    project: {
-                        projectRelations: {
-                            role: (0, typeorm_1.In)(projectRoles),
-                            userId: user.id,
-                        },
-                    },
-                },
-            };
-        }
-        return await this.find({ where, relations: { shared: true } });
-    }
 };
 exports.CredentialsRepository = CredentialsRepository;
 exports.CredentialsRepository = CredentialsRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource,
-        role_service_1.RoleService])
+    __metadata("design:paramtypes", [typeorm_1.DataSource])
 ], CredentialsRepository);
 //# sourceMappingURL=credentials.repository.js.map

package/dist/databases/repositories/credentials.repository.js.map

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

package/dist/databases/repositories/shared-credentials.repository.d.ts

@@ -1,37 +1,17 @@
 import type { ProjectRole } from '@n8n/api-types';
-import type { Scope } from '@n8n/permissions';
-import type { EntityManager, FindOptionsRelations } from '@n8n/typeorm';
+import type { EntityManager, FindOptionsWhere } from '@n8n/typeorm';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { RoleService } from '../../services/role.service';
 import type { Project } from '../entities/project';
 import { type CredentialSharingRole, SharedCredentials } from '../entities/shared-credentials';
-import type { User } from '../entities/user';
 export declare class SharedCredentialsRepository extends Repository<SharedCredentials> {
-    private readonly roleService;
-    constructor(dataSource: DataSource, roleService: RoleService);
-    findCredentialForUser(credentialsId: string, user: User, scopes: Scope[], _relations?: FindOptionsRelations<SharedCredentials>): Promise<import("../entities/credentials-entity").CredentialsEntity | null>;
-    findAllCredentialsForUser(user: User, scopes: Scope[], trx?: EntityManager): Promise<{
-        projectId: string;
-        name: string;
-        data: string;
-        type: string;
-        shared: SharedCredentials[];
-        isManaged: boolean;
-        id: string;
-        createdAt: Date;
-        updatedAt: Date;
-    }[]>;
+    constructor(dataSource: DataSource);
     findByCredentialIds(credentialIds: string[], role: CredentialSharingRole): Promise<SharedCredentials[]>;
     makeOwnerOfAllCredentials(project: Project): Promise<import("@n8n/typeorm").UpdateResult>;
     makeOwner(credentialIds: string[], projectId: string, trx?: EntityManager): Promise<import("@n8n/typeorm").InsertResult>;
-    getCredentialIdsByUserAndRole(userIds: string[], options: {
-        scopes: Scope[];
-    } | {
-        projectRoles: ProjectRole[];
-        credentialRoles: CredentialSharingRole[];
-    }, trx?: EntityManager): Promise<string[]>;
     deleteByIds(sharedCredentialsIds: string[], projectId: string, trx?: EntityManager): Promise<import("@n8n/typeorm").DeleteResult>;
     getFilteredAccessibleCredentials(projectIds: string[], credentialsIds: string[]): Promise<string[]>;
     findCredentialOwningProject(credentialsId: string): Promise<Project | undefined>;
     getAllRelationsForCredentials(credentialIds: string[]): Promise<SharedCredentials[]>;
+    findCredentialsWithOptions(where?: FindOptionsWhere<SharedCredentials>, trx?: EntityManager): Promise<SharedCredentials[]>;
+    findCredentialsByRoles(userIds: string[], projectRoles: ProjectRole[], credentialRoles: CredentialSharingRole[], trx?: EntityManager): Promise<SharedCredentials[]>;
 }

package/dist/databases/repositories/shared-credentials.repository.js

@@ -12,66 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SharedCredentialsRepository = void 0;
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
-const role_service_1 = require("../../services/role.service");
 const shared_credentials_1 = require("../entities/shared-credentials");
 let SharedCredentialsRepository = class SharedCredentialsRepository extends typeorm_1.Repository {
-    constructor(dataSource, roleService) {
+    constructor(dataSource) {
         super(shared_credentials_1.SharedCredentials, dataSource.manager);
-        this.roleService = roleService;
-    }
-    async findCredentialForUser(credentialsId, user, scopes, _relations) {
-        let where = { credentialsId };
-        if (!user.hasGlobalScope(scopes, { mode: 'allOf' })) {
-            const projectRoles = this.roleService.rolesWithScope('project', scopes);
-            const credentialRoles = this.roleService.rolesWithScope('credential', scopes);
-            where = {
-                ...where,
-                role: (0, typeorm_1.In)(credentialRoles),
-                project: {
-                    projectRelations: {
-                        role: (0, typeorm_1.In)(projectRoles),
-                        userId: user.id,
-                    },
-                },
-            };
-        }
-        const sharedCredential = await this.findOne({
-            where,
-            relations: {
-                credentials: {
-                    shared: { project: { projectRelations: { user: true } } },
-                },
-            },
-        });
-        if (!sharedCredential)
-            return null;
-        return sharedCredential.credentials;
-    }
-    async findAllCredentialsForUser(user, scopes, trx) {
-        trx = trx ?? this.manager;
-        let where = {};
-        if (!user.hasGlobalScope(scopes, { mode: 'allOf' })) {
-            const projectRoles = this.roleService.rolesWithScope('project', scopes);
-            const credentialRoles = this.roleService.rolesWithScope('credential', scopes);
-            where = {
-                role: (0, typeorm_1.In)(credentialRoles),
-                project: {
-                    projectRelations: {
-                        role: (0, typeorm_1.In)(projectRoles),
-                        userId: user.id,
-                    },
-                },
-            };
-        }
-        const sharedCredential = await trx.find(shared_credentials_1.SharedCredentials, {
-            where,
-            relations: {
-                credentials: {
-                    shared: { project: { projectRelations: { user: true } } },
-                },
-            },
-        });
-        return sharedCredential.map((sc) => ({ ...sc.credentials, projectId: sc.projectId }));
     }
     async findByCredentialIds(credentialIds, role) {
         return await this.find({
@@ -96,27 +40,6 @@ let SharedCredentialsRepository = class SharedCredentialsRepository extends type
             role: 'credential:owner',
         })), ['projectId', 'credentialsId']);
     }
-    async getCredentialIdsByUserAndRole(userIds, options, trx) {
-        trx = trx ?? this.manager;
-        const projectRoles = 'scopes' in options
-            ? this.roleService.rolesWithScope('project', options.scopes)
-            : options.projectRoles;
-        const credentialRoles = 'scopes' in options
-            ? this.roleService.rolesWithScope('credential', options.scopes)
-            : options.credentialRoles;
-        const sharings = await trx.find(shared_credentials_1.SharedCredentials, {
-            where: {
-                role: (0, typeorm_1.In)(credentialRoles),
-                project: {
-                    projectRelations: {
-                        userId: (0, typeorm_1.In)(userIds),
-                        role: (0, typeorm_1.In)(projectRoles),
-                    },
-                },
-            },
-        });
-        return sharings.map((s) => s.credentialsId);
-    }
     async deleteByIds(sharedCredentialsIds, projectId, trx) {
         trx = trx ?? this.manager;
         return await trx.delete(shared_credentials_1.SharedCredentials, {
@@ -147,11 +70,35 @@ let SharedCredentialsRepository = class SharedCredentialsRepository extends type
             relations: ['project'],
         });
     }
+    async findCredentialsWithOptions(where = {}, trx) {
+        trx = trx ?? this.manager;
+        return await trx.find(shared_credentials_1.SharedCredentials, {
+            where,
+            relations: {
+                credentials: {
+                    shared: { project: { projectRelations: { user: true } } },
+                },
+            },
+        });
+    }
+    async findCredentialsByRoles(userIds, projectRoles, credentialRoles, trx) {
+        trx = trx ?? this.manager;
+        return await trx.find(shared_credentials_1.SharedCredentials, {
+            where: {
+                role: (0, typeorm_1.In)(credentialRoles),
+                project: {
+                    projectRelations: {
+                        userId: (0, typeorm_1.In)(userIds),
+                        role: (0, typeorm_1.In)(projectRoles),
+                    },
+                },
+            },
+        });
+    }
 };
 exports.SharedCredentialsRepository = SharedCredentialsRepository;
 exports.SharedCredentialsRepository = SharedCredentialsRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource,
-        role_service_1.RoleService])
+    __metadata("design:paramtypes", [typeorm_1.DataSource])
 ], SharedCredentialsRepository);
 //# sourceMappingURL=shared-credentials.repository.js.map

package/dist/databases/repositories/shared-credentials.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared-credentials.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/shared-credentials.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAAkC;AAGlC,0CAA+D;AAE/D,0DAAsD;AAGtD,uEAA+F;AAIxF,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,oBAA6B;IAC7E,YACC,UAAsB,EACL,WAAwB;QAEzC,KAAK,CAAC,sCAAiB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;QAF5B,gBAAW,GAAX,WAAW,CAAa;IAG1C,CAAC;IAGD,KAAK,CAAC,qBAAqB,CAC1B,aAAqB,EACrB,IAAU,EACV,MAAe,EACf,UAAoD;QAEpD,IAAI,KAAK,GAAwC,EAAE,aAAa,EAAE,CAAC;QAEnE,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;YACxE,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAC9E,KAAK,GAAG;gBACP,GAAG,KAAK;gBACR,IAAI,EAAE,IAAA,YAAE,EAAC,eAAe,CAAC;gBACzB,OAAO,EAAE;oBACR,gBAAgB,EAAE;wBACjB,IAAI,EAAE,IAAA,YAAE,EAAC,YAAY,CAAC;wBACtB,MAAM,EAAE,IAAI,CAAC,EAAE;qBACf;iBACD;aACD,CAAC;QACH,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;YAC3C,KAAK;YAEL,SAAS,EAAE;gBACV,WAAW,EAAE;oBACZ,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;iBACzD;aACD;SACD,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB;YAAE,OAAO,IAAI,CAAC;QACnC,OAAO,gBAAgB,CAAC,WAAW,CAAC;IACrC,CAAC;IAGD,KAAK,CAAC,yBAAyB,CAAC,IAAU,EAAE,MAAe,EAAE,GAAmB;QAC/E,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAE1B,IAAI,KAAK,GAAwC,EAAE,CAAC;QAEpD,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;YACxE,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAC9E,KAAK,GAAG;gBACP,IAAI,EAAE,IAAA,YAAE,EAAC,eAAe,CAAC;gBACzB,OAAO,EAAE;oBACR,gBAAgB,EAAE;wBACjB,IAAI,EAAE,IAAA,YAAE,EAAC,YAAY,CAAC;wBACtB,MAAM,EAAE,IAAI,CAAC,EAAE;qBACf;iBACD;aACD,CAAC;QACH,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,sCAAiB,EAAE;YAC1D,KAAK;YAEL,SAAS,EAAE;gBACV,WAAW,EAAE;oBACZ,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;iBACzD;aACD;SACD,CAAC,CAAC;QAEH,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,aAAuB,EAAE,IAA2B;QAC7E,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACtB,SAAS,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YAC/E,KAAK,EAAE;gBACN,aAAa,EAAE,IAAA,YAAE,EAAC,aAAa,CAAC;gBAChC,IAAI;aACJ;SACD,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,OAAgB;QAC/C,OAAO,MAAM,IAAI,CAAC,MAAM,CACvB;YACC,SAAS,EAAE,IAAA,aAAG,EAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,IAAI,EAAE,kBAAkB;SACxB,EACD,EAAE,OAAO,EAAE,CACX,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,aAAuB,EAAE,SAAiB,EAAE,GAAmB;QAC9E,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAC1B,OAAO,MAAM,GAAG,CAAC,MAAM,CACtB,sCAAiB,EACjB,aAAa,CAAC,GAAG,CAChB,CAAC,aAAa,EAAE,EAAE,CACjB,CAAC;YACA,SAAS;YACT,aAAa;YACb,IAAI,EAAE,kBAAkB;SACxB,CAAU,CACZ,EACD,CAAC,WAAW,EAAE,eAAe,CAAC,CAC9B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,6BAA6B,CAClC,OAAiB,EACjB,OAE4E,EAC5E,GAAmB;QAEnB,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAE1B,MAAM,YAAY,GACjB,QAAQ,IAAI,OAAO;YAClB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC;YAC5D,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;QACzB,MAAM,eAAe,GACpB,QAAQ,IAAI,OAAO;YAClB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC;YAC/D,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC;QAE5B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,sCAAiB,EAAE;YAClD,KAAK,EAAE;gBACN,IAAI,EAAE,IAAA,YAAE,EAAC,eAAe,CAAC;gBACzB,OAAO,EAAE;oBACR,gBAAgB,EAAE;wBACjB,MAAM,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC;wBACnB,IAAI,EAAE,IAAA,YAAE,EAAC,YAAY,CAAC;qBACtB;iBACD;aACD;SACD,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,oBAA8B,EAAE,SAAiB,EAAE,GAAmB;QACvF,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAE1B,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,sCAAiB,EAAE;YAC1C,SAAS;YACT,aAAa,EAAE,IAAA,YAAE,EAAC,oBAAoB,CAAC;SACvC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,gCAAgC,CACrC,UAAoB,EACpB,cAAwB;QAExB,OAAO,CACN,MAAM,IAAI,CAAC,IAAI,CAAC;YACf,KAAK,EAAE;gBACN,SAAS,EAAE,IAAA,YAAE,EAAC,UAAU,CAAC;gBACzB,aAAa,EAAE,IAAA,YAAE,EAAC,cAAc,CAAC;aACjC;YACD,MAAM,EAAE,CAAC,eAAe,CAAC;SACzB,CAAC,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,aAAqB;QACtD,OAAO,CACN,MAAM,IAAI,CAAC,OAAO,CAAC;YAClB,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,kBAAkB,EAAE;YAClD,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;SAC5B,CAAC,CACF,EAAE,OAAO,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,6BAA6B,CAAC,aAAuB;QAC1D,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACtB,KAAK,EAAE;gBACN,aAAa,EAAE,IAAA,YAAE,EAAC,aAAa,CAAC;aAChC;YACD,SAAS,EAAE,CAAC,SAAS,CAAC;SACtB,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AA5LY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,YAAO,GAAE;qCAGI,oBAAU;QACQ,0BAAW;GAH9B,2BAA2B,CA4LvC"}
+{"version":3,"file":"shared-credentials.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/shared-credentials.repository.ts"],"names":[],"mappings":"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"}

package/dist/databases/repositories/shared-workflow.repository.d.ts

@@ -1,13 +1,9 @@
-import type { Scope } from '@n8n/permissions';
 import { DataSource, Repository } from '@n8n/typeorm';
-import type { EntityManager, FindManyOptions } from '@n8n/typeorm';
-import { RoleService } from '../../services/role.service';
+import type { EntityManager, FindManyOptions, FindOptionsWhere } from '@n8n/typeorm';
 import type { Project } from '../entities/project';
 import { SharedWorkflow, type WorkflowSharingRole } from '../entities/shared-workflow';
-import { type User } from '../entities/user';
 export declare class SharedWorkflowRepository extends Repository<SharedWorkflow> {
-    private roleService;
-    constructor(dataSource: DataSource, roleService: RoleService);
+    constructor(dataSource: DataSource);
     getSharedWorkflowIds(workflowIds: string[]): Promise<string[]>;
     findByWorkflowIds(workflowIds: string[]): Promise<SharedWorkflow[]>;
     findSharingRole(userId: string, workflowId: string): Promise<WorkflowSharingRole | undefined>;
@@ -15,34 +11,14 @@ export declare class SharedWorkflowRepository extends Repository<SharedWorkflow>
     makeOwner(workflowIds: string[], projectId: string, trx?: EntityManager): Promise<import("@n8n/typeorm").InsertResult>;
     findWithFields(workflowIds: string[], { select }: Pick<FindManyOptions<SharedWorkflow>, 'select'>): Promise<SharedWorkflow[]>;
     deleteByIds(sharedWorkflowIds: string[], projectId: string, trx?: EntityManager): Promise<import("@n8n/typeorm").DeleteResult>;
-    findWorkflowForUser(workflowId: string, user: User, scopes: Scope[], { includeTags, includeParentFolder, em }?: {
-        includeTags?: boolean | undefined;
-        includeParentFolder?: boolean | undefined;
-        em?: EntityManager | undefined;
-    }): Promise<import("../entities/workflow-entity").WorkflowEntity | null>;
-    findAllWorkflowsForUser(user: User, scopes: Scope[]): Promise<{
-        projectId: string;
-        name: string;
-        active: boolean;
-        nodes: import("n8n-workflow").INode[];
-        connections: import("n8n-workflow").IConnections;
-        settings?: import("n8n-workflow").IWorkflowSettings;
-        staticData?: import("n8n-workflow").IDataObject;
-        meta?: import("n8n-workflow").WorkflowFEMeta;
-        tags?: import("../entities/tag-entity").TagEntity[];
-        tagMappings: import("../entities/workflow-tag-mapping").WorkflowTagMapping[];
-        shared: SharedWorkflow[];
-        statistics: import("../entities/workflow-statistics").WorkflowStatistics[];
-        pinData?: import("../entities/workflow-entity").ISimplifiedPinData;
-        versionId: string;
-        triggerCount: number;
-        parentFolder: import("../entities/folder").Folder | null;
-        id: string;
-        createdAt: Date;
-        updatedAt: Date;
-    }[]>;
     findProjectIds(workflowId: string): Promise<string[]>;
     getWorkflowOwningProject(workflowId: string): Promise<Project | undefined>;
     getRelationsByWorkflowIdsAndProjectIds(workflowIds: string[], projectIds: string[]): Promise<SharedWorkflow[]>;
     getAllRelationsForWorkflows(workflowIds: string[]): Promise<SharedWorkflow[]>;
+    findWorkflowWithOptions(workflowId: string, options?: {
+        where?: FindOptionsWhere<SharedWorkflow>;
+        includeTags?: boolean;
+        includeParentFolder?: boolean;
+        em?: EntityManager;
+    }): Promise<SharedWorkflow | null>;
 }

package/dist/databases/repositories/shared-workflow.repository.js

@@ -12,12 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SharedWorkflowRepository = void 0;
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
-const role_service_1 = require("../../services/role.service");
 const shared_workflow_1 = require("../entities/shared-workflow");
 let SharedWorkflowRepository = class SharedWorkflowRepository extends typeorm_1.Repository {
-    constructor(dataSource, roleService) {
+    constructor(dataSource) {
         super(shared_workflow_1.SharedWorkflow, dataSource.manager);
-        this.roleService = roleService;
     }
     async getSharedWorkflowIds(workflowIds) {
         const sharedWorkflows = await this.find({
@@ -80,63 +78,6 @@ let SharedWorkflowRepository = class SharedWorkflowRepository extends typeorm_1.
             workflowId: (0, typeorm_1.In)(sharedWorkflowIds),
         });
     }
-    async findWorkflowForUser(workflowId, user, scopes, { includeTags = false, includeParentFolder = false, em = this.manager } = {}) {
-        let where = { workflowId };
-        if (!user.hasGlobalScope(scopes, { mode: 'allOf' })) {
-            const projectRoles = this.roleService.rolesWithScope('project', scopes);
-            const workflowRoles = this.roleService.rolesWithScope('workflow', scopes);
-            where = {
-                ...where,
-                role: (0, typeorm_1.In)(workflowRoles),
-                project: {
-                    projectRelations: {
-                        role: (0, typeorm_1.In)(projectRoles),
-                        userId: user.id,
-                    },
-                },
-            };
-        }
-        const sharedWorkflow = await em.findOne(shared_workflow_1.SharedWorkflow, {
-            where,
-            relations: {
-                workflow: {
-                    shared: { project: { projectRelations: { user: true } } },
-                    tags: includeTags,
-                    parentFolder: includeParentFolder,
-                },
-            },
-        });
-        if (!sharedWorkflow) {
-            return null;
-        }
-        return sharedWorkflow.workflow;
-    }
-    async findAllWorkflowsForUser(user, scopes) {
-        let where = {};
-        if (!user.hasGlobalScope(scopes, { mode: 'allOf' })) {
-            const projectRoles = this.roleService.rolesWithScope('project', scopes);
-            const workflowRoles = this.roleService.rolesWithScope('workflow', scopes);
-            where = {
-                ...where,
-                role: (0, typeorm_1.In)(workflowRoles),
-                project: {
-                    projectRelations: {
-                        role: (0, typeorm_1.In)(projectRoles),
-                        userId: user.id,
-                    },
-                },
-            };
-        }
-        const sharedWorkflows = await this.find({
-            where,
-            relations: {
-                workflow: {
-                    shared: { project: { projectRelations: { user: true } } },
-                },
-            },
-        });
-        return sharedWorkflows.map((sw) => ({ ...sw.workflow, projectId: sw.projectId }));
-    }
     async findProjectIds(workflowId) {
         const rows = await this.find({ where: { workflowId }, select: ['projectId'] });
         const projectIds = rows.reduce((acc, row) => {
@@ -168,11 +109,26 @@ let SharedWorkflowRepository = class SharedWorkflowRepository extends typeorm_1.
             relations: ['project'],
         });
     }
+    async findWorkflowWithOptions(workflowId, options = {}) {
+        const { where = {}, includeTags = false, includeParentFolder = false, em = this.manager, } = options;
+        return await em.findOne(shared_workflow_1.SharedWorkflow, {
+            where: {
+                workflowId,
+                ...where,
+            },
+            relations: {
+                workflow: {
+                    shared: { project: { projectRelations: { user: true } } },
+                    tags: includeTags,
+                    parentFolder: includeParentFolder,
+                },
+            },
+        });
+    }
 };
 exports.SharedWorkflowRepository = SharedWorkflowRepository;
 exports.SharedWorkflowRepository = SharedWorkflowRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource,
-        role_service_1.RoleService])
+    __metadata("design:paramtypes", [typeorm_1.DataSource])
 ], SharedWorkflowRepository);
 //# sourceMappingURL=shared-workflow.repository.js.map

package/dist/databases/repositories/shared-workflow.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared-workflow.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/shared-workflow.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared-workflow.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/shared-workflow.repository.ts"],"names":[],"mappings":"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"}

package/dist/databases/types.d.ts

@@ -1,6 +1,5 @@
 import type { QueryRunner, ObjectLiteral } from '@n8n/typeorm';
 import type { Logger } from 'n8n-core';
-import type { INodeTypes } from 'n8n-workflow';
 import type { createSchemaBuilder } from './dsl';
 export type DatabaseType = 'mariadb' | 'postgresdb' | 'mysqldb' | 'sqlite';
 export interface MigrationContext {
@@ -13,7 +12,6 @@ export interface MigrationContext {
     isPostgres: boolean;
     dbName: string;
     migrationName: string;
-    nodeTypes: INodeTypes;
     schemaBuilder: ReturnType<typeof createSchemaBuilder>;
     loadSurveyFromDisk(): string | null;
     parseJson<T>(data: string | T): T;

package/dist/databases/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/databases/types.ts"],"names":[],"mappings":";;;AAiEA,wEAAuE;AAA9D,oHAAA,gBAAgB,OAAA"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/databases/types.ts"],"names":[],"mappings":";;;AA+DA,wEAAuE;AAA9D,oHAAA,gBAAgB,OAAA"}

package/dist/databases/utils/migration-helpers.js

@@ -8,7 +8,6 @@ const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const constants_1 = require("../../constants");
 const dsl_1 = require("../../databases/dsl");
-const node_types_1 = require("../../node-types");
 const PERSONALIZATION_SURVEY_FILENAME = 'personalizationSurvey.json';
 function loadSurveyFromDisk() {
     try {
@@ -96,7 +95,6 @@ const createContext = (queryRunner, migration) => ({
     migrationName: migration.name,
     queryRunner,
     schemaBuilder: (0, dsl_1.createSchemaBuilder)(tablePrefix, queryRunner),
-    nodeTypes: di_1.Container.get(node_types_1.NodeTypes),
     loadSurveyFromDisk,
     parseJson,
     escape: {

package/dist/databases/utils/migration-helpers.js.map

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

package/dist/deprecation/deprecation.service.d.ts

@@ -1,8 +1,10 @@
+import { GlobalConfig } from '@n8n/config';
 import { Logger } from 'n8n-core';
 export declare class DeprecationService {
     private readonly logger;
+    private readonly globalConfig;
     private readonly deprecations;
     private readonly state;
-    constructor(logger: Logger);
+    constructor(logger: Logger, globalConfig: GlobalConfig);
     warn(): void;
 }

package/dist/deprecation/deprecation.service.js

@@ -13,13 +13,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeprecationService = void 0;
+const config_1 = require("@n8n/config");
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
-const config_1 = __importDefault(require("../config"));
+const config_2 = __importDefault(require("../config"));
 const SAFE_TO_REMOVE = 'Remove this environment variable; it is no longer needed.';
 let DeprecationService = class DeprecationService {
-    constructor(logger) {
+    constructor(logger, globalConfig) {
         this.logger = logger;
+        this.globalConfig = globalConfig;
         this.deprecations = [
             { envVar: 'N8N_BINARY_DATA_TTL', message: SAFE_TO_REMOVE },
             { envVar: 'N8N_PERSISTED_BINARY_DATA_TTL', message: SAFE_TO_REMOVE },
@@ -44,13 +46,14 @@ let DeprecationService = class DeprecationService {
                 message: 'Running n8n without task runners is deprecated. Task runners will be turned on by default in a future version. Please set `N8N_RUNNERS_ENABLED=true` to enable task runners now and avoid potential issues in the future. Learn more: https://docs.n8n.io/hosting/configuration/task-runners/',
                 checkValue: (value) => value?.toLowerCase() !== 'true' && value !== '1',
                 warnIfMissing: true,
+                disableIf: () => this.globalConfig.nodes.exclude.includes('n8n-nodes-base.code'),
             },
             {
                 envVar: 'OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS',
                 message: 'Running manual executions in the main instance in scaling mode is deprecated. Manual executions will be routed to workers in a future version. Please set `OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS=true` to offload manual executions to workers and avoid potential issues in the future. Consider increasing memory available to workers and reducing memory available to main.',
                 checkValue: (value) => value?.toLowerCase() !== 'true' && value !== '1',
                 warnIfMissing: true,
-                matchConfig: config_1.default.getEnv('executions.mode') === 'queue',
+                matchConfig: config_2.default.getEnv('executions.mode') === 'queue',
             },
             {
                 envVar: 'N8N_PARTIAL_EXECUTION_VERSION_DEFAULT',
@@ -61,11 +64,25 @@ let DeprecationService = class DeprecationService {
                 envVar: 'N8N_PARTIAL_EXECUTION_VERSION_DEFAULT',
                 message: 'This environment variable is internal and should not be set.',
             },
+            {
+                envVar: 'EXECUTIONS_PROCESS',
+                message: SAFE_TO_REMOVE,
+                checkValue: (value) => value !== undefined && value !== 'own',
+            },
+            {
+                envVar: 'EXECUTIONS_PROCESS',
+                message: 'n8n does not support `own` mode since May 2023. Please remove this environment variable to allow n8n to start. If you need the isolation and performance gains, please consider queue mode: https://docs.n8n.io/hosting/scaling/queue-mode/',
+                checkValue: (value) => value === 'own',
+            },
         ];
         this.state = new Map();
     }
     warn() {
         this.deprecations.forEach((d) => {
+            if (d.disableIf?.()) {
+                this.state.set(d, { mustWarn: false });
+                return;
+            }
             const envValue = process.env[d.envVar];
             const matchConfig = d.matchConfig === true || d.matchConfig === undefined;
             const warnIfMissing = d.warnIfMissing !== undefined && envValue === undefined;
@@ -93,6 +110,7 @@ let DeprecationService = class DeprecationService {
 exports.DeprecationService = DeprecationService;
 exports.DeprecationService = DeprecationService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [n8n_core_1.Logger])
+    __metadata("design:paramtypes", [n8n_core_1.Logger,
+        config_1.GlobalConfig])
 ], DeprecationService);
 //# sourceMappingURL=deprecation.service.js.map