n8n 2.2.4 → 2.3.1

package/dist/executions/executions.controller.js

@@ -94,6 +94,13 @@ let ExecutionsController = class ExecutionsController {
         const executionId = req.params.id;
         return await this.executionService.stop(executionId, workflowIds);
     }
+    async stopMany(req) {
+        const accessibleWorkflowIds = await this.getAccessibleWorkflowIds(req.user, 'workflow:execute');
+        if (accessibleWorkflowIds.length === 0)
+            return { stopped: 0 };
+        const stopped = await this.executionService.stopMany(req.body.filter, accessibleWorkflowIds);
+        return { stopped };
+    }
     async retry(req) {
         const workflowIds = await this.getAccessibleWorkflowIds(req.user, 'workflow:execute');
         if (workflowIds.length === 0)
@@ -138,6 +145,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], ExecutionsController.prototype, "stop", null);
+__decorate([
+    (0, decorators_1.Post)('/stopMany'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], ExecutionsController.prototype, "stopMany", null);
 __decorate([
     (0, decorators_1.Post)('/:id/retry'),
     __metadata("design:type", Function),

package/dist/executions/executions.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"executions.controller.js","sourceRoot":"","sources":["../../src/executions/executions.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gDAAmE;AACnE,kDAAuE;AAEvE,2DAAuD;AACvD,iEAAqE;AAErE,iFAAiE;AACjE,6CAA8D;AAE9D,kFAA6E;AAC7E,8EAAyE;AACzE,uCAAoC;AACpC,mCAA4C;AAC5C,mFAA8E;AAGvE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,YACkB,gBAAkC,EAClC,0BAAuD,EACvD,sBAA8C,EAC9C,OAAgB;QAHhB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,+BAA0B,GAA1B,0BAA0B,CAA6B;QACvD,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,YAAO,GAAP,OAAO,CAAS;IAC/B,CAAC;IAEI,KAAK,CAAC,wBAAwB,CAAC,IAAU,EAAE,KAAY;QAC9D,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACrC,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1F,CAAC;aAAM,CAAC;YACP,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,IAAI,EAAE;gBACnE,aAAa,EAAE,CAAC,gBAAgB,CAAC;gBACjC,YAAY,EAAE,CAAC,qCAAuB,CAAC;aACvC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CAAC,GAA6B;QAC1C,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAE7F,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxC,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACpD,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;QAElC,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3E,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACpD,CAAC;QAED,KAAK,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QAEpD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iCAAiC,EAAE,EAAE,CAAC;YACvD,OAAO,KAAK,CAAC,QAAQ,CAAC;YACtB,OAAO,KAAK,CAAC,cAAc,CAAC;QAC7B,CAAC;QAED,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;QAE5D,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAC;YACzB,MAAM,CAAC,UAAU,EAAE,yBAAyB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACjE,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,KAAK,CAAC;gBAC1D,IAAI,CAAC,gBAAgB,CAAC,4BAA4B,EAAE;aACpD,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CACpC,GAAG,CAAC,IAAI,EACR,UAAU,CAAC,OAA0D,CACrE,CAAC;YACF,OAAO;gBACN,GAAG,UAAU;gBACb,yBAAyB;aACzB,CAAC;QACH,CAAC;QAED,MAAM,CAAC,UAAU,EAAE,yBAAyB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACjE,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,CAAC;YAC/C,IAAI,CAAC,gBAAgB,CAAC,4BAA4B,EAAE;SACpD,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CACpC,GAAG,CAAC,IAAI,EACR,UAAU,CAAC,OAA0D,CACrE,CAAC;QACF,OAAO;YACN,GAAG,UAAU;YACb,yBAAyB;SACzB,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAC,GAA4B;QACxC,IAAI,CAAC,IAAA,yBAAiB,EAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,mCAAe,CAAC,8BAA8B,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAEnF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,+BAAa,CAAC,qBAAqB,CAAC,CAAC;QAE7E,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE;YACrC,CAAC,CAAC,MAAM,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC;YACjE,CAAC,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAC1D,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI,CAAC,GAA0B;QACpC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAEtF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,+BAAa,CAAC,qBAAqB,CAAC,CAAC;QAE7E,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAElC,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IACnE,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAC,GAA2B;QACtC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAEtF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,+BAAa,CAAC,qBAAqB,CAAC,CAAC;QAE7E,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAC,GAA4B;QACxC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAEtF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,+BAAa,CAAC,qBAAqB,CAAC,CAAC;QAE7E,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAC7D,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAC,GAA4B;QACxC,IAAI,CAAC,IAAA,yBAAiB,EAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,mCAAe,CAAC,8BAA8B,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAGnF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,+BAAa,CAAC,qBAAqB,CAAC,CAAC;QAE7E,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;QAC9B,MAAM,gBAAgB,GAAG,IAAA,2CAA8B,EAAC,OAAO,CAAC,CAAC;QAEjE,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAC;QAEnF,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAC9D,CAAC;CACD,CAAA;AAtIY,oDAAoB;AAoB1B;IADL,IAAA,gBAAG,EAAC,GAAG,EAAE,EAAE,WAAW,EAAE,CAAC,8CAAe,CAAC,EAAE,CAAC;;;;mDAmD5C;AAGK;IADL,IAAA,gBAAG,EAAC,MAAM,CAAC;;;;kDAaX;AAGK;IADL,IAAA,iBAAI,EAAC,WAAW,CAAC;;;;gDASjB;AAGK;IADL,IAAA,iBAAI,EAAC,YAAY,CAAC;;;;iDAOlB;AAGK;IADL,IAAA,iBAAI,EAAC,SAAS,CAAC;;;;kDAOf;AAGK;IADL,IAAA,kBAAK,EAAC,MAAM,CAAC;;;;kDAiBb;+BArIW,oBAAoB;IADhC,IAAA,2BAAc,EAAC,aAAa,CAAC;qCAGO,oCAAgB;QACN,kDAA2B;QAC/B,iDAAsB;QACrC,iBAAO;GALtB,oBAAoB,CAsIhC"}
+{"version":3,"file":"executions.controller.js","sourceRoot":"","sources":["../../src/executions/executions.controller.ts"],"names":[],"mappings":"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"}

package/dist/modules/chat-hub/chat-hub-agent.repository.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatHubAgentRepository = void 0;
-const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const chat_hub_agent_entity_1 = require("./chat-hub-agent.entity");
@@ -19,25 +18,22 @@ let ChatHubAgentRepository = class ChatHubAgentRepository extends typeorm_1.Repo
         super(chat_hub_agent_entity_1.ChatHubAgent, dataSource.manager);
     }
     async createAgent(agent, trx) {
-        return await (0, db_1.withTransaction)(this.manager, trx, async (em) => {
-            await em.insert(chat_hub_agent_entity_1.ChatHubAgent, agent);
-            return await em.findOneOrFail(chat_hub_agent_entity_1.ChatHubAgent, {
-                where: { id: agent.id },
-            });
-        }, false);
+        const em = trx ?? this.manager;
+        await em.insert(chat_hub_agent_entity_1.ChatHubAgent, agent);
+        return await em.findOneOrFail(chat_hub_agent_entity_1.ChatHubAgent, {
+            where: { id: agent.id },
+        });
     }
     async updateAgent(id, updates, trx) {
-        return await (0, db_1.withTransaction)(this.manager, trx, async (em) => {
-            await em.update(chat_hub_agent_entity_1.ChatHubAgent, { id }, updates);
-            return await em.findOneOrFail(chat_hub_agent_entity_1.ChatHubAgent, {
-                where: { id },
-            });
-        }, false);
+        const em = trx ?? this.manager;
+        await em.update(chat_hub_agent_entity_1.ChatHubAgent, { id }, updates);
+        return await em.findOneOrFail(chat_hub_agent_entity_1.ChatHubAgent, {
+            where: { id },
+        });
     }
     async deleteAgent(id, trx) {
-        return await (0, db_1.withTransaction)(this.manager, trx, async (em) => {
-            return await em.delete(chat_hub_agent_entity_1.ChatHubAgent, { id });
-        }, false);
+        const em = trx ?? this.manager;
+        return await em.delete(chat_hub_agent_entity_1.ChatHubAgent, { id });
     }
     async getManyByUserId(userId) {
         return await this.find({
@@ -46,11 +42,10 @@ let ChatHubAgentRepository = class ChatHubAgentRepository extends typeorm_1.Repo
         });
     }
     async getOneById(id, userId, trx) {
-        return await (0, db_1.withTransaction)(this.manager, trx, async (em) => {
-            return await em.findOne(chat_hub_agent_entity_1.ChatHubAgent, {
-                where: { id, ownerId: userId },
-            });
-        }, false);
+        const em = trx ?? this.manager;
+        return await em.findOne(chat_hub_agent_entity_1.ChatHubAgent, {
+            where: { id, ownerId: userId },
+        });
     }
 };
 exports.ChatHubAgentRepository = ChatHubAgentRepository;

package/dist/modules/chat-hub/chat-hub-agent.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat-hub-agent.repository.js","sourceRoot":"","sources":["../../../src/modules/chat-hub/chat-hub-agent.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAA0C;AAC1C,gCAAkC;AAClC,0CAAqE;AAErE,mEAAsE;AAG/D,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,oBAAwB;IACnE,YAAY,UAAsB;QACjC,KAAK,CAAC,oCAAY,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,WAAW,CAChB,KAAyD,EACzD,GAAmB;QAEnB,OAAO,MAAM,IAAA,oBAAe,EAC3B,IAAI,CAAC,OAAO,EACZ,GAAG,EACH,KAAK,EAAE,EAAE,EAAE,EAAE;YACZ,MAAM,EAAE,CAAC,MAAM,CAAC,oCAAY,EAAE,KAAK,CAAC,CAAC;YACrC,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,oCAAY,EAAE;gBAC3C,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;aACvB,CAAC,CAAC;QACJ,CAAC,EACD,KAAK,CACL,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAAU,EAAE,OAA+B,EAAE,GAAmB;QACjF,OAAO,MAAM,IAAA,oBAAe,EAC3B,IAAI,CAAC,OAAO,EACZ,GAAG,EACH,KAAK,EAAE,EAAE,EAAE,EAAE;YACZ,MAAM,EAAE,CAAC,MAAM,CAAC,oCAAY,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,oCAAY,EAAE;gBAC3C,KAAK,EAAE,EAAE,EAAE,EAAE;aACb,CAAC,CAAC;QACJ,CAAC,EACD,KAAK,CACL,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAAU,EAAE,GAAmB;QAChD,OAAO,MAAM,IAAA,oBAAe,EAC3B,IAAI,CAAC,OAAO,EACZ,GAAG,EACH,KAAK,EAAE,EAAE,EAAE,EAAE;YACZ,OAAO,MAAM,EAAE,CAAC,MAAM,CAAC,oCAAY,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9C,CAAC,EACD,KAAK,CACL,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAc;QACnC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACtB,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;YAC1B,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;SAC5B,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,MAAc,EAAE,GAAmB;QAC/D,OAAO,MAAM,IAAA,oBAAe,EAC3B,IAAI,CAAC,OAAO,EACZ,GAAG,EACH,KAAK,EAAE,EAAE,EAAE,EAAE;YACZ,OAAO,MAAM,EAAE,CAAC,OAAO,CAAC,oCAAY,EAAE;gBACrC,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;aAC9B,CAAC,CAAC;QACJ,CAAC,EACD,KAAK,CACL,CAAC;IACH,CAAC;CACD,CAAA;AAlEY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,sBAAsB,CAkElC"}
+{"version":3,"file":"chat-hub-agent.repository.js","sourceRoot":"","sources":["../../../src/modules/chat-hub/chat-hub-agent.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,0CAAqE;AAErE,mEAAsE;AAG/D,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,oBAAwB;IACnE,YAAY,UAAsB;QACjC,KAAK,CAAC,oCAAY,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,WAAW,CAChB,KAAyD,EACzD,GAAmB;QAEnB,MAAM,EAAE,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE,CAAC,MAAM,CAAC,oCAAY,EAAE,KAAK,CAAC,CAAC;QACrC,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,oCAAY,EAAE;YAC3C,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;SACvB,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAAU,EAAE,OAA+B,EAAE,GAAmB;QACjF,MAAM,EAAE,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE,CAAC,MAAM,CAAC,oCAAY,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAC/C,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,oCAAY,EAAE;YAC3C,KAAK,EAAE,EAAE,EAAE,EAAE;SACb,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAAU,EAAE,GAAmB;QAChD,MAAM,EAAE,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAC/B,OAAO,MAAM,EAAE,CAAC,MAAM,CAAC,oCAAY,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAc;QACnC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACtB,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;YAC1B,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;SAC5B,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,MAAc,EAAE,GAAmB;QAC/D,MAAM,EAAE,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAC/B,OAAO,MAAM,EAAE,CAAC,OAAO,CAAC,oCAAY,EAAE;YACrC,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;SAC9B,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AA1CY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,sBAAsB,CA0ClC"}

package/dist/modules/chat-hub/chat-hub-agent.service.js

@@ -13,10 +13,10 @@ exports.ChatHubAgentService = void 0;
 const backend_common_1 = require("@n8n/backend-common");
 const di_1 = require("@n8n/di");
 const uuid_1 = require("uuid");
+const not_found_error_1 = require("../../errors/response-errors/not-found.error");
 const chat_hub_agent_repository_1 = require("./chat-hub-agent.repository");
 const chat_hub_credentials_service_1 = require("./chat-hub-credentials.service");
 const chat_hub_constants_1 = require("./chat-hub.constants");
-const not_found_error_1 = require("../../errors/response-errors/not-found.error");
 let ChatHubAgentService = class ChatHubAgentService {
     constructor(logger, chatAgentRepository, chatHubCredentialsService) {
         this.logger = logger;
@@ -52,7 +52,7 @@ let ChatHubAgentService = class ChatHubAgentService {
         return agent;
     }
     async createAgent(user, data) {
-        await this.chatHubCredentialsService.ensureCredentialById(user, data.credentialId);
+        await this.chatHubCredentialsService.ensureCredentialAccess(user, data.credentialId);
         const id = (0, uuid_1.v4)();
         const agent = await this.chatAgentRepository.createAgent({
             id,
@@ -75,7 +75,7 @@ let ChatHubAgentService = class ChatHubAgentService {
             throw new not_found_error_1.NotFoundError('Chat agent not found');
         }
         if (updates.credentialId !== undefined && updates.credentialId !== null) {
-            await this.chatHubCredentialsService.ensureCredentialById(user, updates.credentialId);
+            await this.chatHubCredentialsService.ensureCredentialAccess(user, updates.credentialId);
         }
         const updateData = {};
         if (updates.name !== undefined)

package/dist/modules/chat-hub/chat-hub-agent.service.js.map

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

package/dist/modules/chat-hub/chat-hub-credentials.service.d.ts

@@ -1,25 +1,21 @@
 import { ChatHubLLMProvider } from '@n8n/api-types';
-import { type User, ProjectRepository } from '@n8n/db';
-import { SharedWorkflowRepository } from '@n8n/db';
-import type { EntityManager } from '@n8n/typeorm';
+import { ProjectRepository, SharedWorkflowRepository, User } from '@n8n/db';
+import { EntityManager } from '@n8n/typeorm';
 import type { INodeCredentials } from 'n8n-workflow';
+import { CredentialsFinderService } from '../../credentials/credentials-finder.service';
 import { CredentialsService } from '../../credentials/credentials.service';
 export declare class ChatHubCredentialsService {
     private readonly credentialsService;
-    private readonly projectRepository;
     private readonly sharedWorkflowRepository;
-    constructor(credentialsService: CredentialsService, projectRepository: ProjectRepository, sharedWorkflowRepository: SharedWorkflowRepository);
-    ensureCredentials(user: User, provider: ChatHubLLMProvider, credentials: INodeCredentials, trx?: EntityManager): Promise<{
-        id: string;
-        projectId: string;
-    }>;
-    ensureCredentialById(user: User, credentialId: string, trx?: EntityManager): Promise<{
-        id: string;
-        projectId: string;
-    }>;
+    private readonly credentialsFinderService;
+    private readonly projectRepository;
+    constructor(credentialsService: CredentialsService, sharedWorkflowRepository: SharedWorkflowRepository, credentialsFinderService: CredentialsFinderService, projectRepository: ProjectRepository);
+    ensureCredentialAccess(user: User, credentialId: string): Promise<import("@n8n/db").CredentialsEntity>;
     private pickCredentialId;
-    ensureWorkflowCredentials(provider: ChatHubLLMProvider, credentials: INodeCredentials, workflowId: string): Promise<{
-        id: string;
+    findPersonalProject(user: User, trx?: EntityManager): Promise<import("@n8n/db").Project>;
+    findProviderCredential(provider: ChatHubLLMProvider, credentials: INodeCredentials): string;
+    findWorkflowCredentialAndProject(provider: ChatHubLLMProvider, credentials: INodeCredentials, workflowId: string): Promise<{
+        credentialId: string;
         projectId: string;
     }>;
 }

package/dist/modules/chat-hub/chat-hub-credentials.service.js

@@ -12,40 +12,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatHubCredentialsService = void 0;
 const api_types_1 = require("@n8n/api-types");
 const db_1 = require("@n8n/db");
-const db_2 = require("@n8n/db");
 const di_1 = require("@n8n/di");
+const credentials_finder_service_1 = require("../../credentials/credentials-finder.service");
 const credentials_service_1 = require("../../credentials/credentials.service");
 const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
 const forbidden_error_1 = require("../../errors/response-errors/forbidden.error");
 let ChatHubCredentialsService = class ChatHubCredentialsService {
-    constructor(credentialsService, projectRepository, sharedWorkflowRepository) {
+    constructor(credentialsService, sharedWorkflowRepository, credentialsFinderService, projectRepository) {
         this.credentialsService = credentialsService;
-        this.projectRepository = projectRepository;
         this.sharedWorkflowRepository = sharedWorkflowRepository;
+        this.credentialsFinderService = credentialsFinderService;
+        this.projectRepository = projectRepository;
     }
-    async ensureCredentials(user, provider, credentials, trx) {
-        const credentialId = this.pickCredentialId(provider, credentials);
-        if (!credentialId) {
-            throw new bad_request_error_1.BadRequestError('No credentials provided for the selected model provider');
-        }
-        return await this.ensureCredentialById(user, credentialId, trx);
-    }
-    async ensureCredentialById(user, credentialId, trx) {
-        const project = await this.projectRepository.getPersonalProjectForUser(user.id, trx);
-        if (!project) {
-            throw new forbidden_error_1.ForbiddenError('Missing personal project');
-        }
-        const allCredentials = await this.credentialsService.getCredentialsAUserCanUseInAWorkflow(user, {
-            projectId: project.id,
-        });
-        const credential = allCredentials.find((c) => c.id === credentialId);
+    async ensureCredentialAccess(user, credentialId) {
+        const credential = await this.credentialsFinderService.findCredentialForUser(credentialId, user, ['credential:read']);
         if (!credential) {
             throw new forbidden_error_1.ForbiddenError("You don't have access to the provided credentials");
         }
-        return {
-            id: credential.id,
-            projectId: project.id,
-        };
+        return credential;
     }
     pickCredentialId(provider, credentials) {
         if (provider === 'n8n' || provider === 'custom-agent') {
@@ -53,7 +37,21 @@ let ChatHubCredentialsService = class ChatHubCredentialsService {
         }
         return credentials[api_types_1.PROVIDER_CREDENTIAL_TYPE_MAP[provider]]?.id ?? null;
     }
-    async ensureWorkflowCredentials(provider, credentials, workflowId) {
+    async findPersonalProject(user, trx) {
+        const project = await this.projectRepository.getPersonalProjectForUser(user.id, trx);
+        if (!project) {
+            throw new forbidden_error_1.ForbiddenError('Missing personal project');
+        }
+        return project;
+    }
+    findProviderCredential(provider, credentials) {
+        const credentialId = this.pickCredentialId(provider, credentials);
+        if (!credentialId) {
+            throw new bad_request_error_1.BadRequestError('No credentials provided for the selected model provider');
+        }
+        return credentialId;
+    }
+    async findWorkflowCredentialAndProject(provider, credentials, workflowId) {
         const credentialId = this.pickCredentialId(provider, credentials);
         if (!credentialId) {
             throw new bad_request_error_1.BadRequestError('No credentials provided for the selected model provider');
@@ -70,7 +68,7 @@ let ChatHubCredentialsService = class ChatHubCredentialsService {
             throw new forbidden_error_1.ForbiddenError("You don't have access to the provided credentials");
         }
         return {
-            id: credential.id,
+            credentialId: credential.id,
             projectId: project.id,
         };
     }
@@ -79,7 +77,8 @@ exports.ChatHubCredentialsService = ChatHubCredentialsService;
 exports.ChatHubCredentialsService = ChatHubCredentialsService = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [credentials_service_1.CredentialsService,
-        db_1.ProjectRepository,
-        db_2.SharedWorkflowRepository])
+        db_1.SharedWorkflowRepository,
+        credentials_finder_service_1.CredentialsFinderService,
+        db_1.ProjectRepository])
 ], ChatHubCredentialsService);
 //# sourceMappingURL=chat-hub-credentials.service.js.map

package/dist/modules/chat-hub/chat-hub-credentials.service.js.map

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

package/dist/modules/chat-hub/chat-hub.service.js

@@ -91,7 +91,7 @@ let ChatHubService = class ChatHubService {
         const { sessionId, messageId, message, model, credentials, previousMessageId, tools, attachments, timeZone, } = payload;
         const tz = timeZone ?? this.globalConfig.generic.timezone;
         const credentialId = this.getModelCredential(model, credentials);
-        const processedAttachments = await this.chatHubAttachmentService.store(sessionId, messageId, attachments);
+        let processedAttachments = [];
         let executionData;
         let workflowData;
         let responseMode;
@@ -102,6 +102,7 @@ let ChatHubService = class ChatHubService {
                 await this.ensurePreviousMessage(previousMessageId, sessionId, trx);
                 const messages = Object.fromEntries((session.messages ?? []).map((m) => [m.id, m]));
                 const history = this.buildMessageHistory(messages, previousMessageId);
+                processedAttachments = await this.chatHubAttachmentService.store(sessionId, messageId, attachments);
                 await this.saveHumanMessage(payload, processedAttachments, user, previousMessageId, model, undefined, trx);
                 return await this.prepareReplyWorkflow(user, sessionId, credentials, model, history, message, tools, processedAttachments, tz, trx);
             });
@@ -130,26 +131,50 @@ let ChatHubService = class ChatHubService {
     async editMessage(res, user, payload) {
         const { sessionId, editId, messageId, message, model, credentials, timeZone } = payload;
         const tz = timeZone ?? this.globalConfig.generic.timezone;
-        const workflow = await this.messageRepository.manager.transaction(async (trx) => {
-            const session = await this.getChatSession(user, sessionId, trx);
-            if (!session) {
-                throw new not_found_error_1.NotFoundError('Chat session not found');
-            }
-            const messageToEdit = await this.getChatMessage(session.id, editId, [], trx);
-            if (messageToEdit.type === 'ai') {
-                await this.messageRepository.updateChatMessage(editId, { content: payload.message }, trx);
-                return null;
-            }
-            if (messageToEdit.type === 'human') {
-                const messages = Object.fromEntries((session.messages ?? []).map((m) => [m.id, m]));
-                const history = this.buildMessageHistory(messages, messageToEdit.previousMessageId);
-                const revisionOfMessageId = messageToEdit.revisionOfMessageId ?? messageToEdit.id;
-                const attachments = messageToEdit.attachments ?? [];
-                await this.saveHumanMessage(payload, attachments, user, messageToEdit.previousMessageId, model, revisionOfMessageId, trx);
-                return await this.prepareReplyWorkflow(user, sessionId, credentials, model, history, message, session.tools, attachments, tz, trx);
+        let workflow;
+        let newStoredAttachments = [];
+        try {
+            workflow = await this.messageRepository.manager.transaction(async (trx) => {
+                const session = await this.getChatSession(user, sessionId, trx);
+                if (!session) {
+                    throw new not_found_error_1.NotFoundError('Chat session not found');
+                }
+                const messageToEdit = await this.getChatMessage(session.id, editId, [], trx);
+                if (messageToEdit.type === 'ai') {
+                    await this.messageRepository.updateChatMessage(editId, { content: payload.message }, trx);
+                    return null;
+                }
+                if (messageToEdit.type === 'human') {
+                    const messages = Object.fromEntries((session.messages ?? []).map((m) => [m.id, m]));
+                    const history = this.buildMessageHistory(messages, messageToEdit.previousMessageId);
+                    const revisionOfMessageId = messageToEdit.revisionOfMessageId ?? messageToEdit.id;
+                    const originalAttachments = messageToEdit.attachments ?? [];
+                    const keptAttachments = payload.keepAttachmentIndices.flatMap((index) => {
+                        const attachment = originalAttachments[index];
+                        return attachment ? [attachment] : [];
+                    });
+                    newStoredAttachments =
+                        payload.newAttachments.length > 0
+                            ? await this.chatHubAttachmentService.store(sessionId, messageId, payload.newAttachments)
+                            : [];
+                    const attachments = [...keptAttachments, ...newStoredAttachments];
+                    await this.saveHumanMessage(payload, attachments, user, messageToEdit.previousMessageId, model, revisionOfMessageId, trx);
+                    return await this.prepareReplyWorkflow(user, sessionId, credentials, model, history, message, session.tools, attachments, tz, trx);
+                }
+                throw new bad_request_error_1.BadRequestError('Only human and AI messages can be edited');
+            });
+        }
+        catch (error) {
+            if (newStoredAttachments.length > 0) {
+                try {
+                    await this.chatHubAttachmentService.deleteAttachments(newStoredAttachments);
+                }
+                catch (error) {
+                    this.errorReporter.warn(`Could not clean up ${newStoredAttachments.length} files`);
+                }
             }
-            throw new bad_request_error_1.BadRequestError('Only human and AI messages can be edited');
-        });
+            throw error;
+        }
         if (!workflow) {
             return;
         }
@@ -201,8 +226,9 @@ let ChatHubService = class ChatHubService {
     }
     async prepareBaseChatWorkflow(user, sessionId, credentials, model, history, message, systemMessage, tools, attachments, timeZone, trx) {
         await this.chatHubSettingsService.ensureModelIsAllowed(model);
-        const credential = await this.chatHubCredentialsService.ensureCredentials(user, model.provider, credentials, trx);
-        return await this.chatHubWorkflowService.createChatWorkflow(user.id, sessionId, credential.projectId, history, message, attachments, credentials, model, systemMessage, tools, timeZone, trx);
+        this.chatHubCredentialsService.findProviderCredential(model.provider, credentials);
+        const { id: projectId } = await this.chatHubCredentialsService.findPersonalProject(user, trx);
+        return await this.chatHubWorkflowService.createChatWorkflow(user.id, sessionId, projectId, history, message, attachments, credentials, model, systemMessage, tools, timeZone, trx);
     }
     async prepareChatAgentWorkflow(agentId, user, sessionId, history, message, attachments, timeZone, trx) {
         const agent = await this.chatHubAgentService.getAgentById(agentId, user.id);
@@ -475,12 +501,12 @@ let ChatHubService = class ChatHubService {
     }
     async prepareTitleGenerationWorkflow(user, sessionId, humanMessage, attachments, incomingCredentials, incomingModel) {
         return await this.messageRepository.manager.transaction(async (trx) => {
-            const { resolvedCredentials, resolvedModel, credential } = await this.resolveCredentialsAndModelForTitle(user, incomingModel, incomingCredentials, trx);
-            if (!credential) {
+            const { resolvedCredentials, resolvedModel, credentialId, projectId } = await this.resolveCredentialsAndModelForTitle(user, incomingModel, incomingCredentials, trx);
+            if (!credentialId || !projectId) {
                 throw new bad_request_error_1.BadRequestError('Could not determine credentials for title generation');
             }
-            this.logger.debug(`Using credential ID ${credential.id} for title generation in project ${credential.projectId}, model ${(0, n8n_workflow_1.jsonStringify)(resolvedModel)}`);
-            return await this.chatHubWorkflowService.createTitleGenerationWorkflow(user.id, sessionId, credential.projectId, humanMessage, attachments, resolvedCredentials, resolvedModel, trx);
+            this.logger.debug(`Using credential ID ${credentialId} for title generation in project ${projectId}, model ${(0, n8n_workflow_1.jsonStringify)(resolvedModel)}`);
+            return await this.chatHubWorkflowService.createTitleGenerationWorkflow(user.id, sessionId, projectId, humanMessage, attachments, resolvedCredentials, resolvedModel, trx);
         });
     }
     async resolveCredentialsAndModelForTitle(user, model, credentials, trx) {
@@ -490,11 +516,13 @@ let ChatHubService = class ChatHubService {
         if (model.provider === 'custom-agent') {
             return await this.resolveFromCustomAgent(user, model, trx);
         }
-        const credential = await this.chatHubCredentialsService.ensureCredentials(user, model.provider, credentials, trx);
+        const credentialId = this.chatHubCredentialsService.findProviderCredential(model.provider, credentials);
+        const { id: projectId } = await this.chatHubCredentialsService.findPersonalProject(user, trx);
         return {
             resolvedCredentials: credentials,
             resolvedModel: model,
-            credential,
+            credentialId,
+            projectId,
         };
     }
     async resolveFromN8nWorkflow(user, { workflowId }, trx) {
@@ -519,18 +547,18 @@ let ChatHubService = class ChatHubService {
         if (!llmCredentials) {
             throw new bad_request_error_1.BadRequestError(`No credentials found on Model node "${modelNode.node.name}" for title generation`);
         }
-        const credential = await this.chatHubCredentialsService.ensureWorkflowCredentials(modelNode.provider, llmCredentials, workflowId);
+        const { credentialId, projectId } = await this.chatHubCredentialsService.findWorkflowCredentialAndProject(modelNode.provider, llmCredentials, workflowId);
         const resolvedModel = {
             provider: modelNode.provider,
             model: llmModel,
         };
         const resolvedCredentials = {
             [api_types_1.PROVIDER_CREDENTIAL_TYPE_MAP[modelNode.provider]]: {
-                id: credential.id,
+                id: credentialId,
                 name: '',
             },
         };
-        return { resolvedCredentials, resolvedModel, credential };
+        return { resolvedCredentials, resolvedModel, credentialId, projectId };
     }
     findSupportedLLMNodes(nodes) {
         return nodes.reduce((acc, node) => {
@@ -547,8 +575,7 @@ let ChatHubService = class ChatHubService {
         if (!agent) {
             throw new bad_request_error_1.BadRequestError('Agent not found for title generation');
         }
-        const credentialId = agent.credentialId;
-        if (!credentialId) {
+        if (!agent.credentialId) {
             throw new bad_request_error_1.BadRequestError('Credentials not set for agent');
         }
         const resolvedModel = {
@@ -557,12 +584,13 @@ let ChatHubService = class ChatHubService {
         };
         const resolvedCredentials = {
             [api_types_1.PROVIDER_CREDENTIAL_TYPE_MAP[agent.provider]]: {
-                id: credentialId,
+                id: agent.credentialId,
                 name: '',
             },
         };
-        const credential = await this.chatHubCredentialsService.ensureCredentials(user, agent.provider, resolvedCredentials, trx);
-        return { resolvedCredentials, resolvedModel, credential };
+        const credentialId = this.chatHubCredentialsService.findProviderCredential(agent.provider, resolvedCredentials);
+        const { id: projectId } = await this.chatHubCredentialsService.findPersonalProject(user, trx);
+        return { resolvedCredentials, resolvedModel, credentialId, projectId };
     }
     async runTitleWorkflowAndGetTitle(user, workflowData, executionData) {
         const { executionId } = await this.workflowExecutionService.executeChatWorkflow(workflowData, executionData, user, undefined, false, 'chat');