Merge pull request #743 from telefonicaid/task/use_apikey_find_device

Task/use apikey find device
telefonicaid · Sep 11, 2023 · 8977036 · 8977036
2 parents e9c37c7 + a46175d
commit 8977036
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1 +1,2 @@
-- Fix: ensure device apikey in already provisioned device (iota-node-lib#1430)
+- Fix: try to use apikey from measure/group to find, update and remove device in first attempt (iota-node-lib#1426)
+- Fix: ensure device apikey in already provisioned device (iota-node-lib#1430, iota-node-lib#1435)
diff --git a/lib/iotaUtils.js b/lib/iotaUtils.js
@@ -139,8 +139,8 @@ function createConfigurationNotification(results) {
     return configurations;
 }
 
-function findOrCreate(deviceId, transport, group, callback) {
-    iotAgentLib.getDeviceSilently(deviceId, group.service, group.subservice, function (error, device) {
+function findOrCreate(deviceId, transport, apikey, group, callback) {
+    iotAgentLib.getDeviceSilently(deviceId, apikey, group.service, group.subservice, function (error, device) {
         if (!error && device) {
             if (
                 (!('apikey' in device) || device.apikey === undefined) &&
@@ -151,11 +151,12 @@ function findOrCreate(deviceId, transport, group, callback) {
                     .getLogger()
                     .info(context, 'Update provisioned device %j with measure/group apikey %j', device, group.apikey);
                 device.apikey = group.apikey; // group apikey is the same of current measure apikey
-                iotAgentLib.updateRegister(device, function (error, device) {
+                iotAgentLib.updateDevice(device, function (error) {
                     callback(error, device, group);
                 });
+            } else {
+                callback(null, device, group);
             }
-            callback(null, device, group);
         } else if (error.name === 'DEVICE_NOT_FOUND') {
             const newDevice = {
                 id: deviceId,
@@ -186,6 +187,9 @@ function findOrCreate(deviceId, transport, group, callback) {
             }
             // Check autoprovision flag in order to register or not device
             if (group.autoprovision === undefined || group.autoprovision === true) {
+                config
+                    .getLogger()
+                    .debug(context, 'Registering autoprovision of Device %j for its conf %j', newDevice, group);
                 iotAgentLib.register(newDevice, function (error, device) {
                     callback(error, device, group);
                 });
@@ -237,7 +241,7 @@ function retrieveDevice(deviceId, apiKey, transport, callback) {
         async.waterfall(
             [
                 apply(iotAgentLib.getConfigurationSilently, config.getConfig().iota.defaultResource || '', apiKey),
-                apply(findOrCreate, deviceId, transport),
+                apply(findOrCreate, deviceId, transport, apiKey), // group.apikey and apikey are the same
                 apply(
                     iotAgentLib.mergeDeviceWithConfiguration,
                     ['lazy', 'active', 'staticAttributes', 'commands', 'subscriptions'],