Merge ce50d89 into c460e64

CHANGES_NEXT_RELEASE

@@ -0,0 +1 @@
+- ADD: allow devices with the same device_id in the same service and subservice but different apikey (#1589)

doc/api.md

@@ -133,9 +133,9 @@ parameters. The specific parameters that can be configured for a given config gr
 ### Devices
 
 A device contains the information that connects a physical device to a particular entity in the Context Broker. Devices
-are identified by a `device_id`, and they are associated to an existing config group based in `apiKey` matching or
-`type` matching (in the case `apiKey` matching fails). For instance, let's consider a situation in which a config group
-has been provisioned with `type=X`/`apiKey=111` and no other config group has been provisioned.
+are identified by a `device_id`, and they are associated to an existing config group based in `apiKey` matching. For
+instance, let's consider a situation in which a config group has been provisioned with `type=X`/`apiKey=111` and no
+other config group has been provisioned.
 
 The IoT Agents offer a provisioning API where devices can be preregistered, so all the information about service and
 subservice mapping, security information and attribute configuration can be specified in a per device way instead of

lib/errors.js

@@ -107,7 +107,10 @@ class DuplicateDeviceId {
     constructor(device) {
         this.name = 'DUPLICATE_DEVICE_ID';
         this.message =
-            'A device with the same pair (Service, DeviceId) was found:' + device.id + ' and ' + JSON.stringify(device);
+            'A device with the same info (DeviceId, ApiKey, Service, Subservice) was found:' +
+            device.id +
+            ' and ' +
+            JSON.stringify(device);
         this.code = 409;
     }
 }

lib/services/devices/deviceRegistryMongoDB.js

@@ -243,14 +243,7 @@ function getDeviceById(id, apikey, service, subservice, callback) {
 function getDevice(id, apikey, service, subservice, callback) {
     getDeviceById(id, apikey, service, subservice, function (error, data) {
         if (error) {
-            // Try without apikey: apikey will be added to device later
-            getDeviceById(id, null, service, subservice, function (error, data) {
-                if (error) {
-                    callback(error);
-                } else {
-                    callback(null, data);
-                }
-            });
+            callback(error);
         } else {
             callback(null, data);
         }

lib/services/devices/deviceService.js

@@ -615,6 +615,7 @@ function findOrCreate(deviceId, apikey, group, callback) {
         } else if (error.name === 'DEVICE_NOT_FOUND') {
             const newDevice = {
                 id: deviceId,
+                apikey: apikey,
                 service: group.service,
                 subservice: group.subservice,
                 type: group.type