From 8eb1c3ea7bdc2ca30dd8cd10216337093b2e4a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Carranza=20V=C3=A9lez?= <pablocarranza@gmail.com>
Date: Fri, 11 Sep 2015 16:05:08 +0000
Subject: [PATCH] Ensure we have the deviceId by GETting it from the Resin API

---
 src/bootstrap.coffee | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap.coffee b/src/bootstrap.coffee
index 275e87ec..c98ec7e3 100644
--- a/src/bootstrap.coffee
+++ b/src/bootstrap.coffee
@@ -34,10 +34,18 @@ bootstrap = ->
 			return userConfig
 		deviceRegister.register(resinApi, userConfig)
 		.catch DuplicateUuidError, ->
-			return {}
+			resinApi.get
+				resource: 'device'
+				options:
+					filter:
+						uuid: userConfig.uuid
+				customOptions:
+					apikey: userConfig.apiKey
+			.then ([ device ]) ->
+				return device
 		.then (device) ->
 			userConfig.registered_at = Date.now()
-			userConfig.deviceId = device.id if device.id?
+			userConfig.deviceId = device.id
 			fs.writeFileAsync(configPath, JSON.stringify(userConfig))
 		.return(userConfig)
 	.then (userConfig) ->