Merge pull request #481 from openstf/add-automation-label

Use automation label in device list for devices accessed using API

lib/units/api/controllers/user.js

@@ -148,6 +148,7 @@ function addUserDevice(req, res) {
         .handler()
 
       req.options.channelRouter.on(wireutil.global, messageListener)
+      var usage = 'automation'
 
       req.options.push.send([
         device.channel
@@ -165,6 +166,7 @@ function addUserDevice(req, res) {
             , match: 'exact'
             }
           })
+          , usage
           )
         )
       ])

lib/units/device/plugins/group.js

@@ -30,7 +30,7 @@ module.exports = syrup.serial()
       return currentGroup
     })
 
-    plugin.join = function(newGroup, timeout, identifier) {
+    plugin.join = function(newGroup, timeout, usage) {
       return plugin.get()
         .then(function() {
           if (currentGroup.group !== newGroup.group) {
@@ -57,10 +57,11 @@ module.exports = syrup.serial()
           , wireutil.envelope(new wire.JoinGroupMessage(
               options.serial
             , currentGroup
+            , usage
             ))
           ])
 
-          plugin.emit('join', currentGroup, identifier)
+          plugin.emit('join', currentGroup)
 
           return currentGroup
         })
@@ -113,7 +114,7 @@ module.exports = syrup.serial()
         var reply = wireutil.reply(options.serial)
         grouputil.match(ident, message.requirements)
           .then(function() {
-            return plugin.join(message.owner, message.timeout)
+            return plugin.join(message.owner, message.timeout, message.usage)
           })
           .then(function() {
             push.send([

lib/units/processor/index.js

@@ -175,10 +175,14 @@ module.exports = function(options) {
     })
     .on(wire.JoinGroupMessage, function(channel, message, data) {
       dbapi.setDeviceOwner(message.serial, message.owner)
+      if (message.usage) {
+        dbapi.setDeviceUsage(message.serial, message.usage)
+      }
       appDealer.send([channel, data])
     })
     .on(wire.LeaveGroupMessage, function(channel, message, data) {
       dbapi.unsetDeviceOwner(message.serial, message.owner)
+      dbapi.unsetDeviceUsage(message.serial)
       appDealer.send([channel, data])
     })
     .on(wire.DeviceLogMessage, function(channel, message, data) {

lib/units/websocket/index.js

@@ -174,6 +174,7 @@ module.exports = function(options) {
               serial: message.serial
             , owner: message.owner
             , likelyLeaveReason: 'owner_change'
+            , usage: message.usage
             }
           , user
           )
@@ -397,8 +398,15 @@ module.exports = function(options) {
               , wireutil.envelope(new wire.AdbKeysUpdatedMessage())
               ])
             })
-            .catch(dbapi.DuplicateSecondaryIndexError, function() {
-              // No-op
+            .catch(dbapi.DuplicateSecondaryIndexError, function(err) {
+              socket.emit('user.keys.adb.error', {
+                message: 'Someone already added this key'
+              })
+            })
+            .catch(Error, function(err) {
+              socket.emit('user.keys.adb.error', {
+                message: err.message
+              })
             })
         })
         .on('user.keys.adb.accept', function(data) {