ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-21 10:01:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix provisioning workflow when UUID already exists

Browse Source 
Change-type: patch
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver 2019-02-22 10:53:24 +00:00
parent 19584c465a
commit 0e3f260978
No known key found for this signature in database
GPG Key ID: 49690ED87032539F
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api-binder.ts
View File

@ -683,7 +683,7 @@ export class APIBinder {
}
// If we have an existing device key we first check if it's
// valid, becaise of ot os we can just use that
// valid, becaise of it is we can just use that
if (opts.deviceApiKey != null) {
const device = await this.fetchDevice(
uuid,
@ -771,15 +771,15 @@ export class APIBinder {
console.log('New device detected. Provisioning...');
try {
device = await deviceRegister.register(opts).timeout(opts.apiTimeout);
opts.registered_at = Date.now();
} catch (err) {
if (DuplicateUuidError(err)) {
console.log('UUID already registered, trying a key exchange');
await this.exchangeKeyAndGetDeviceOrRegenerate(opts);
device = await this.exchangeKeyAndGetDeviceOrRegenerate(opts);
} else {
throw err;
}
}
opts.registered_at = Date.now();
} else if (opts.provisioningApiKey != null) {
console.log(
'Device is registered but we still have an apiKey, attempting key exchange',
@ -815,7 +815,7 @@ export class APIBinder {
if (pinValue != null) {
if (pinValue.app == null || pinValue.commit == null) {
console.log(
`Malformed pinDEvice fields in supervisor database: ${pinValue}`,
`Malformed pinDevice fields in supervisor database: ${pinValue}`,
);
return;
}