n8n 1.95.1 → 1.96.0

package/dist/public-api/v1/handlers/credentials/credentials.service.js

@@ -123,7 +123,10 @@ function toJsonSchema(properties) {
             const dependantName = Object.keys(property.displayOptions?.show)[0] || '';
             const displayOptionsValues = property.displayOptions.show[dependantName];
             let dependantValue = '';
-            if (displayOptionsValues && Array.isArray(displayOptionsValues) && displayOptionsValues[0]) {
+            if (displayOptionsValues &&
+                Array.isArray(displayOptionsValues) &&
+                displayOptionsValues[0] !== undefined &&
+                displayOptionsValues[0] !== null) {
                 dependantValue = displayOptionsValues[0];
             }
             if (propertyRequiredDependencies[dependantName] === undefined) {

package/dist/public-api/v1/handlers/credentials/credentials.service.js.map

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

package/dist/public-api/v1/handlers/projects/projects.handler.d.ts

@@ -14,5 +14,14 @@ declare const _default: {
     getProjects: (((req: PaginatedRequest, res: Response, next: import("express").NextFunction) => Response | void) | ((req: AuthenticatedRequest<{
         id?: string;
     }>, res: Response, next: import("express").NextFunction) => Promise<Response | void>) | ((req: import("express").Request, res: Response, next: import("express").NextFunction) => Promise<void>))[];
+    addUsersToProject: (((req: AuthenticatedRequest<{
+        id?: string;
+    }>, res: Response, next: import("express").NextFunction) => Promise<Response | void>) | ((req: import("express").Request, res: Response, next: import("express").NextFunction) => Promise<void>))[];
+    changeUserRoleInProject: (((req: AuthenticatedRequest<{
+        id?: string;
+    }>, res: Response, next: import("express").NextFunction) => Promise<Response | void>) | ((req: import("express").Request, res: Response, next: import("express").NextFunction) => Promise<void>))[];
+    deleteUserFromProject: (((req: AuthenticatedRequest<{
+        id?: string;
+    }>, res: Response, next: import("express").NextFunction) => Promise<Response | void>) | ((req: import("express").Request, res: Response, next: import("express").NextFunction) => Promise<void>))[];
 };
 export = _default;

package/dist/public-api/v1/handlers/projects/projects.handler.js

@@ -3,6 +3,8 @@ const api_types_1 = require("@n8n/api-types");
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const project_controller_1 = require("../../../../controllers/project.controller");
+const response_error_1 = require("../../../../errors/response-errors/abstract/response.error");
+const project_service_ee_1 = require("../../../../services/project.service.ee");
 const global_middleware_1 = require("../../shared/middlewares/global.middleware");
 const pagination_service_1 = require("../../shared/services/pagination.service");
 module.exports = {
@@ -62,5 +64,64 @@ module.exports = {
             });
         },
     ],
+    addUsersToProject: [
+        (0, global_middleware_1.isLicensed)('feat:projectRole:admin'),
+        (0, global_middleware_1.apiKeyHasScopeWithGlobalScopeFallback)({ scope: 'project:update' }),
+        async (req, res) => {
+            const payload = api_types_1.AddUsersToProjectDto.safeParse(req.body);
+            if (payload.error) {
+                return res.status(400).json(payload.error.errors[0]);
+            }
+            try {
+                await di_1.Container.get(project_service_ee_1.ProjectService).addUsersToProject(req.params.projectId, payload.data.relations);
+            }
+            catch (error) {
+                if (error instanceof response_error_1.ResponseError) {
+                    return res.status(error.httpStatusCode).send({ message: error.message });
+                }
+                throw error;
+            }
+            return res.status(201).send();
+        },
+    ],
+    changeUserRoleInProject: [
+        (0, global_middleware_1.isLicensed)('feat:projectRole:admin'),
+        (0, global_middleware_1.apiKeyHasScopeWithGlobalScopeFallback)({ scope: 'project:update' }),
+        async (req, res) => {
+            const payload = api_types_1.ChangeUserRoleInProject.safeParse(req.body);
+            if (payload.error) {
+                return res.status(400).json(payload.error.errors[0]);
+            }
+            const { projectId, userId } = req.params;
+            const { role } = payload.data;
+            try {
+                await di_1.Container.get(project_service_ee_1.ProjectService).changeUserRoleInProject(projectId, userId, role);
+            }
+            catch (error) {
+                if (error instanceof response_error_1.ResponseError) {
+                    return res.status(error.httpStatusCode).send({ message: error.message });
+                }
+                throw error;
+            }
+            return res.status(204).send();
+        },
+    ],
+    deleteUserFromProject: [
+        (0, global_middleware_1.isLicensed)('feat:projectRole:admin'),
+        (0, global_middleware_1.apiKeyHasScopeWithGlobalScopeFallback)({ scope: 'project:update' }),
+        async (req, res) => {
+            const { projectId, userId } = req.params;
+            try {
+                await di_1.Container.get(project_service_ee_1.ProjectService).deleteUserFromProject(projectId, userId);
+            }
+            catch (error) {
+                if (error instanceof response_error_1.ResponseError) {
+                    return res.status(error.httpStatusCode).send({ message: error.message });
+                }
+                throw error;
+            }
+            return res.status(204).send();
+        },
+    ],
 };
 //# sourceMappingURL=projects.handler.js.map

package/dist/public-api/v1/handlers/projects/projects.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"projects.handler.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/projects/projects.handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"projects.handler.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/projects/projects.handler.ts"],"names":[],"mappings":";AAAA,8CAMwB;AACxB,gCAA4C;AAC5C,gCAAoC;AAGpC,yEAAqE;AACrE,qFAAiF;AAGjF,sEAA+D;AAE/D,kFAIoD;AACpD,iFAA4E;AAG5E,iBAAS;IACR,aAAa,EAAE;QACd,IAAA,8BAAU,EAAC,wBAAwB,CAAC;QACpC,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;QAClE,KAAK,EAAE,GAAyB,EAAE,GAAa,EAAE,EAAE;YAClD,MAAM,OAAO,GAAG,4BAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,sCAAiB,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YAE7F,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;KACD;IACD,aAAa,EAAE;QACd,IAAA,8BAAU,EAAC,wBAAwB,CAAC;QACpC,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;QAClE,KAAK,EAAE,GAAgD,EAAE,GAAa,EAAE,EAAE;YACzE,MAAM,OAAO,GAAG,4BAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,CAAC;YAED,MAAM,cAAS,CAAC,GAAG,CAAC,sCAAiB,CAAC,CAAC,aAAa,CACnD,GAAG,EACH,GAAG,EACH,OAAO,CAAC,IAAI,EACZ,GAAG,CAAC,MAAM,CAAC,SAAS,CACpB,CAAC;YAEF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;KACD;IACD,aAAa,EAAE;QACd,IAAA,8BAAU,EAAC,wBAAwB,CAAC;QACpC,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;QAClE,KAAK,EAAE,GAAgD,EAAE,GAAa,EAAE,EAAE;YACzE,MAAM,KAAK,GAAG,4BAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBACjB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,CAAC;YAED,MAAM,cAAS,CAAC,GAAG,CAAC,sCAAiB,CAAC,CAAC,aAAa,CACnD,GAAG,EACH,GAAG,EACH,KAAK,CAAC,IAAI,EACV,GAAG,CAAC,MAAM,CAAC,SAAS,CACpB,CAAC;YAEF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;KACD;IACD,WAAW,EAAE;QACZ,IAAA,8BAAU,EAAC,wBAAwB,CAAC;QACpC,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;QAChE,+BAAW;QACX,KAAK,EAAE,GAAW,EAAE,GAAa,EAAE,EAAE;YACpC,MAAM,EAAE,MAAM,GAAG,CAAC,EAAE,KAAK,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;YAE9C,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,sBAAiB,CAAC,CAAC,YAAY,CAAC;gBAC7E,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,KAAK;aACX,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE,IAAA,qCAAgB,EAAC;oBAC5B,MAAM;oBACN,KAAK;oBACL,oBAAoB,EAAE,KAAK;iBAC3B,CAAC;aACF,CAAC,CAAC;QACJ,CAAC;KACD;IACD,iBAAiB,EAAE;QAClB,IAAA,8BAAU,EAAC,wBAAwB,CAAC;QACpC,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;QAClE,KAAK,EAAE,GAAgD,EAAE,GAAa,EAAE,EAAE;YACzE,MAAM,OAAO,GAAG,gCAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACzD,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,CAAC;YAED,IAAI,CAAC;gBACJ,MAAM,cAAS,CAAC,GAAG,CAAC,mCAAc,CAAC,CAAC,iBAAiB,CACpD,GAAG,CAAC,MAAM,CAAC,SAAS,EACpB,OAAO,CAAC,IAAI,CAAC,SAAS,CACtB,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,KAAK,YAAY,8BAAa,EAAE,CAAC;oBACpC,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC1E,CAAC;gBACD,MAAM,KAAK,CAAC;YACb,CAAC;YAED,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;KACD;IACD,uBAAuB,EAAE;QACxB,IAAA,8BAAU,EAAC,wBAAwB,CAAC;QACpC,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;QAClE,KAAK,EAAE,GAAgE,EAAE,GAAa,EAAE,EAAE;YACzF,MAAM,OAAO,GAAG,mCAAuB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC5D,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,CAAC;YAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YACzC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAC9B,IAAI,CAAC;gBACJ,MAAM,cAAS,CAAC,GAAG,CAAC,mCAAc,CAAC,CAAC,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACtF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,KAAK,YAAY,8BAAa,EAAE,CAAC;oBACpC,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC1E,CAAC;gBACD,MAAM,KAAK,CAAC;YACb,CAAC;YAED,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;KACD;IACD,qBAAqB,EAAE;QACtB,IAAA,8BAAU,EAAC,wBAAwB,CAAC;QACpC,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;QAClE,KAAK,EAAE,GAAgE,EAAE,GAAa,EAAE,EAAE;YACzF,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YACzC,IAAI,CAAC;gBACJ,MAAM,cAAS,CAAC,GAAG,CAAC,mCAAc,CAAC,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAC9E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,KAAK,YAAY,8BAAa,EAAE,CAAC;oBACpC,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC1E,CAAC;gBACD,MAAM,KAAK,CAAC;YACb,CAAC;YACD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;KACD;CACD,CAAC"}

package/dist/public-api/v1/openapi.yml

@@ -1020,7 +1020,12 @@ paths:
       summary: Delete a project
       description: Delete a project from your instance.
       parameters:
-        - $ref: '#/components/parameters/projectId'
+        - in: path
+          name: projectId
+          description: The ID of the project.
+          required: true
+          schema:
+            type: string
       responses:
         '204':
           description: Operation successful.
@@ -1034,9 +1039,16 @@ paths:
       x-eov-operation-id: updateProject
       x-eov-operation-handler: v1/handlers/projects/projects.handler
       tags:
-        - Project
+        - Projects
       summary: Update a project
       description: Update a project.
+      parameters:
+        - in: path
+          name: projectId
+          description: The ID of the project.
+          required: true
+          schema:
+            type: string
       requestBody:
         description: Updated project object.
         content:
@@ -1055,6 +1067,128 @@ paths:
           $ref: '#/components/responses/forbidden'
         '404':
           $ref: '#/components/responses/notFound'
+  /projects/{projectId}/users:
+    post:
+      x-eov-operation-id: addUsersToProject
+      x-eov-operation-handler: v1/handlers/projects/projects.handler
+      tags:
+        - Projects
+      summary: Add one or more users to a project
+      description: Add one or more users to a project from your instance.
+      parameters:
+        - name: projectId
+          in: path
+          description: The ID of the project.
+          required: true
+          schema:
+            type: string
+      requestBody:
+        description: Payload containing an array of one or more users to add to the project.
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                relations:
+                  type: array
+                  description: A list of userIds and roles to add to the project.
+                  items:
+                    type: object
+                    properties:
+                      userId:
+                        type: string
+                        description: The unique identifier of the user.
+                        example: 91765f0d-3b29-45df-adb9-35b23937eb92
+                      role:
+                        type: string
+                        description: The role assigned to the user in the project.
+                        example: project:viewer
+                    required:
+                      - userId
+                      - role
+              required:
+                - relations
+      responses:
+        '201':
+          description: Operation successful.
+        '401':
+          $ref: '#/components/responses/unauthorized'
+        '403':
+          $ref: '#/components/responses/forbidden'
+        '404':
+          $ref: '#/components/responses/notFound'
+  /projects/{projectId}/users/{userId}:
+    delete:
+      x-eov-operation-id: deleteUserFromProject
+      x-eov-operation-handler: v1/handlers/projects/projects.handler
+      tags:
+        - Projects
+      summary: Delete a user from a project
+      description: Delete a user from a project from your instance.
+      parameters:
+        - name: projectId
+          in: path
+          description: The ID of the project.
+          required: true
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: The ID of the user.
+          required: true
+          schema:
+            type: string
+      responses:
+        '204':
+          description: Operation successful.
+        '401':
+          $ref: '#/components/responses/unauthorized'
+        '403':
+          $ref: '#/components/responses/forbidden'
+        '404':
+          $ref: '#/components/responses/notFound'
+    patch:
+      x-eov-operation-id: changeUserRoleInProject
+      x-eov-operation-handler: v1/handlers/projects/projects.handler
+      tags:
+        - Projects
+      summary: Change a user's role in a project
+      description: Change a user's role in a project.
+      parameters:
+        - name: projectId
+          in: path
+          description: The ID of the project.
+          required: true
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: The ID of the user.
+          required: true
+          schema:
+            type: string
+      requestBody:
+        description: Updated project object.
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                role:
+                  type: string
+                  description: The role assigned to the user in the project.
+                  example: project:viewer
+              required:
+                - role
+      responses:
+        '204':
+          description: Operation successful.
+        '401':
+          $ref: '#/components/responses/unauthorized'
+        '403':
+          $ref: '#/components/responses/forbidden'
+        '404':
+          $ref: '#/components/responses/notFound'
 components:
   schemas:
     audit:
@@ -1827,13 +1961,6 @@ components:
       required: true
       schema:
         type: string
-    projectId:
-      name: projectId
-      in: path
-      description: The ID of the project.
-      required: true
-      schema:
-        type: string
     Cursor:
       $ref: '#/components/parameters/cursor'
     Limit:

package/dist/push/abstract.push.d.ts

@@ -1,6 +1,7 @@
 import type { PushMessage } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
-import { ErrorReporter, Logger } from 'n8n-core';
+import { ErrorReporter } from 'n8n-core';
 import type { OnPushMessage } from '../push/types';
 import { TypedEmitter } from '../typed-emitter';
 export interface AbstractPushEvents {

package/dist/push/abstract.push.js

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractPush = void 0;
+const backend_common_1 = require("@n8n/backend-common");
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
@@ -89,7 +90,7 @@ let AbstractPush = class AbstractPush extends typed_emitter_1.TypedEmitter {
 exports.AbstractPush = AbstractPush;
 exports.AbstractPush = AbstractPush = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [n8n_core_1.Logger,
+    __metadata("design:paramtypes", [backend_common_1.Logger,
         n8n_core_1.ErrorReporter])
 ], AbstractPush);
 //# sourceMappingURL=abstract.push.js.map

package/dist/push/abstract.push.js.map

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

package/dist/push/index.d.ts

@@ -1,8 +1,9 @@
 import type { PushMessage } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import type { Application } from 'express';
 import type { Server } from 'http';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { AuthService } from '../auth/auth.service';
 import { Publisher } from '../scaling/pubsub/publisher.service';
 import { TypedEmitter } from '../typed-emitter';
@@ -27,7 +28,6 @@ export declare class Push extends TypedEmitter<PushEvents> {
     getBackend(): SSEPush | WebSocketPush;
     setupPushServer(restEndpoint: string, server: Server, app: Application): void;
     setupPushHandler(restEndpoint: string, app: Application): void;
-    private constructExpectedOrigin;
     handleRequest(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse): void;
     broadcast(pushMsg: PushMessage): void;
     hasPushRef(pushRef: string): boolean;

package/dist/push/index.js

@@ -14,6 +14,7 @@ const backend_common_1 = require("@n8n/backend-common");
 const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
 const http_1 = require("http");
+const lodash_1 = require("lodash");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const url_1 = require("url");
@@ -67,47 +68,25 @@ let Push = class Push extends typed_emitter_1.TypedEmitter {
     setupPushHandler(restEndpoint, app) {
         app.use(`/${restEndpoint}/push`, this.authService.authMiddleware, (req, res) => this.handleRequest(req, res));
     }
-    constructExpectedOrigin(req) {
-        const headers = req.headers;
-        if (headers.origin) {
-            const forwardedHost = typeof headers['x-forwarded-host'] === 'string' ? headers['x-forwarded-host'] : undefined;
-            const forwardedProto = typeof headers['x-forwarded-proto'] === 'string' ? headers['x-forwarded-proto'] : undefined;
-            const allForwardHeadersAreDefined = forwardedHost && forwardedProto;
-            const host = allForwardHeadersAreDefined ? forwardedHost : headers.host;
-            const proto = allForwardHeadersAreDefined
-                ? forwardedProto
-                : headers.origin?.toLowerCase().startsWith('https://')
-                    ? 'https'
-                    : 'http';
-            return { success: true, expectedOrigin: `${proto}://${host}` };
-        }
-        else {
-            return { success: false };
-        }
-    }
     handleRequest(req, res) {
         const { ws, query: { pushRef }, user, headers, } = req;
         let connectionError = '';
-        const expectedOriginResult = this.constructExpectedOrigin(req);
+        const originHost = headers.origin?.replace(/^https?:\/\//, '');
         if (!pushRef) {
             connectionError = 'The query parameter "pushRef" is missing!';
         }
-        else if (!expectedOriginResult.success) {
+        else if (!originHost) {
             this.logger.warn('Origin header is missing');
             connectionError = 'Invalid origin!';
         }
-        else if (backend_common_1.inProduction &&
-            headers.origin?.toLowerCase() !== expectedOriginResult.expectedOrigin.toLowerCase()) {
-            this.logger.warn(`Origin header does NOT match the expected origin. (Origin: "${headers.origin}", Expected: "${expectedOriginResult.expectedOrigin}")`, {
-                expectedOrigin: expectedOriginResult.expectedOrigin,
-                headers: {
-                    host: req.headers.host,
-                    origin: req.headers.origin,
-                    ['x-forwarded-proto']: req.headers['x-forwarded-proto'],
-                    ['x-forwarded-host']: req.headers['x-forwarded-host'],
-                },
-            });
-            connectionError = 'Invalid origin!';
+        else if (backend_common_1.inProduction) {
+            const expectedHost = typeof headers['x-forwarded-host'] === 'string'
+                ? headers['x-forwarded-host']
+                : headers.host;
+            if (expectedHost !== originHost) {
+                this.logger.warn(`Origin header does NOT match the expected origin. (Origin: "${originHost}", Expected: "${expectedHost}")`, { headers: (0, lodash_1.pick)(headers, ['host', 'origin', 'x-forwarded-proto', 'x-forwarded-host']) });
+                connectionError = 'Invalid origin!';
+            }
         }
         if (connectionError) {
             if (ws) {
@@ -191,7 +170,7 @@ exports.Push = Push = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [push_config_1.PushConfig,
         n8n_core_1.InstanceSettings,
-        n8n_core_1.Logger,
+        backend_common_1.Logger,
         auth_service_1.AuthService,
         publisher_service_1.Publisher])
 ], Push);

package/dist/push/index.js.map

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

package/dist/response-helper.js

@@ -60,7 +60,7 @@ function sendErrorResponse(res, error) {
     };
     if (isResponseError(error)) {
         if (backend_common_1.inDevelopment) {
-            di_1.Container.get(n8n_core_1.Logger).error(picocolors_1.default.red([error.httpStatusCode, error.message].join(' ')));
+            di_1.Container.get(backend_common_1.Logger).error(picocolors_1.default.red([error.httpStatusCode, error.message].join(' ')));
         }
         const { originalUrl } = res.req;
         if (error.errorCode === 404 && originalUrl) {
@@ -88,7 +88,7 @@ function sendErrorResponse(res, error) {
     }
     if (error instanceof n8n_workflow_1.NodeApiError) {
         if (backend_common_1.inDevelopment) {
-            di_1.Container.get(n8n_core_1.Logger).error([picocolors_1.default.red(error.name), error.message].join(' '));
+            di_1.Container.get(backend_common_1.Logger).error([picocolors_1.default.red(error.name), error.message].join(' '));
         }
         Object.assign(response, error);
     }

package/dist/response-helper.js.map

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

package/dist/scaling/job-processor.d.ts

@@ -1,6 +1,7 @@
 import type { RunningJobSummary } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import { ExecutionRepository, WorkflowRepository } from '@n8n/db';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { ManualExecutionService } from '../manual-execution.service';
 import { NodeTypes } from '../node-types';
 import type { Job, JobId, JobResult } from './scaling.types';

package/dist/scaling/job-processor.js

@@ -46,6 +46,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobProcessor = void 0;
+const backend_common_1 = require("@n8n/backend-common");
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
@@ -223,7 +224,7 @@ let JobProcessor = class JobProcessor {
 exports.JobProcessor = JobProcessor;
 exports.JobProcessor = JobProcessor = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [n8n_core_1.Logger,
+    __metadata("design:paramtypes", [backend_common_1.Logger,
         db_1.ExecutionRepository,
         db_1.WorkflowRepository,
         node_types_1.NodeTypes,

package/dist/scaling/job-processor.js.map

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

package/dist/scaling/multi-main-setup.ee.d.ts

@@ -1,6 +1,7 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { MultiMainMetadata } from '@n8n/decorators';
-import { InstanceSettings, Logger } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { Publisher } from '../scaling/pubsub/publisher.service';
 import { RedisClientService } from '../services/redis-client.service';
 import { TypedEmitter } from '../typed-emitter';