n8n 1.92.2 → 1.93.0

package/dist/controllers/community-packages.controller.js

@@ -18,22 +18,31 @@ const internal_server_error_1 = require("../errors/response-errors/internal-serv
 const event_service_1 = require("../events/event.service");
 const push_1 = require("../push");
 const community_packages_service_1 = require("../services/community-packages.service");
+const community_node_types_service_1 = require("../services/community-node-types.service");
 const { PACKAGE_NOT_INSTALLED, PACKAGE_NAME_NOT_PROVIDED, PACKAGE_VERSION_NOT_FOUND, PACKAGE_DOES_NOT_CONTAIN_NODES, PACKAGE_NOT_FOUND, } = constants_1.RESPONSE_ERROR_MESSAGES;
 const isClientError = (error) => [PACKAGE_VERSION_NOT_FOUND, PACKAGE_DOES_NOT_CONTAIN_NODES, PACKAGE_NOT_FOUND].some((msg) => error.message.includes(msg));
 function isNpmError(error) {
     return typeof error === 'object' && error !== null && 'code' in error && 'stdout' in error;
 }
 let CommunityPackagesController = class CommunityPackagesController {
-    constructor(push, communityPackagesService, eventService) {
+    constructor(push, communityPackagesService, eventService, communityNodeTypesService) {
         this.push = push;
         this.communityPackagesService = communityPackagesService;
         this.eventService = eventService;
+        this.communityNodeTypesService = communityNodeTypesService;
     }
     async installPackage(req) {
-        const { name } = req.body;
+        const { name, verify, version } = req.body;
         if (!name) {
             throw new bad_request_error_1.BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
         }
+        let checksum = undefined;
+        if (verify) {
+            checksum = this.communityNodeTypesService.findVetted(name)?.checksum;
+            if (!checksum) {
+                throw new bad_request_error_1.BadRequestError(`Package ${name} is not vetted for installation`);
+            }
+        }
         let parsed;
         try {
             parsed = this.communityPackagesService.parseNpmPackageName(name);
@@ -59,9 +68,10 @@ let CommunityPackagesController = class CommunityPackagesController {
         if (packageStatus.status !== 'OK') {
             throw new bad_request_error_1.BadRequestError(`Package "${name}" is banned so it cannot be installed`);
         }
+        const packageVersion = version ?? parsed.version;
         let installedPackage;
         try {
-            installedPackage = await this.communityPackagesService.installPackage(parsed.packageName, parsed.version);
+            installedPackage = await this.communityPackagesService.installPackage(parsed.packageName, packageVersion, checksum);
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : constants_1.UNKNOWN_FAILURE_REASON;
@@ -70,7 +80,7 @@ let CommunityPackagesController = class CommunityPackagesController {
                 inputString: name,
                 packageName: parsed.packageName,
                 success: false,
-                packageVersion: parsed.version,
+                packageVersion,
                 failureReason: errorMessage,
             });
             let message = [`Error loading package "${name}" `, errorMessage].join(':');
@@ -96,7 +106,7 @@ let CommunityPackagesController = class CommunityPackagesController {
             inputString: name,
             packageName: parsed.packageName,
             success: true,
-            packageVersion: parsed.version,
+            packageVersion,
             packageNodeNames: installedPackage.installedNodes.map((node) => node.name),
             packageAuthor: installedPackage.authorName,
             packageAuthorEmail: installedPackage.authorEmail,
@@ -194,7 +204,7 @@ let CommunityPackagesController = class CommunityPackagesController {
                 this.push.broadcast({
                     type: 'reloadNodeType',
                     data: {
-                        name: node.name,
+                        name: node.type,
                         version: node.latestVersion,
                     },
                 });
@@ -261,6 +271,7 @@ exports.CommunityPackagesController = CommunityPackagesController = __decorate([
     (0, decorators_1.RestController)('/community-packages'),
     __metadata("design:paramtypes", [push_1.Push,
         community_packages_service_1.CommunityPackagesService,
-        event_service_1.EventService])
+        event_service_1.EventService,
+        community_node_types_service_1.CommunityNodeTypesService])
 ], CommunityPackagesController);
 //# sourceMappingURL=community-packages.controller.js.map

package/dist/controllers/community-packages.controller.js.map

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

package/dist/controllers/debug.controller.d.ts

@@ -1,13 +1,13 @@
 import { InstanceSettings } from 'n8n-core';
 import { ActiveWorkflowManager } from '../active-workflow-manager';
 import { WorkflowRepository } from '../databases/repositories/workflow.repository';
-import { OrchestrationService } from '../services/orchestration.service';
+import { MultiMainSetup } from '../scaling/multi-main-setup.ee';
 export declare class DebugController {
-    private readonly orchestrationService;
+    private readonly multiMainSetup;
     private readonly activeWorkflowManager;
     private readonly workflowRepository;
     private readonly instanceSettings;
-    constructor(orchestrationService: OrchestrationService, activeWorkflowManager: ActiveWorkflowManager, workflowRepository: WorkflowRepository, instanceSettings: InstanceSettings);
+    constructor(multiMainSetup: MultiMainSetup, activeWorkflowManager: ActiveWorkflowManager, workflowRepository: WorkflowRepository, instanceSettings: InstanceSettings);
     getMultiMainSetupDetails(): Promise<{
         instanceId: string;
         leaderKey: string | null;

package/dist/controllers/debug.controller.js

@@ -14,16 +14,16 @@ const decorators_1 = require("@n8n/decorators");
 const n8n_core_1 = require("n8n-core");
 const active_workflow_manager_1 = require("../active-workflow-manager");
 const workflow_repository_1 = require("../databases/repositories/workflow.repository");
-const orchestration_service_1 = require("../services/orchestration.service");
+const multi_main_setup_ee_1 = require("../scaling/multi-main-setup.ee");
 let DebugController = class DebugController {
-    constructor(orchestrationService, activeWorkflowManager, workflowRepository, instanceSettings) {
-        this.orchestrationService = orchestrationService;
+    constructor(multiMainSetup, activeWorkflowManager, workflowRepository, instanceSettings) {
+        this.multiMainSetup = multiMainSetup;
         this.activeWorkflowManager = activeWorkflowManager;
         this.workflowRepository = workflowRepository;
         this.instanceSettings = instanceSettings;
     }
     async getMultiMainSetupDetails() {
-        const leaderKey = await this.orchestrationService.multiMainSetup.fetchLeaderKey();
+        const leaderKey = await this.multiMainSetup.fetchLeaderKey();
         const triggersAndPollers = await this.workflowRepository.findIn(this.activeWorkflowManager.allActiveInMemory());
         const webhooks = await this.workflowRepository.findWebhookBasedActiveWorkflows();
         const activationErrors = await this.activeWorkflowManager.getAllWorkflowActivationErrors();
@@ -48,7 +48,7 @@ __decorate([
 ], DebugController.prototype, "getMultiMainSetupDetails", null);
 exports.DebugController = DebugController = __decorate([
     (0, decorators_1.RestController)('/debug'),
-    __metadata("design:paramtypes", [orchestration_service_1.OrchestrationService,
+    __metadata("design:paramtypes", [multi_main_setup_ee_1.MultiMainSetup,
         active_workflow_manager_1.ActiveWorkflowManager,
         workflow_repository_1.WorkflowRepository,
         n8n_core_1.InstanceSettings])

package/dist/controllers/debug.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug.controller.js","sourceRoot":"","sources":["../../src/controllers/debug.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAsD;AACtD,uCAA4C;AAE5C,uEAAkE;AAClE,sFAAkF;AAClF,4EAAwE;AAGjE,IAAM,eAAe,GAArB,MAAM,eAAe;IAC3B,YACkB,oBAA0C,EAC1C,qBAA4C,EAC5C,kBAAsC,EACtC,gBAAkC;QAHlC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;IACjD,CAAC;IAGE,AAAN,KAAK,CAAC,wBAAwB;QAC7B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;QAElF,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAC9D,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,EAAE,CAC9C,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,+BAA+B,EAAE,CAAC;QAEjF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,8BAA8B,EAAE,CAAC;QAE3F,OAAO;YACN,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,UAAU;YAC5C,SAAS;YACT,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ;YACxC,eAAe,EAAE;gBAChB,QAAQ;gBACR,kBAAkB;aAClB;YACD,gBAAgB;SAChB,CAAC;IACH,CAAC;CACD,CAAA;AA/BY,0CAAe;AASrB;IADL,IAAA,gBAAG,EAAC,mBAAmB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;;;+DAsB5C;0BA9BW,eAAe;IAD3B,IAAA,2BAAc,EAAC,QAAQ,CAAC;qCAGgB,4CAAoB;QACnB,+CAAqB;QACxB,wCAAkB;QACpB,2BAAgB;GALxC,eAAe,CA+B3B"}
+{"version":3,"file":"debug.controller.js","sourceRoot":"","sources":["../../src/controllers/debug.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAsD;AACtD,uCAA4C;AAE5C,uEAAkE;AAClE,sFAAkF;AAClF,uEAA+D;AAGxD,IAAM,eAAe,GAArB,MAAM,eAAe;IAC3B,YACkB,cAA8B,EAC9B,qBAA4C,EAC5C,kBAAsC,EACtC,gBAAkC;QAHlC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;IACjD,CAAC;IAGE,AAAN,KAAK,CAAC,wBAAwB;QAC7B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;QAE7D,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAC9D,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,EAAE,CAC9C,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,+BAA+B,EAAE,CAAC;QAEjF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,8BAA8B,EAAE,CAAC;QAE3F,OAAO;YACN,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,UAAU;YAC5C,SAAS;YACT,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ;YACxC,eAAe,EAAE;gBAChB,QAAQ;gBACR,kBAAkB;aAClB;YACD,gBAAgB;SAChB,CAAC;IACH,CAAC;CACD,CAAA;AA/BY,0CAAe;AASrB;IADL,IAAA,gBAAG,EAAC,mBAAmB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;;;+DAsB5C;0BA9BW,eAAe;IAD3B,IAAA,2BAAc,EAAC,QAAQ,CAAC;qCAGU,oCAAc;QACP,+CAAqB;QACxB,wCAAkB;QACpB,2BAAgB;GALxC,eAAe,CA+B3B"}

package/dist/controllers/folder.controller.d.ts

@@ -1,10 +1,12 @@
-import { CreateFolderDto, DeleteFolderDto, ListFolderQueryDto, UpdateFolderDto } from '@n8n/api-types';
+import { CreateFolderDto, DeleteFolderDto, ListFolderQueryDto, TransferFolderBodyDto, UpdateFolderDto } from '@n8n/api-types';
 import { Response } from 'express';
 import { AuthenticatedRequest } from '../requests';
 import { FolderService } from '../services/folder.service';
+import { EnterpriseWorkflowService } from '../workflows/workflow.service.ee';
 export declare class ProjectController {
     private readonly folderService;
-    constructor(folderService: FolderService);
+    private readonly enterpriseWorkflowService;
+    constructor(folderService: FolderService, enterpriseWorkflowService: EnterpriseWorkflowService);
     createFolder(req: AuthenticatedRequest<{
         projectId: string;
     }>, _res: Response, payload: CreateFolderDto): Promise<{
@@ -44,4 +46,5 @@ export declare class ProjectController {
         totalSubFolders: number;
         totalWorkflows: number;
     }>;
+    transferFolderToProject(req: AuthenticatedRequest, _res: unknown, sourceFolderId: string, sourceProjectId: string, body: TransferFolderBodyDto): Promise<void>;
 }

package/dist/controllers/folder.controller.js

@@ -21,9 +21,11 @@ const bad_request_error_1 = require("../errors/response-errors/bad-request.error
 const internal_server_error_1 = require("../errors/response-errors/internal-server.error");
 const not_found_error_1 = require("../errors/response-errors/not-found.error");
 const folder_service_1 = require("../services/folder.service");
+const workflow_service_ee_1 = require("../workflows/workflow.service.ee");
 let ProjectController = class ProjectController {
-    constructor(folderService) {
+    constructor(folderService, enterpriseWorkflowService) {
         this.folderService = folderService;
+        this.enterpriseWorkflowService = enterpriseWorkflowService;
     }
     async createFolder(req, _res, payload) {
         try {
@@ -68,7 +70,7 @@ let ProjectController = class ProjectController {
     async deleteFolder(req, _res, payload) {
         const { projectId, folderId } = req.params;
         try {
-            await this.folderService.deleteFolder(folderId, projectId, payload);
+            await this.folderService.deleteFolder(req.user, folderId, projectId, payload);
         }
         catch (e) {
             if (e instanceof folder_not_found_error_1.FolderNotFoundError) {
@@ -101,6 +103,9 @@ let ProjectController = class ProjectController {
             throw new internal_server_error_1.InternalServerError(undefined, e);
         }
     }
+    async transferFolderToProject(req, _res, sourceFolderId, sourceProjectId, body) {
+        return await this.enterpriseWorkflowService.transferFolder(req.user, sourceProjectId, sourceFolderId, body.destinationProjectId, body.destinationParentFolderId, body.shareCredentials);
+    }
 };
 exports.ProjectController = ProjectController;
 __decorate([
@@ -149,8 +154,19 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "getFolderContent", null);
+__decorate([
+    (0, decorators_1.Put)('/:folderId/transfer'),
+    (0, decorators_1.ProjectScope)('folder:move'),
+    __param(2, (0, decorators_1.Param)('folderId')),
+    __param(3, (0, decorators_1.Param)('projectId')),
+    __param(4, decorators_1.Body),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, String, String, api_types_1.TransferFolderBodyDto]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "transferFolderToProject", null);
 exports.ProjectController = ProjectController = __decorate([
     (0, decorators_1.RestController)('/projects/:projectId/folders'),
-    __metadata("design:paramtypes", [folder_service_1.FolderService])
+    __metadata("design:paramtypes", [folder_service_1.FolderService,
+        workflow_service_ee_1.EnterpriseWorkflowService])
 ], ProjectController);
 //# sourceMappingURL=folder.controller.js.map

package/dist/controllers/folder.controller.js.map

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

package/dist/controllers/oauth/abstract-oauth.controller.d.ts

@@ -1,11 +1,11 @@
 import { GlobalConfig } from '@n8n/config';
 import type { CredentialsEntity, ICredentialsDb } from '@n8n/db';
+import { CredentialsRepository } from '@n8n/db';
 import type { Response } from 'express';
 import { Logger } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import { CredentialsFinderService } from '../../credentials/credentials-finder.service';
 import { CredentialsHelper } from '../../credentials-helper';
-import { CredentialsRepository } from '../../databases/repositories/credentials.repository';
 import { ExternalHooks } from '../../external-hooks';
 import type { AuthenticatedRequest, OAuthRequest } from '../../requests';
 import { UrlService } from '../../services/url.service';

package/dist/controllers/oauth/abstract-oauth.controller.js

@@ -47,6 +47,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractOAuthController = exports.skipAuthOnOAuthCallback = void 0;
 const config_1 = require("@n8n/config");
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const csrf_1 = __importDefault(require("csrf"));
 const n8n_core_1 = require("n8n-core");
@@ -54,7 +55,6 @@ const n8n_workflow_1 = require("n8n-workflow");
 const constants_1 = require("../../constants");
 const credentials_finder_service_1 = require("../../credentials/credentials-finder.service");
 const credentials_helper_1 = require("../../credentials-helper");
-const credentials_repository_1 = require("../../databases/repositories/credentials.repository");
 const auth_error_1 = require("../../errors/response-errors/auth.error");
 const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
 const not_found_error_1 = require("../../errors/response-errors/not-found.error");
@@ -170,7 +170,7 @@ exports.AbstractOAuthController = AbstractOAuthController = __decorate([
     __metadata("design:paramtypes", [n8n_core_1.Logger,
         external_hooks_1.ExternalHooks,
         credentials_helper_1.CredentialsHelper,
-        credentials_repository_1.CredentialsRepository,
+        db_1.CredentialsRepository,
         credentials_finder_service_1.CredentialsFinderService,
         url_service_1.UrlService,
         config_1.GlobalConfig])

package/dist/controllers/oauth/abstract-oauth.controller.js.map

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

package/dist/controllers/owner.controller.d.ts

@@ -1,12 +1,13 @@
 import { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types';
+import { SettingsRepository } from '@n8n/db';
 import { Response } from 'express';
 import { Logger } from 'n8n-core';
 import { AuthService } from '../auth/auth.service';
-import { SettingsRepository } from '../databases/repositories/settings.repository';
 import { UserRepository } from '../databases/repositories/user.repository';
 import { EventService } from '../events/event.service';
 import { PostHogClient } from '../posthog';
 import { AuthenticatedRequest } from '../requests';
+import { BannerService } from '../services/banner.service';
 import { PasswordUtility } from '../services/password.utility';
 import { UserService } from '../services/user.service';
 export declare class OwnerController {
@@ -14,13 +15,12 @@ export declare class OwnerController {
     private readonly eventService;
     private readonly settingsRepository;
     private readonly authService;
+    private readonly bannerService;
     private readonly userService;
     private readonly passwordUtility;
     private readonly postHog;
     private readonly userRepository;
-    constructor(logger: Logger, eventService: EventService, settingsRepository: SettingsRepository, authService: AuthService, userService: UserService, passwordUtility: PasswordUtility, postHog: PostHogClient, userRepository: UserRepository);
+    constructor(logger: Logger, eventService: EventService, settingsRepository: SettingsRepository, authService: AuthService, bannerService: BannerService, userService: UserService, passwordUtility: PasswordUtility, postHog: PostHogClient, userRepository: UserRepository);
     setupOwner(req: AuthenticatedRequest, res: Response, payload: OwnerSetupRequestDto): Promise<import("@n8n/db").PublicUser>;
-    dismissBanner(_req: AuthenticatedRequest, _res: Response, payload: DismissBannerRequestDto): Promise<{
-        success: boolean;
-    } | undefined>;
+    dismissBanner(_req: AuthenticatedRequest, _res: Response, payload: DismissBannerRequestDto): Promise<void>;
 }

package/dist/controllers/owner.controller.js

@@ -17,24 +17,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OwnerController = void 0;
 const api_types_1 = require("@n8n/api-types");
+const db_1 = require("@n8n/db");
 const decorators_1 = require("@n8n/decorators");
 const n8n_core_1 = require("n8n-core");
 const auth_service_1 = require("../auth/auth.service");
 const config_1 = __importDefault(require("../config"));
-const settings_repository_1 = require("../databases/repositories/settings.repository");
 const user_repository_1 = require("../databases/repositories/user.repository");
 const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
 const event_service_1 = require("../events/event.service");
 const generic_helpers_1 = require("../generic-helpers");
 const posthog_1 = require("../posthog");
+const banner_service_1 = require("../services/banner.service");
 const password_utility_1 = require("../services/password.utility");
 const user_service_1 = require("../services/user.service");
 let OwnerController = class OwnerController {
-    constructor(logger, eventService, settingsRepository, authService, userService, passwordUtility, postHog, userRepository) {
+    constructor(logger, eventService, settingsRepository, authService, bannerService, userService, passwordUtility, postHog, userRepository) {
         this.logger = logger;
         this.eventService = eventService;
         this.settingsRepository = settingsRepository;
         this.authService = authService;
+        this.bannerService = bannerService;
         this.userService = userService;
         this.passwordUtility = passwordUtility;
         this.postHog = postHog;
@@ -67,7 +69,7 @@ let OwnerController = class OwnerController {
         const bannerName = payload.banner;
         if (!bannerName)
             return;
-        return await this.settingsRepository.dismissBanner({ bannerName });
+        await this.bannerService.dismissBanner(bannerName);
     }
 };
 exports.OwnerController = OwnerController;
@@ -90,8 +92,9 @@ exports.OwnerController = OwnerController = __decorate([
     (0, decorators_1.RestController)('/owner'),
     __metadata("design:paramtypes", [n8n_core_1.Logger,
         event_service_1.EventService,
-        settings_repository_1.SettingsRepository,
+        db_1.SettingsRepository,
         auth_service_1.AuthService,
+        banner_service_1.BannerService,
         user_service_1.UserService,
         password_utility_1.PasswordUtility,
         posthog_1.PostHogClient,

package/dist/controllers/owner.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"owner.controller.js","sourceRoot":"","sources":["../../src/controllers/owner.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"owner.controller.js","sourceRoot":"","sources":["../../src/controllers/owner.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,8CAA+E;AAC/E,gCAA6C;AAC7C,gDAA0E;AAE1E,uCAAkC;AAElC,sDAAkD;AAClD,sDAA8B;AAC9B,8EAA0E;AAC1E,kFAA6E;AAC7E,0DAAsD;AACtD,uDAAmD;AACnD,uCAA0C;AAE1C,8DAA0D;AAC1D,kEAA8D;AAC9D,0DAAsD;AAG/C,IAAM,eAAe,GAArB,MAAM,eAAe;IAC3B,YACkB,MAAc,EACd,YAA0B,EAC1B,kBAAsC,EACtC,WAAwB,EACxB,aAA4B,EAC5B,WAAwB,EACxB,eAAgC,EAChC,OAAsB,EACtB,cAA8B;QAR9B,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAc;QAC1B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,gBAAW,GAAX,WAAW,CAAa;QACxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,oBAAe,GAAf,eAAe,CAAiB;QAChC,YAAO,GAAP,OAAO,CAAe;QACtB,mBAAc,GAAd,cAAc,CAAgB;IAC7C,CAAC;IAOE,AAAN,KAAK,CAAC,UAAU,CAAC,GAAyB,EAAE,GAAa,EAAQ,OAA6B;QAC7F,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAEzD,IAAI,gBAAM,CAAC,MAAM,CAAC,qCAAqC,CAAC,EAAE,CAAC;YAC1D,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,kFAAkF,CAClF,CAAC;YACF,MAAM,IAAI,mCAAe,CAAC,8BAA8B,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YACnD,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE;SAC/B,CAAC,CAAC;QACH,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;QACpB,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;QAC5B,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC1B,KAAK,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAG3D,MAAM,IAAA,gCAAc,EAAC,KAAK,CAAC,CAAC;QAE5B,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QAEtE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAElD,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CACnC,EAAE,GAAG,EAAE,qCAAqC,EAAE,EAC9C,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAC/B,CAAC;QAEF,gBAAM,CAAC,GAAG,CAAC,qCAAqC,EAAE,IAAI,CAAC,CAAC;QAExD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;QAEvE,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAExD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QAErE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5F,CAAC;IAIK,AAAN,KAAK,CAAC,aAAa,CAClB,IAA0B,EAC1B,IAAc,EACR,OAAgC;QAEtC,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;QAClC,IAAI,CAAC,UAAU;YAAE,OAAO;QACxB,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC;CACD,CAAA;AAtEY,0CAAe;AAkBrB;IADL,IAAA,iBAAI,EAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACyB,WAAA,iBAAI,CAAA;;qDAAU,gCAAoB;;iDAuC7F;AAIK;IAFL,IAAA,iBAAI,EAAC,iBAAiB,CAAC;IACvB,IAAA,wBAAW,EAAC,gBAAgB,CAAC;IAI5B,WAAA,iBAAI,CAAA;;qDAAU,mCAAuB;;oDAKtC;0BArEW,eAAe;IAD3B,IAAA,2BAAc,EAAC,QAAQ,CAAC;qCAGE,iBAAM;QACA,4BAAY;QACN,uBAAkB;QACzB,0BAAW;QACT,8BAAa;QACf,0BAAW;QACP,kCAAe;QACvB,uBAAa;QACN,gCAAc;GAVpC,eAAe,CAsE3B"}

package/dist/controllers/password-reset.controller.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PasswordResetController = void 0;
 const api_types_1 = require("@n8n/api-types");
 const decorators_1 = require("@n8n/decorators");
+const permissions_1 = require("@n8n/permissions");
 const n8n_core_1 = require("n8n-core");
 const auth_service_1 = require("../auth/auth.service");
 const constants_1 = require("../constants");
@@ -52,18 +53,22 @@ let PasswordResetController = class PasswordResetController {
         }
         const { email } = payload;
         const user = await this.userRepository.findNonShellUser(email);
-        if (!user?.isOwner && !this.license.isWithinUsersLimit()) {
+        if (!user) {
+            this.logger.debug('No user found in the system');
+            return;
+        }
+        if (user.role !== 'global:owner' && !this.license.isWithinUsersLimit()) {
             this.logger.debug('Request to send password reset email failed because the user limit was reached');
             throw new forbidden_error_1.ForbiddenError(constants_1.RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
         }
         if ((0, sso_helpers_1.isSamlCurrentAuthenticationMethod)() &&
-            !(user?.hasGlobalScope('user:resetPassword') === true ||
-                user?.settings?.allowSSOManualLogin === true)) {
+            !(user &&
+                ((0, permissions_1.hasGlobalScope)(user, 'user:resetPassword') || user.settings?.allowSSOManualLogin === true))) {
             this.logger.debug('Request to send password reset email failed because login is handled by SAML');
             throw new forbidden_error_1.ForbiddenError('Login is handled by SAML. Please contact your Identity Provider to reset your password.');
         }
-        const ldapIdentity = user?.authIdentities?.find((i) => i.providerType === 'ldap');
-        if (!user?.password || (ldapIdentity && user.disabled)) {
+        const ldapIdentity = user.authIdentities?.find((i) => i.providerType === 'ldap');
+        if (!user.password || (ldapIdentity && user.disabled)) {
             this.logger.debug('Request to send password reset email failed because no user was found for the provided email', { invalidEmail: email });
             return;
         }
@@ -102,7 +107,7 @@ let PasswordResetController = class PasswordResetController {
         const user = await this.authService.resolvePasswordResetToken(token);
         if (!user)
             throw new not_found_error_1.NotFoundError('');
-        if (!user?.isOwner && !this.license.isWithinUsersLimit()) {
+        if (user.role !== 'global:owner' && !this.license.isWithinUsersLimit()) {
             this.logger.debug('Request to resolve password token failed because the user limit was reached', { userId: user.id });
             throw new forbidden_error_1.ForbiddenError(constants_1.RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
         }

package/dist/controllers/password-reset.controller.js.map

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

package/dist/controllers/project.controller.d.ts

@@ -1,19 +1,17 @@
 import { CreateProjectDto, DeleteProjectDto, UpdateProjectDto } from '@n8n/api-types';
 import type { Project } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import type { Scope } from '@n8n/permissions';
 import { Response } from 'express';
-import { ProjectRepository } from '../databases/repositories/project.repository';
 import { EventService } from '../events/event.service';
 import type { ProjectRequest } from '../requests';
 import { AuthenticatedRequest } from '../requests';
 import { ProjectService } from '../services/project.service.ee';
-import { RoleService } from '../services/role.service';
 export declare class ProjectController {
     private readonly projectsService;
-    private readonly roleService;
     private readonly projectRepository;
     private readonly eventService;
-    constructor(projectsService: ProjectService, roleService: RoleService, projectRepository: ProjectRepository, eventService: EventService);
+    constructor(projectsService: ProjectService, projectRepository: ProjectRepository, eventService: EventService);
     getAllProjects(req: AuthenticatedRequest): Promise<Project[]>;
     getProjectCounts(): Promise<Record<"personal" | "team", number>>;
     createProject(req: AuthenticatedRequest, _res: Response, payload: CreateProjectDto): Promise<{