@5minds/node-red-contrib-processcube 1.7.4-feature-0f7992-m6kko7d1 → 1.7.4-feature-5965fd-m6ksznqa

package/.processcube/nodered/flows.json

@@ -111,14 +111,6 @@
         "info": "",
         "env": []
     },
-    {
-        "id": "d2d4021c0003f913",
-        "type": "tab",
-        "label": "TokenTest",
-        "disabled": false,
-        "info": "",
-        "env": []
-    },
     {
         "id": "4c59118134081e05",
         "type": "group",
@@ -677,12 +669,7 @@
         "id": "b78932d162d8d468",
         "type": "processcube-engine-config",
         "name": "Engine Auth 8000",
-        "url": "http://engine:8000",
-        "urlType": "str",
-        "clientId": "nodered",
-        "clientIdType": "str",
-        "clientSecret": "nodered",
-        "clientSecretType": "str"
+        "url": "http://engine:8000"
     },
     {
         "id": "2991a5e6df2b87d2",
@@ -3112,122 +3099,5 @@
                 "af52431420fa7e15"
             ]
         ]
-    },
-    {
-        "id": "6498965c90a69b52",
-        "type": "externaltask-input",
-        "z": "d2d4021c0003f913",
-        "name": "",
-        "engine": "b78932d162d8d468",
-        "topic": "TriggerPCNode",
-        "topicType": "str",
-        "workerConfig": "{}",
-        "workerConfigType": "json",
-        "x": 410,
-        "y": 200,
-        "wires": [
-            [
-                "04d89e4c96b9b2a6",
-                "718a8f661fef6590"
-            ]
-        ]
-    },
-    {
-        "id": "718a8f661fef6590",
-        "type": "externaltask-output",
-        "z": "d2d4021c0003f913",
-        "name": "",
-        "x": 910,
-        "y": 200,
-        "wires": []
-    },
-    {
-        "id": "04d89e4c96b9b2a6",
-        "type": "debug",
-        "z": "d2d4021c0003f913",
-        "name": "debug 3",
-        "active": true,
-        "tosidebar": true,
-        "console": false,
-        "tostatus": false,
-        "complete": "true",
-        "targetType": "full",
-        "statusVal": "",
-        "statusType": "auto",
-        "x": 660,
-        "y": 300,
-        "wires": []
-    },
-    {
-        "id": "5b61ceb915a981c1",
-        "type": "inject",
-        "z": "d2d4021c0003f913",
-        "name": "",
-        "props": [],
-        "repeat": "",
-        "crontab": "",
-        "once": false,
-        "onceDelay": 0.1,
-        "topic": "",
-        "x": 270,
-        "y": 420,
-        "wires": [
-            [
-                "b89a529a7e0b5f75"
-            ]
-        ]
-    },
-    {
-        "id": "b89a529a7e0b5f75",
-        "type": "function",
-        "z": "d2d4021c0003f913",
-        "name": "function 1",
-        "func": "msg = { \"_event\": { \"type\": \"click\", \"clientX\": 892, \"clientY\": 123, \"bbox\": { \"x\": 832.5, \"y\": 119, \"width\": 310, \"height\": 38, \"top\": 119, \"right\": 1142.5, \"bottom\": 157, \"left\": 832.5 } }, \"_client\": { \"user\": { \"id\": \"ca4ca3de-3e80-40f9-8233-453cf2233fc2\", \"displayName\": \"admin\", \"username\": \"admin\", \"profileUrl\": \"\", \"emails\": [{ \"value\": \"admin@admin.de\" }], \"claims\": { \"sub\": \"ca4ca3de-3e80-40f9-8233-453cf2233fc2\", \"profile\": \"\", \"email\": \"admin@admin.de\", \"locale\": \"\", \"nickname\": \"\", \"website\": \"\", \"middle_name\": \"\", \"zoneinfo\": \"\", \"given_name\": \"\", \"birthdate\": \"\", \"gender\": \"\", \"company\": \"\", \"family_name\": \"\", \"updated_at\": null, \"email_verified\": true, \"preferred_username\": \"\", \"picture\": \"\", \"name\": \"admin\", \"jti\": \"6CQecbRqFPnsTLKV_cbG9\", \"iat\": 1738242946, \"exp\": 1738246546, \"scope\": \"openid profile email lanes\", \"client_id\": \"PassportTestClient\", \"iss\": \"http://authority:11560/\", \"aud\": \"PassportTestClient\" }, \"accessToken\": \"eyJhbGciOiJSUzI1NiIsInR5cCI6ImF0K2p3dCIsImtpZCI6IlA1RXlTLVFjem80Z2IxQUNiNmxadmhDQTBpdWVNUnpqTlRuNnVpRl94RkkifQ.eyJzdWIiOiJjYTRjYTNkZS0zZTgwLTQwZjktODIzMy00NTNjZjIyMzNmYzIiLCJwcm9maWxlIjoiIiwiZW1haWwiOiJhZG1pbkBhZG1pbi5kZSIsImxvY2FsZSI6IiIsIm5pY2tuYW1lIjoiIiwid2Vic2l0ZSI6IiIsIm1pZGRsZV9uYW1lIjoiIiwiem9uZWluZm8iOiIiLCJnaXZlbl9uYW1lIjoiIiwiYmlydGhkYXRlIjoiIiwiZ2VuZGVyIjoiIiwiY29tcGFueSI6IiIsImZhbWlseV9uYW1lIjoiIiwidXBkYXRlZF9hdCI6bnVsbCwiZW1haWxfdmVyaWZpZWQiOnRydWUsInByZWZlcnJlZF91c2VybmFtZSI6IiIsInBpY3R1cmUiOiIiLCJuYW1lIjoiYWRtaW4iLCJqdGkiOiI2Q1FlY2JScUZQbnNUTEtWX2NiRzkiLCJpYXQiOjE3MzgyNDI5NDYsImV4cCI6MTczODI0NjU0Niwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBlbWFpbCBsYW5lcyIsImNsaWVudF9pZCI6IlBhc3Nwb3J0VGVzdENsaWVudCIsImlzcyI6Imh0dHA6Ly9hdXRob3JpdHk6MTE1NjAvIiwiYXVkIjoiUGFzc3BvcnRUZXN0Q2xpZW50In0.sBPvFE38A1RX7bs_tjZf8IjOaMVmKqdCxlZo0r9YJvCRwC_kM6G-n4CQEYJkTkO4ZmNpCPk01vNasCsXPG-bUedHJzIPb1DxuHQX7N51jepjgf6SY_BOKhSftw0jJvnvTUfxzPBE4gb6a5VO02mPfTyt8Vqx54mM3tZgoA_OEg-T0Uv0PTYd4VT671TUwACVhFSN43njJ04jX...\" }, \"socketId\": \"RunwgKI4_c0wEvu3AAAB\", \"socketIp\": \"172.20.0.1\" }, \"topic\": \"\", \"payload\": \"\", \"_msgid\": \"98958041794d2d15\" }\nreturn msg;",
-        "outputs": 1,
-        "timeout": 0,
-        "noerr": 0,
-        "initialize": "",
-        "finalize": "",
-        "libs": [],
-        "x": 440,
-        "y": 420,
-        "wires": [
-            [
-                "4cc598063a38db82"
-            ]
-        ]
-    },
-    {
-        "id": "4cc598063a38db82",
-        "type": "process-start",
-        "z": "d2d4021c0003f913",
-        "name": "",
-        "engine": "b78932d162d8d468",
-        "processmodel": "StartProcessSample_Process",
-        "startevent": "StartEvent_1",
-        "x": 630,
-        "y": 420,
-        "wires": [
-            [
-                "da96fb5b9dfe8b66"
-            ]
-        ]
-    },
-    {
-        "id": "da96fb5b9dfe8b66",
-        "type": "debug",
-        "z": "d2d4021c0003f913",
-        "name": "debug 4",
-        "active": true,
-        "tosidebar": true,
-        "console": false,
-        "tostatus": false,
-        "complete": "true",
-        "targetType": "full",
-        "statusVal": "",
-        "statusType": "auto",
-        "x": 820,
-        "y": 420,
-        "wires": []
     }
 ]

package/message-event-trigger.js

@@ -6,6 +6,8 @@ module.exports = function (RED) {
         node.on('input', function (msg) {
             node.engine = RED.nodes.getNode(config.engine);
             const client = node.engine.engineClient;
+            const isUser = !!msg._client?.user
+            const userIdentity = isUser ? { userId: msg._client.user.id, token: msg._client.user.accessToken } : null;
 
             if (!client) {
                 node.error('No engine configured.', msg);
@@ -16,6 +18,7 @@ module.exports = function (RED) {
                 .triggerMessageEvent(config.messagename, {
                     processInstanceId: msg.processinstanceid,
                     payload: msg.payload,
+                    identity: userIdentity
                 })
                 .then((result) => {
                     msg.payload = result;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.7.4-feature-0f7992-m6kko7d1",
+    "version": "1.7.4-feature-5965fd-m6ksznqa",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {

package/process-start.js

@@ -1,5 +1,3 @@
-const engine_client = require('@5minds/processcube_engine_client');
-
 module.exports = function (RED) {
     function ProcessStart(config) {
         RED.nodes.createNode(this, config);
@@ -42,7 +40,7 @@ module.exports = function (RED) {
                 return;
             }
 
-            const isUser = !!msg._client.user
+            const isUser = !!msg._client?.user
             const identity = isUser ? { userId: msg._client.user.id, token: msg._client.user.accessToken } : null;
 
             client.processDefinitions

package/process-terminate.js

@@ -6,6 +6,8 @@ module.exports = function (RED) {
         node.on('input', function (msg) {
             node.engine = RED.nodes.getNode(config.engine);
             const client = node.engine.engineClient;
+            const isUser = !!msg._client?.user
+            const userIdentity = isUser ? { userId: msg._client.user.id, token: msg._client.user.accessToken } : null;
 
             if (!client) {
                 node.error('No engine configured.', msg);
@@ -13,7 +15,7 @@ module.exports = function (RED) {
             }
 
             client.processInstances
-                .terminateProcessInstance(msg.payload)
+                .terminateProcessInstance(msg.payload, userIdentity)
                 .then(() => {
                     node.send(msg);
                 })

package/processdefinition-deploy.js

@@ -6,6 +6,8 @@ module.exports = function (RED) {
         node.on('input', function (msg) {
             node.engine = RED.nodes.getNode(config.engine);
             const client = node.engine.engineClient;
+            const isUser = !!msg._client?.user
+            const userIdentity = isUser ? { userId: msg._client.user.id, token: msg._client.user.accessToken } : null;
 
             if (!client) {
                 node.error('No engine configured.');
@@ -13,7 +15,7 @@ module.exports = function (RED) {
             }
      
             client.processDefinitions
-                .persistProcessDefinitions(msg.payload, { overwriteExisting: true  })
+                .persistProcessDefinitions(msg.payload, { overwriteExisting: true, identity: userIdentity })
                 .then(() => {
                     node.send(msg);
                 })

package/processdefinition-query.js

@@ -16,6 +16,10 @@ module.exports = function (RED) {
 
             node.log(`Querying process definitions with query: ${JSON.stringify(query)}`);
 
+            const isUser = !!msg._client?.user
+            const identity = isUser ? { userId: msg._client.user.id, token: msg._client.user.accessToken } : null;
+            query.identity = identity;
+
             client.processDefinitions
                 .getAll(query)
                 .then((matchingProcessDefinitions) => {

package/processinstance-delete.js

@@ -7,6 +7,9 @@ module.exports = function (RED) {
             node.engine = RED.nodes.getNode(config.engine);
             const client = node.engine ? node.engine.engineClient : null;
 
+            const isUser = !!msg._client?.user
+            const userIdentity = isUser ? { userId: msg._client.user.id, token: msg._client.user.accessToken } : null;
+
             if (!client || !client.processInstances) {
                 node.error('No engine or processInstances API configured.', msg);
                 return;
@@ -64,7 +67,10 @@ module.exports = function (RED) {
                             state: ['finished', 'error', 'terminated'],
                             limit: batchSize,
                         },
-                        { includeXml: false }
+                        { 
+                            includeXml: false,
+                            identity: userIdentity
+                        }
                     );
 
                     const processInstances = result.processInstances || [];
@@ -77,7 +83,7 @@ module.exports = function (RED) {
                     const ids = processInstances.map((obj) => obj.processInstanceId);
 
                     try {
-                        await client.processInstances.deleteProcessInstances(ids, true);
+                        await client.processInstances.deleteProcessInstances(ids, true, userIdentity);
                         msg.payload.successfulDeletions.push(...ids);
                         sumSuccessful += ids.length;                         
                     } catch (deleteError) {

package/processinstance-query.js

@@ -8,6 +8,8 @@ module.exports = function (RED) {
 
             node.engine = RED.nodes.getNode(config.engine);
             const client = node.engine.engineClient;
+            const isUser = !!msg._client?.user
+            const userIdentity = isUser ? { userId: msg._client.user.id, token: msg._client.user.accessToken } : null;
 
             if (!client) {
                 node.error('No engine configured.', msg);
@@ -15,7 +17,7 @@ module.exports = function (RED) {
             }
 
             client.processInstances
-                .query(query)
+                .query(query, { identity: userIdentity })   
                 .then((matchingInstances) => {
                     msg.payload = matchingInstances;
 

package/signal-event-trigger.js

@@ -7,6 +7,8 @@ module.exports = function (RED) {
             node.engine = RED.nodes.getNode(config.engine);
 
             const client = node.engine.engineClient;
+            const isUser = !!msg._client?.user
+            const userIdentity = isUser ? { userId: msg._client.user.id, token: msg._client.user.accessToken } : null;
 
             if (!client) {
                 node.error('No engine configured.', msg);
@@ -17,6 +19,7 @@ module.exports = function (RED) {
                 .triggerSignalEvent(config.signalname, {
                     processInstanceId: msg.processinstanceid,
                     payload: msg.payload,
+                    identity: userIdentity
                 })
                 .then((result) => {
                     msg.payload = result;

package/usertask-input.js

@@ -7,6 +7,8 @@ module.exports = function (RED) {
             node.engine = RED.nodes.getNode(config.engine);
 
             const client = node.engine.engineClient;
+            const isUser = !!msg._client?.user
+            const userIdentity = isUser ? { userId: msg._client.user.id, token: msg._client.user.accessToken } : null;
 
             if (!client) {
                 node.error('No engine configured.', msg);
@@ -16,7 +18,7 @@ module.exports = function (RED) {
             let query = RED.util.evaluateNodeProperty(config.query, config.query_type, node, msg);
 
             client.userTasks
-                .query(query)
+                .query(query, {identity: userIdentity})
                 .then((matchingFlowNodes) => {
                     if (config.sendtype === 'array') {
                         msg.payload = { userTasks: matchingFlowNodes.userTasks || [] };

package/usertask-output.js

@@ -17,6 +17,8 @@ module.exports = function (RED) {
                 node.engine = RED.nodes.getNode(config.engine);
 
                 const client = node.engine.engineClient;
+                const isUser = !!msg._client?.user
+                const userIdentity = isUser ? { userId: msg._client.user.id, token: msg._client.user.accessToken } : null;
 
                 if (!client) {
                     node.error('No engine configured.', msg);
@@ -24,7 +26,7 @@ module.exports = function (RED) {
                 }
 
                 client.userTasks
-                    .finishUserTask(flowNodeInstanceId, userTaskResult)
+                    .finishUserTask(flowNodeInstanceId, userTaskResult, userIdentity)
                     .then(() => {
                         node.send(msg);
                     })

package/wait-for-usertask.js

@@ -4,6 +4,8 @@ module.exports = function (RED) {
         var node = this;
 
         node.engine = RED.nodes.getNode(config.engine);
+        const isUser = !!msg._client?.user
+        const userIdentity = isUser ? { userId: msg._client.user.id, token: msg._client.user.accessToken } : null;
 
         let subscription = null;
         let subscribe = null;
@@ -25,11 +27,11 @@ module.exports = function (RED) {
                     };
 
                     try {
-                        const matchingFlowNodes = await client.userTasks.query(newQuery);
+                        const matchingFlowNodes = await client.userTasks.query(newQuery, {identity: userIdentity});
 
                         if (matchingFlowNodes.userTasks && matchingFlowNodes.userTasks.length == 1) {
                             // remove subscription
-                            client.userTasks.removeSubscription(subscription);
+                            client.userTasks.removeSubscription(subscription, userIdentity);
 
                             const userTask = matchingFlowNodes.userTasks[0];
 
@@ -41,6 +43,8 @@ module.exports = function (RED) {
                     } catch (error) {
                         node.error(error, msg);
                     }
+                },{
+                    identity: userIdentity,
                 });
 
                 node.log({ 'Handling old userTasks config.only_for_new': config.only_for_new });
@@ -53,7 +57,7 @@ module.exports = function (RED) {
                     };
 
                     try {
-                        const matchingFlowNodes = await client.userTasks.query(suspendedQuery);
+                        const matchingFlowNodes = await client.userTasks.query(suspendedQuery, {identity: userIdentity});
 
                         if (matchingFlowNodes.userTasks && matchingFlowNodes.userTasks.length >= 1) {
                             const userTask = matchingFlowNodes.userTasks[0];
@@ -62,7 +66,7 @@ module.exports = function (RED) {
                             node.send(msg);
 
                             // remove subscription
-                            client.userTasks.removeSubscription(subscription);
+                            client.userTasks.removeSubscription(subscription, userIdentity);
                         } else {
                             // let the *currentIdentity* be active
                         }
@@ -77,7 +81,7 @@ module.exports = function (RED) {
 
         node.on('close', () => {
             if (client != null && subscription != null) {
-                client.userTasks.removeSubscription(subscription);
+                client.userTasks.removeSubscription(subscription, );
             }
         });
     }

package/processes/TokenTest.bpmn

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="TokenTest_Definition" targetNamespace="http://bpmn.io/schema/bpmn" exporter="5Minds Studio" exporterVersion="1">
-  <bpmn:collaboration id="Collaboration_1cidyxu" name="">
-    <bpmn:participant id="Participant_0qqs1cu" name="Token-Test" processRef="Token-Test_Process" />
-  </bpmn:collaboration>
-  <bpmn:process id="Token-Test_Process" name="Token-Test" isExecutable="true">
-    <bpmn:laneSet id="LaneSet_1aqtpqs">
-      <bpmn:lane id="Lane_1mo8jcc" name="Lane">
-        <bpmn:flowNodeRef>Event_1ptmb8y</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Event_03og9pn</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_1ce0pce</bpmn:flowNodeRef>
-      </bpmn:lane>
-    </bpmn:laneSet>
-    <bpmn:startEvent id="Event_1ptmb8y" name="Start">
-      <bpmn:outgoing>Flow_14x1t60</bpmn:outgoing>
-    </bpmn:startEvent>
-    <bpmn:endEvent id="Event_03og9pn">
-      <bpmn:incoming>Flow_09xp1ep</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:serviceTask id="Activity_1ce0pce" name="TriggerPCNode" camunda:type="external" camunda:topic="TriggerPCNode">
-      <bpmn:incoming>Flow_14x1t60</bpmn:incoming>
-      <bpmn:outgoing>Flow_09xp1ep</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="Flow_14x1t60" sourceRef="Event_1ptmb8y" targetRef="Activity_1ce0pce" />
-    <bpmn:sequenceFlow id="Flow_09xp1ep" sourceRef="Activity_1ce0pce" targetRef="Event_03og9pn" />
-  </bpmn:process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_1cidyxu">
-      <bpmndi:BPMNShape id="BPMNShape_0cjotgc" bpmnElement="Participant_0qqs1cu" isHorizontal="true">
-        <dc:Bounds x="-80" y="-310" width="885" height="346" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1ib40km" bpmnElement="Lane_1mo8jcc" isHorizontal="true">
-        <dc:Bounds x="-50" y="-310" width="855" height="346" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_139q3mx" bpmnElement="Event_1ptmb8y">
-        <dc:Bounds x="7" y="-162" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="13" y="-119" width="25" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_03og9pn_di" bpmnElement="Event_03og9pn">
-        <dc:Bounds x="247" y="-162" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1rdy3md_di" bpmnElement="Activity_1ce0pce">
-        <dc:Bounds x="95" y="-184" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Flow_14x1t60_di" bpmnElement="Flow_14x1t60">
-        <di:waypoint x="43" y="-144" />
-        <di:waypoint x="95" y="-144" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_09xp1ep_di" bpmnElement="Flow_09xp1ep">
-        <di:waypoint x="195" y="-144" />
-        <di:waypoint x="247" y="-144" />
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn:definitions>