ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-13 04:48:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #458 via VersionBot

Browse Source 
Fix provisioning key exchange by passing apikey in the request
This commit is contained in:
resin-io-versionbot[bot]
2017-06-26 14:32:58 +00:00
committed by GitHub
parent 8f6c53a175 0829260c17
commit a9e777727c
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -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! automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/). 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 ## v4.4.1 - 2017-06-24
* Make cleanup in jenkins build less aggressive, but remove all created tags [Pablo Carranza Velez] * Make cleanup in jenkins build less aggressive, but remove all created tags [Pablo Carranza Velez]

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "resin-supervisor", "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.", "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", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",

2
src/bootstrap.coffee
View File

@ -65,7 +65,7 @@ exchangeKey = ->
if not device? if not device?
throw new ExchangeKeyError("Couldn't fetch device with provisioning key") 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 # 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) -> .spread (res, body) ->
if res.status != 200 if res.status != 200
throw new ExchangeKeyError("Couldn't generate device key with provisioning key") throw new ExchangeKeyError("Couldn't generate device key with provisioning key")