From 18ca98a2ae746419ee559119b6bf617fef81f81b Mon Sep 17 00:00:00 2001 From: Pablo Carranza Velez Date: Thu, 22 Jun 2017 14:57:34 -0700 Subject: [PATCH 1/2] Fix provisioning key exchange by passing apikey in the request Change-Type: patch Signed-off-by: Pablo Carranza Velez --- src/bootstrap.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap.coffee b/src/bootstrap.coffee index ea5a5dc4..aa5bc0ca 100644 --- a/src/bootstrap.coffee +++ b/src/bootstrap.coffee @@ -65,7 +65,7 @@ exchangeKey = -> if not device? throw new ExchangeKeyError("Couldn't fetch device with provisioning key") # We found the device, we can try to generate a working device key for it - request.postAsync("#{config.apiEndpoint}/api-key/device/#{device.id}/device-key") + request.postAsync("#{config.apiEndpoint}/api-key/device/#{device.id}/device-key?apikey=#{userConfig.apiKey}") .spread (res, body) -> if res.status != 200 throw new ExchangeKeyError("Couldn't generate device key with provisioning key") From 0829260c17693dd505816a734939e4a1c0ddb4b1 Mon Sep 17 00:00:00 2001 From: "resin-io-versionbot[bot]" Date: Mon, 26 Jun 2017 14:05:37 +0000 Subject: [PATCH 2/2] v4.4.2 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e25f345e..da8b2e65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY! This project adheres to [Semantic Versioning](http://semver.org/). +## v4.4.2 - 2017-06-26 + +* Fix provisioning key exchange by passing apikey in the request [Pablo Carranza Velez] + ## v4.4.1 - 2017-06-24 * Make cleanup in jenkins build less aggressive, but remove all created tags [Pablo Carranza Velez] diff --git a/package.json b/package.json index 6e971c67..6bc86394 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "resin-supervisor", "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.", - "version": "4.4.1", + "version": "4.4.2", "license": "Apache-2.0", "repository": { "type": "git",