From a6b2e22923789532845169b6f42b0b8cdbfe71f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=B6llenbeck?= <martin.moellenbeck@5minds.de>
Date: Fri, 25 Jul 2025 12:12:22 +0200
Subject: [PATCH] Make scope for processcube-engine-config configurable via
 string, secrets or env

---
 .processcube/nodered/.config.nodes.json |  2 +-
 docker-compose.yml                      |  5 ++---
 package-lock.json                       |  4 ++--
 package.json                            |  2 +-
 processcube-engine-config.html          | 18 ++++++++++++++++++
 processcube-engine-config.js            |  7 ++++++-
 6 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/.processcube/nodered/.config.nodes.json b/.processcube/nodered/.config.nodes.json
index 471fba1..5d1a616 100644
--- a/.processcube/nodered/.config.nodes.json
+++ b/.processcube/nodered/.config.nodes.json
@@ -429,7 +429,7 @@
     },
     "@5minds/node-red-contrib-processcube": {
         "name": "@5minds/node-red-contrib-processcube",
-        "version": "1.15.2",
+        "version": "1.16.0",
         "local": false,
         "user": false,
         "nodes": {
diff --git a/docker-compose.yml b/docker-compose.yml
index 1733caf..0c2ce67 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,8 +30,7 @@ services:
       - engine
   
   engine:
-    #image: 5minds/processcube_engine:2024-1
-    image: 5minds/processcube_engine:19.0.0-beta.11-extensions-2.3.0-beta.8
+    image: ghcr.io/5minds/processcube_engine:19.2.1-extensions-2.3.0
     ports:
       - 8000:8000
     volumes:
@@ -72,7 +71,7 @@ services:
 
 
   authority:
-    image: 5minds/processcube_authority:3.0.4
+    image: ghcr.io/5minds/processcube_authority:3.2.0
     ports:
       - 11560:11560
     volumes:
diff --git a/package-lock.json b/package-lock.json
index 4111a6d..6888ed3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.15.5",
+    "version": "1.16.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@5minds/node-red-contrib-processcube",
-            "version": "1.15.5",
+            "version": "1.16.0",
             "license": "MIT",
             "dependencies": {
                 "@5minds/processcube_engine_client": "^6.1.4",
diff --git a/package.json b/package.json
index 4ad61cf..3b13d47 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.15.5",
+    "version": "1.16.0",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {
diff --git a/processcube-engine-config.html b/processcube-engine-config.html
index 56ca0bf..5a2b780 100644
--- a/processcube-engine-config.html
+++ b/processcube-engine-config.html
@@ -9,6 +9,8 @@
             clientIdType: { type: 'str' },
             clientSecret: { value: '' },
             clientSecretType: { type: 'str' },
+            scope: { value: 'engine_etw engine_read engine_write engine_observer' },
+            scopeType: { type: 'str' },
         },
         label: function () {
             return this.name || this.url;
@@ -29,6 +31,11 @@
                 types: ['str', 'env', 'cred'],
             });
 
+            $('#node-config-input-scope').typedInput({
+                default: 'str',
+                types: ['str', 'env', 'cred'],
+            });
+
             $('#node-config-input-url').typedInput('value', this.url);
             $('#node-config-input-url').typedInput('type', this.urlType);
 
@@ -37,6 +44,9 @@
 
             $('#node-config-input-clientSecret').typedInput('value', this.clientSecret);
             $('#node-config-input-clientSecret').typedInput('type', this.clientSecretType);
+
+            $('#node-config-input-scope').typedInput('value', this.scope);
+            $('#node-config-input-scope').typedInput('type', this.scopeType);
         },
         oneditsave: function () {
             this.url = $('#node-config-input-url').typedInput('value');
@@ -47,6 +57,9 @@
 
             this.clientSecret = $('#node-config-input-clientSecret').typedInput('value');
             this.clientSecretType = $('#node-config-input-clientSecret').typedInput('type');
+
+            this.scope = $('#node-config-input-scope').typedInput('value');
+            this.scopeType = $('#node-config-input-scope').typedInput('type');
         },
     });
 </script>
@@ -68,6 +81,10 @@
         <label for="node-config-input-clientSecret"><i class="fa fa-bookmark"></i> Client secret</label>
         <input type="text" id="node-config-input-clientSecret" />
     </div>
+    <div class="form-row">
+        <label for="node-config-input-scope"><i class="fa fa-bookmark"></i> Scope</label>
+        <input type="text" id="node-config-input-scope" />
+    </div>
 </script>
 
 <script type="text/markdown" data-help-name="processcube-engine-config">
@@ -78,6 +95,7 @@
 : url (String) : The URL of the ProcessCube engine.
 : clientId (String) : The client id for the ProcessCube engine.
 : clientSecret (String) : The client secret for the ProcessCube engine.
+: scope (String|Secret|ENV) : The scope for the ProcessCube engine.
 
 ### References
 
diff --git a/processcube-engine-config.js b/processcube-engine-config.js
index ba7fff7..9a380f7 100644
--- a/processcube-engine-config.js
+++ b/processcube-engine-config.js
@@ -8,6 +8,11 @@ module.exports = function (RED) {
         node.url = RED.util.evaluateNodeProperty(n.url, n.urlType, node);
         node.credentials.clientId = RED.util.evaluateNodeProperty(n.clientId, n.clientIdType, node);
         node.credentials.clientSecret = RED.util.evaluateNodeProperty(n.clientSecret, n.clientSecretType, node);
+        node.credentials.scope = RED.util.evaluateNodeProperty(n.scope, n.scopeType, node);
+
+        if (!node.credentials.scope) {
+            node.credentials.scope = 'engine_etw engine_read engine_write engine_observer';
+        }
 
         try {
             if (node.credentials.clientId && node.credentials.clientSecret) {
@@ -15,7 +20,7 @@ module.exports = function (RED) {
                 node.engineClient = new engine_client.EngineClient(node.url, {
                     clientId: node.credentials.clientId,
                     clientSecret: node.credentials.clientSecret,
-                    scope: 'engine_etw engine_read engine_write engine_observer',
+                    scope: node.credentials.scope,
                 });
             } else {
                 node.log('Create Client without secrets');