From 33aacb9752dc5618ae7e80991292eb2b4ee5d018 Mon Sep 17 00:00:00 2001
From: Mirko Curtolo <mirko.curtolo86@gmail.com>
Date: Wed, 24 Jul 2024 12:17:05 +0200
Subject: [PATCH 1/2] Extend Space ID support to all nodes

---
 arduino-iot-cloud.html                 |  17 +++
 arduino-iot-cloud.js                   |  27 ++--
 package-lock.json                      | 169 +++++++++++++------------
 package.json                           |   2 +-
 utils/arduino-connection-manager.js    |   2 +-
 utils/arduino-iot-cloud-api-wrapper.js |  12 +-
 6 files changed, 133 insertions(+), 96 deletions(-)

diff --git a/arduino-iot-cloud.html b/arduino-iot-cloud.html
index 2a390c5..b8025df 100644
--- a/arduino-iot-cloud.html
+++ b/arduino-iot-cloud.html
@@ -45,6 +45,7 @@
             property: {value: "", validate: validator},
             name: {value: "", validate: validator},
             propname: {value: ""},
+            organization: {value: ""},
             defaultname: {value: true}
         };
 
@@ -424,6 +425,10 @@
     <label for="node-input-connection"><i class="fa fa-random fa-fw"></i><span data-i18n="arduino-iot-cloud.config.node.connection"></span></label>
     <input type="text" id="node-input-connection">
   </div>
+  <div class="form-row">
+    <label for="node-input-organization"><i class="fa fa-tag fa-fw"></i><span data-i18n="arduino-iot-cloud.config.node.organization"></span></label>
+    <input type="text" id="node-input-organization" data-i18n="[placeholder]arduino-iot-cloud.config.node.placeholders.organization">
+  </div>
   <div class="form-row">
       <label for="node-input-thing"><i class="fa fa-cubes fa-fw"></i> <span data-i18n="arduino-iot-cloud.config.node.thing"></span></label>
       <select id="node-input-thing">
@@ -455,6 +460,10 @@
     <label for="node-input-connection"><i class="fa fa-random fa-fw"></i><span data-i18n="arduino-iot-cloud.config.node.connection"></span></label>
     <input type="text" id="node-input-connection">
   </div>
+  <div class="form-row">
+    <label for="node-input-organization"><i class="fa fa-tag fa-fw"></i><span data-i18n="arduino-iot-cloud.config.node.organization"></span></label>
+    <input type="text" id="node-input-organization" data-i18n="[placeholder]arduino-iot-cloud.config.node.placeholders.organization">
+  </div>
   <div class="form-row">
     <label for="node-input-thing"><i class="fa fa-cubes fa-fw"></i><span data-i18n="arduino-iot-cloud.config.node.thing"></span></label>
     <select id="node-input-thing">
@@ -492,6 +501,10 @@
     <label for="node-input-connection"><i class="fa fa-random fa-fw"></i><span data-i18n="arduino-iot-cloud.config.node.connection"></span></label>
     <input type="text" id="node-input-connection">
   </div>
+  <div class="form-row">
+    <label for="node-input-organization"><i class="fa fa-tag fa-fw"></i><span data-i18n="arduino-iot-cloud.config.node.organization"></span></label>
+    <input type="text" id="node-input-organization" data-i18n="[placeholder]arduino-iot-cloud.config.node.placeholders.organization">
+  </div>
   <div class="form-row">
     <label for="node-input-thing"><i class="fa fa-cubes fa-fw"></i> <span data-i18n="arduino-iot-cloud.config.node.thing"></span></label>
     <select id="node-input-thing">
@@ -527,6 +540,10 @@
     <label for="node-input-connection"><i class="fa fa-random fa-fw"></i><span data-i18n="arduino-iot-cloud.config.node.connection"></span></label>
     <input type="text" id="node-input-connection">
   </div>
+  <div class="form-row">
+    <label for="node-input-organization"><i class="fa fa-tag fa-fw"></i><span data-i18n="arduino-iot-cloud.config.node.organization"></span></label>
+    <input type="text" id="node-input-organization" data-i18n="[placeholder]arduino-iot-cloud.config.node.placeholders.organization">
+  </div>
   <div class="form-row">
     <label for="node-input-thing"><i class="fa fa-cubes fa-fw"></i><span data-i18n="arduino-iot-cloud.config.node.thing"></span></label>
     <select id="node-input-thing">
diff --git a/arduino-iot-cloud.js b/arduino-iot-cloud.js
index 0951af2..8202835 100644
--- a/arduino-iot-cloud.js
+++ b/arduino-iot-cloud.js
@@ -84,10 +84,13 @@ module.exports = function (RED) {
               this.propertyName = config.name;
               this.sendasdevice = config.sendasdevice;
               this.device = config.device
-              
+              const opts = {}
+              if (this.organization) {
+                opts.xOrganization = this.organization;
+              }            
               this.on('input', async function (msg) {
                 try {
-                  await this.arduinoRestClient.setProperty(this.thing, this.propertyId, msg.payload, this.sendasdevice ? this.device : undefined);
+                  await this.arduinoRestClient.setProperty(this.thing, this.propertyId, msg.payload, opts, this.sendasdevice ? this.device : undefined);
                   var s;
                   if (typeof msg.payload !== "object") {
                     s = getStatus(msg.payload);
@@ -157,6 +160,10 @@ module.exports = function (RED) {
               this.thing = config.thing;
               this.propertyId = config.property;
               this.propertyName = config.name;
+              const opts = {}
+              if (this.organization) {
+                opts.xOrganization = this.organization;
+              }  
               node.on('input', async function () {
                 try{
                   const now = moment();
@@ -165,7 +172,7 @@ module.exports = function (RED) {
                   if (count !== null && count !== "" && count !== undefined && Number.isInteger(parseInt(count)) && parseInt(count) !== 0) {
                     const start = now.subtract(count * this.timeWindowUnit, 'second').format();
 
-                    const result = await this.arduinoRestClient.getSeries(this.thing, this.propertyId, start, end);
+                    const result = await this.arduinoRestClient.getSeries(this.thing, this.propertyId, start, end, opts);
                     const times = result.responses[0].times;
                     const values = result.responses[0].values;
                     let data = [];
@@ -241,19 +248,19 @@ module.exports = function (RED) {
       this.status({});
       this.timeWindowCount = config.timeWindowCount;
       this.timeWindowUnit = config.timeWindowUnit;
+      this.organization = config.organization;
       if (connectionConfig && config.thing !== "" && config.thing !== "0" && config.property !== "" && config.property !== "0") {
         try {
           this.arduinoRestClient = await connectionManager.getClientHttp(connectionConfig);
           if (this.arduinoRestClient){
             this.arduinoRestClient.openConnections++;
             if (config.thing !== "" && config.property !== "") {
-              this.organization = config.organization;
               this.thing = config.thing;
               this.propertyId = config.property;
               this.propertyName = config.name;
               const pollTime = this.timeWindowCount * this.timeWindowUnit;
               if (pollTime !== null && pollTime !== "" && pollTime !== undefined && Number.isInteger(parseInt(pollTime)) && parseInt(pollTime) !== 0) {
-                this.poll(connectionConfig, pollTime);
+                this.poll(connectionConfig, pollTime, this.organization);
                 this.on('close', function (done) {
                   connectionManager.deleteClientHttp(connectionConfig.credentials.clientid).then(() => { done(); });
                   if (this.pollTimeoutPoll)
@@ -283,9 +290,13 @@ module.exports = function (RED) {
     realConstructor.apply(this, [config]);
   }
   ArduinoIotInputPoll.prototype = {
-    poll: async function (connectionConfig, pollTime) {
+    poll: async function (connectionConfig, pollTime, organization) {
       try {
-        const property = await this.arduinoRestClient.getProperty(this.thing, this.propertyId);
+        const opts = {}
+        if (organization) {
+          opts.xOrganization = organization;
+        }  
+        const property = await this.arduinoRestClient.getProperty(this.thing, this.propertyId, opts);
         this.send(
           {
             topic: property.name,
@@ -298,7 +309,7 @@ module.exports = function (RED) {
           this.status({ fill: "grey", shape: "dot", text: s });
         else
           this.status({});
-        this.pollTimeoutPoll = setTimeout(() => { this.poll(connectionConfig, pollTime) }, pollTime * 1000);
+        this.pollTimeoutPoll = setTimeout(() => { this.poll(connectionConfig, pollTime, organization) }, pollTime * 1000);
       } catch (err) {
         if(err.response && err.response.res && err.response.request){
           console.log('statusCode: '+ err.response.res.statusCode +'\n'+
diff --git a/package-lock.json b/package-lock.json
index 3f2b6a6..4c4b437 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.10",
       "license": "GNU AFFERO GENERAL PUBLIC LICENSE",
       "dependencies": {
-        "@arduino/arduino-iot-client": "^1.4.2",
+        "@arduino/arduino-iot-client": "github:arduino/iot-client-js",
         "@arduino/cbor-js": "github:arduino/cbor-js",
         "async-mutex": "^0.1.4",
         "jws": "^3.2.2",
@@ -32,70 +32,79 @@
       }
     },
     "node_modules/@arduino/arduino-iot-client": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@arduino/arduino-iot-client/-/arduino-iot-client-1.4.2.tgz",
-      "integrity": "sha512-mlIBype4l+kSnGnNH8hO3CjmoDHRJpLCpjiySiKmNL0z87Wcz+1b5LLiTT/748UmbB/2FrgPZsDn8RVbB+FAhw==",
+      "version": "2.0.4",
+      "resolved": "git+ssh://git@github.com/arduino/iot-client-js.git#18e50fd5a420a26c025b59cd936e7d23e86d9955",
+      "license": "GPLv3",
       "dependencies": {
         "@babel/cli": "^7.0.0",
-        "superagent": "3.7.0"
+        "superagent": "^5.3.0"
       }
     },
     "node_modules/@arduino/arduino-iot-client/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
       "dependencies": {
-        "ms": "^2.1.1"
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@arduino/arduino-iot-client/node_modules/form-data": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+    "node_modules/@arduino/arduino-iot-client/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/@arduino/arduino-iot-client/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       },
       "engines": {
-        "node": ">= 0.12"
+        "node": ">= 6"
       }
     },
-    "node_modules/@arduino/arduino-iot-client/node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+    "node_modules/@arduino/arduino-iot-client/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "bin": {
-        "mime": "cli.js"
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
       }
     },
-    "node_modules/@arduino/arduino-iot-client/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
     "node_modules/@arduino/arduino-iot-client/node_modules/superagent": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.7.0.tgz",
-      "integrity": "sha512-/8trxO6NbLx4YXb7IeeFTSmsQ35pQBiTBsLNvobZx7qBzBeHYvKCyIIhW2gNcWbLzYxPAjdgFbiepd8ypwC0Gw==",
-      "deprecated": "Please upgrade to v7.0.2+ of superagent.  We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing.  See the releases tab for more information at <https://github.com/visionmedia/superagent/releases>.",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
+      "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
+      "deprecated": "Please upgrade to v9.0.0+ as we have fixed a public vulnerability with formidable dependency. Note that v9.0.0+ requires Node.js v14.18.0+. See https://github.com/ladjs/superagent/pull/1800 for insight. This project is supported and maintained by the team at Forward Email @ https://forwardemail.net",
       "dependencies": {
-        "component-emitter": "^1.2.0",
-        "cookiejar": "^2.1.0",
-        "debug": "^3.1.0",
-        "extend": "^3.0.0",
-        "form-data": "^2.3.1",
-        "formidable": "^1.1.1",
-        "methods": "^1.1.1",
-        "mime": "^1.4.1",
-        "qs": "^6.5.1",
-        "readable-stream": "^2.0.5"
+        "component-emitter": "^1.3.0",
+        "cookiejar": "^2.1.2",
+        "debug": "^4.1.1",
+        "fast-safe-stringify": "^2.0.7",
+        "form-data": "^3.0.0",
+        "formidable": "^1.2.2",
+        "methods": "^1.1.2",
+        "mime": "^2.4.6",
+        "qs": "^6.9.4",
+        "readable-stream": "^3.6.0",
+        "semver": "^7.3.2"
       },
       "engines": {
-        "node": ">= 4.0"
+        "node": ">= 7.0.0"
       }
     },
     "node_modules/@arduino/cbor-js": {
@@ -3312,57 +3321,57 @@
       }
     },
     "@arduino/arduino-iot-client": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@arduino/arduino-iot-client/-/arduino-iot-client-1.4.2.tgz",
-      "integrity": "sha512-mlIBype4l+kSnGnNH8hO3CjmoDHRJpLCpjiySiKmNL0z87Wcz+1b5LLiTT/748UmbB/2FrgPZsDn8RVbB+FAhw==",
+      "version": "git+ssh://git@github.com/arduino/iot-client-js.git#18e50fd5a420a26c025b59cd936e7d23e86d9955",
+      "from": "@arduino/arduino-iot-client@arduino/iot-client-js",
       "requires": {
         "@babel/cli": "^7.0.0",
-        "superagent": "3.7.0"
+        "superagent": "^5.3.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "version": "4.3.5",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+          "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
-        "form-data": {
-          "version": "2.5.1",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-          "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "readable-stream": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
           "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.6",
-            "mime-types": "^2.1.12"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         },
-        "mime": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+        "semver": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="
         },
         "superagent": {
-          "version": "3.7.0",
-          "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.7.0.tgz",
-          "integrity": "sha512-/8trxO6NbLx4YXb7IeeFTSmsQ35pQBiTBsLNvobZx7qBzBeHYvKCyIIhW2gNcWbLzYxPAjdgFbiepd8ypwC0Gw==",
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
+          "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
           "requires": {
-            "component-emitter": "^1.2.0",
-            "cookiejar": "^2.1.0",
-            "debug": "^3.1.0",
-            "extend": "^3.0.0",
-            "form-data": "^2.3.1",
-            "formidable": "^1.1.1",
-            "methods": "^1.1.1",
-            "mime": "^1.4.1",
-            "qs": "^6.5.1",
-            "readable-stream": "^2.0.5"
+            "component-emitter": "^1.3.0",
+            "cookiejar": "^2.1.2",
+            "debug": "^4.1.1",
+            "fast-safe-stringify": "^2.0.7",
+            "form-data": "^3.0.0",
+            "formidable": "^1.2.2",
+            "methods": "^1.1.2",
+            "mime": "^2.4.6",
+            "qs": "^6.9.4",
+            "readable-stream": "^3.6.0",
+            "semver": "^7.3.2"
           }
         }
       }
diff --git a/package.json b/package.json
index 938bde3..079a5d0 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     }
   },
   "dependencies": {
-    "@arduino/arduino-iot-client": "^1.4.2",
+    "@arduino/arduino-iot-client": "github:arduino/iot-client-js",
     "@arduino/cbor-js": "github:arduino/cbor-js",
     "async-mutex": "^0.1.4",
     "jws": "^3.2.2",
diff --git a/utils/arduino-connection-manager.js b/utils/arduino-connection-manager.js
index f5ca626..e553778 100644
--- a/utils/arduino-connection-manager.js
+++ b/utils/arduino-connection-manager.js
@@ -115,7 +115,7 @@ function getMqttOptions(clientId,token,RED){
 async function getClientMqtt(connectionConfig, RED) {
 
   if (!connectionConfig || !connectionConfig.credentials) {
-    throw new Error("Cannot find cooonection config or credentials.");
+    throw new Error("Cannot find connection config or credentials.");
   }
   const releaseMutex = await getClientMutex.acquire();
   try {
diff --git a/utils/arduino-iot-cloud-api-wrapper.js b/utils/arduino-iot-cloud-api-wrapper.js
index d631ec5..1fcaf10 100644
--- a/utils/arduino-iot-cloud-api-wrapper.js
+++ b/utils/arduino-iot-cloud-api-wrapper.js
@@ -40,13 +40,13 @@ class ArduinoClientHttp {
   updateToken(token) {
     this.token = token;
   }
-  setProperty(thing_id, property_id, value, device_id = undefined) {
+  setProperty(thing_id, property_id, value, opts, device_id = undefined) {
     const body = JSON.stringify({
       value: value,
       device_id : device_id
     });
     oauth2.accessToken = this.token;
-    return apiProperties.propertiesV2Publish(thing_id, property_id, body);
+    return apiProperties.propertiesV2Publish(thing_id, property_id, body, opts);
   }
   getThings(opts) {
     oauth2.accessToken = this.token;
@@ -63,11 +63,11 @@ class ArduinoClientHttp {
     const thing = apiThings.thingsV2Show(thingId, opts);
     return thing.then(({properties}) => properties);
   }
-  getProperty(thingId, propertyId) {
+  getProperty(thingId, propertyId, opts) {
     oauth2.accessToken = this.token;
-    return apiProperties.propertiesV2Show(thingId, propertyId);
+    return apiProperties.propertiesV2Show(thingId, propertyId, opts);
   }
-  getSeries(thingId, propertyId, start, end) {
+  getSeries(thingId, propertyId, start, end, opts) {
 
     const body =  JSON.stringify({
       requests: [{
@@ -80,7 +80,7 @@ class ArduinoClientHttp {
       resp_version: 1
     });
     oauth2.accessToken = this.token;
-    return apiSeries.seriesV2BatchQueryRaw(body);
+    return apiSeries.seriesV2BatchQueryRaw(body, opts);
   }
 }
 exports.ArduinoClientHttp = ArduinoClientHttp;

From 92f2a51c83254c154a7cb0a6943bc9bd6f4ebdcf Mon Sep 17 00:00:00 2001
From: Mirko Curtolo <mirko.curtolo86@gmail.com>
Date: Wed, 24 Jul 2024 15:22:17 +0200
Subject: [PATCH 2/2] Update rest client and fix inject node

---
 arduino-iot-cloud.js |  6 +++++-
 package-lock.json    | 10 +++++-----
 package.json         |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/arduino-iot-cloud.js b/arduino-iot-cloud.js
index 8202835..b039aba 100644
--- a/arduino-iot-cloud.js
+++ b/arduino-iot-cloud.js
@@ -347,9 +347,13 @@ module.exports = function (RED) {
               this.thing = config.thing;
               this.propertyId = config.property;
               this.propertyName = config.name;
+              const opts = {}
+              if (this.organization) {
+                opts.xOrganization = this.organization;
+              }  
               node.on('input', async function () {
                 try{
-                  const property = await this.arduinoRestClient.getProperty(this.thing, this.propertyId);
+                  const property = await this.arduinoRestClient.getProperty(this.thing, this.propertyId, opts);
                   this.send(
                     {
                       topic: property.name,
diff --git a/package-lock.json b/package-lock.json
index 4c4b437..b550bb9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@arduino/node-red-contrib-arduino-iot-cloud",
-  "version": "1.0.10",
+  "version": "1.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@arduino/node-red-contrib-arduino-iot-cloud",
-      "version": "1.0.10",
+      "version": "1.1.0",
       "license": "GNU AFFERO GENERAL PUBLIC LICENSE",
       "dependencies": {
         "@arduino/arduino-iot-client": "github:arduino/iot-client-js",
@@ -32,8 +32,8 @@
       }
     },
     "node_modules/@arduino/arduino-iot-client": {
-      "version": "2.0.4",
-      "resolved": "git+ssh://git@github.com/arduino/iot-client-js.git#18e50fd5a420a26c025b59cd936e7d23e86d9955",
+      "version": "2.0.5",
+      "resolved": "git+ssh://git@github.com/arduino/iot-client-js.git#bc4991edf2bbd64571e2b52f79d16d392c8d01f2",
       "license": "GPLv3",
       "dependencies": {
         "@babel/cli": "^7.0.0",
@@ -3321,7 +3321,7 @@
       }
     },
     "@arduino/arduino-iot-client": {
-      "version": "git+ssh://git@github.com/arduino/iot-client-js.git#18e50fd5a420a26c025b59cd936e7d23e86d9955",
+      "version": "git+ssh://git@github.com/arduino/iot-client-js.git#bc4991edf2bbd64571e2b52f79d16d392c8d01f2",
       "from": "@arduino/arduino-iot-client@arduino/iot-client-js",
       "requires": {
         "@babel/cli": "^7.0.0",
diff --git a/package.json b/package.json
index 079a5d0..7127cfc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@arduino/node-red-contrib-arduino-iot-cloud",
-  "version": "1.0.10",
+  "version": "1.1.0",
   "description": "Node-RED nodes to talk to Arduino IoT Cloud",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"