@homebridge-plugins/homebridge-resideo 3.0.3-beta.15 → 3.0.3-beta.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -162,14 +162,21 @@
|
|
|
162
162
|
const config = currentConfig[0];
|
|
163
163
|
const credentials = config?.credentials;
|
|
164
164
|
|
|
165
|
-
//
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
165
|
+
// Check for valid credentials - we need at least consumerKey, consumerSecret and refreshToken
|
|
166
|
+
// accessToken can be regenerated from refreshToken, so it's not strictly required for skipping first-run
|
|
167
|
+
if (!credentials) {
|
|
168
|
+
return true;
|
|
169
|
+
}
|
|
170
170
|
|
|
171
|
-
|
|
172
|
-
|
|
171
|
+
const hasMinimumCredentials = credentials.consumerKey &&
|
|
172
|
+
credentials.consumerKey.trim() !== '' &&
|
|
173
|
+
credentials.consumerSecret &&
|
|
174
|
+
credentials.consumerSecret.trim() !== '' &&
|
|
175
|
+
credentials.refreshToken &&
|
|
176
|
+
credentials.refreshToken.trim() !== '';
|
|
177
|
+
|
|
178
|
+
// Return true if first-run is required (missing minimum credentials), false if can skip
|
|
179
|
+
return !hasMinimumCredentials;
|
|
173
180
|
},
|
|
174
181
|
onStart: () => {
|
|
175
182
|
// Simple first run initialization - no legacy config handling
|
|
@@ -240,28 +247,54 @@
|
|
|
240
247
|
if (popup.closed) {
|
|
241
248
|
clearInterval(checkClosed);
|
|
242
249
|
|
|
243
|
-
//
|
|
244
|
-
|
|
245
|
-
|
|
250
|
+
// Enhanced credential verification with multiple checks and longer timeout
|
|
251
|
+
let verificationAttempts = 0;
|
|
252
|
+
const maxAttempts = 10; // Check up to 10 times
|
|
253
|
+
|
|
254
|
+
const verifyCredentials = () => {
|
|
255
|
+
verificationAttempts++;
|
|
256
|
+
|
|
257
|
+
// Check if authentication completed successfully
|
|
246
258
|
const updatedConfig = homebridge.getPluginConfig();
|
|
247
259
|
const credentials = Array.isArray(updatedConfig) && updatedConfig[0]?.credentials;
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
260
|
+
|
|
261
|
+
// We need at least consumerKey, consumerSecret, and refreshToken for success
|
|
262
|
+
const hasMinimumAuth = credentials?.consumerKey &&
|
|
263
|
+
credentials?.consumerSecret &&
|
|
264
|
+
credentials?.refreshToken;
|
|
265
|
+
|
|
266
|
+
const hasCompleteAuth = hasMinimumAuth && credentials?.accessToken;
|
|
252
267
|
|
|
253
268
|
if (hasCompleteAuth) {
|
|
254
269
|
if (errorDiv) {
|
|
255
270
|
errorDiv.innerHTML = '<div class="alert alert-success"><strong>Success!</strong> Your account has been linked successfully.</div>';
|
|
256
271
|
}
|
|
257
|
-
|
|
258
|
-
|
|
272
|
+
// Force UI refresh to update isRequired state
|
|
273
|
+
setTimeout(() => {
|
|
274
|
+
resolve(true);
|
|
275
|
+
}, 100);
|
|
276
|
+
} else if (hasMinimumAuth && verificationAttempts >= maxAttempts) {
|
|
277
|
+
// We have minimum credentials but no access token after max attempts
|
|
278
|
+
// This is actually acceptable since access token can be refreshed
|
|
279
|
+
if (errorDiv) {
|
|
280
|
+
errorDiv.innerHTML = '<div class="alert alert-success"><strong>Success!</strong> Your account has been linked successfully.</div>';
|
|
281
|
+
}
|
|
282
|
+
setTimeout(() => {
|
|
283
|
+
resolve(true);
|
|
284
|
+
}, 100);
|
|
285
|
+
} else if (verificationAttempts >= maxAttempts) {
|
|
259
286
|
if (errorDiv) {
|
|
260
287
|
errorDiv.innerHTML = '<div class="alert alert-warning"><strong>Authentication incomplete.</strong> Please try the setup process again or check your Resideo developer credentials.</div>';
|
|
261
288
|
}
|
|
262
289
|
resolve(false);
|
|
290
|
+
} else {
|
|
291
|
+
// Continue checking
|
|
292
|
+
setTimeout(verifyCredentials, 1000);
|
|
263
293
|
}
|
|
264
|
-
}
|
|
294
|
+
};
|
|
295
|
+
|
|
296
|
+
// Start verification after a short delay
|
|
297
|
+
setTimeout(verifyCredentials, 500);
|
|
265
298
|
}
|
|
266
299
|
}, 1000);
|
|
267
300
|
});
|
|
@@ -304,7 +337,11 @@
|
|
|
304
337
|
|
|
305
338
|
await homebridge.updatePluginConfig(currentConfig);
|
|
306
339
|
await homebridge.savePluginConfig();
|
|
307
|
-
|
|
340
|
+
|
|
341
|
+
// Notify success and give the UI time to process the credential update
|
|
342
|
+
setTimeout(() => {
|
|
343
|
+
homebridge.toast.success("Successfully Linked Resideo Account", "homebridge-resideo");
|
|
344
|
+
}, 200);
|
|
308
345
|
}
|
|
309
346
|
} catch (err) {
|
|
310
347
|
console.log(err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
<!DOCTYPE html><html class="default" lang="en" data-base="../"><head><meta charset="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>default | @homebridge-plugins/homebridge-resideo</title><meta name="description" content="Documentation for @homebridge-plugins/homebridge-resideo"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="../assets/style.css"/><link rel="stylesheet" href="../assets/highlight.css"/><script defer src="../assets/main.js"></script><script async src="../assets/icons.js" id="tsd-icons-script"></script><script async src="../assets/search.js" id="tsd-search-script"></script><script async src="../assets/navigation.js" id="tsd-nav-script"></script></head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os";document.body.style.display="none";setTimeout(() => window.app?app.showPage():document.body.style.removeProperty("display"),500)</script><header class="tsd-page-toolbar"><div class="tsd-toolbar-contents container"><a href="../index.html" class="title">@homebridge-plugins/homebridge-resideo</a><div id="tsd-toolbar-links"></div><button id="tsd-search-trigger" class="tsd-widget" aria-label="Search"><svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true"><use href="../assets/icons.svg#icon-search"></use></svg></button><dialog id="tsd-search" aria-label="Search"><input role="combobox" id="tsd-search-input" aria-controls="tsd-search-results" aria-autocomplete="list" aria-expanded="true" autocapitalize="off" autocomplete="off" placeholder="Search the docs" maxLength="100"/><ul role="listbox" id="tsd-search-results"></ul><div id="tsd-search-status" aria-live="polite" aria-atomic="true"><div>Preparing search index...</div></div></dialog><a href="#" class="tsd-widget menu" id="tsd-toolbar-menu-trigger" data-toggle="menu" aria-label="Menu"><svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true"><use href="../assets/icons.svg#icon-menu"></use></svg></a></div></header><div class="container container-main"><div class="col-content"><div class="tsd-page-title"><ul class="tsd-breadcrumb" aria-label="Breadcrumb"><li><a href="" aria-current="page">default</a></li></ul><h1>Variable default</h1></div><div class="tsd-signature"><span class="tsd-kind-variable">default</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">api</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">API</span><span class="tsd-signature-symbol">)</span> <span class="tsd-signature-symbol">=></span> <span class="tsd-signature-type">void</span></div><div class="tsd-type-declaration"><h4>Type Declaration</h4><ul class="tsd-parameters"><li class="tsd-parameter-signature"><ul class="tsd-signatures"><li class="tsd-signature" id="__type"><span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">api</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">API</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">void</span></li><li class="tsd-description"><div class="tsd-parameters"><h4 class="tsd-parameters-title">Parameters</h4><ul class="tsd-parameter-list"><li><span><span class="tsd-kind-parameter">api</span>: <span class="tsd-signature-type">API</span></span></li></ul></div><h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">void</span></h4></li></ul></li></ul></div><aside class="tsd-sources"><ul><li>Defined in <a href="https://github.com/homebridge-plugins/homebridge-resideo/blob/
|
|
1
|
+
<!DOCTYPE html><html class="default" lang="en" data-base="../"><head><meta charset="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>default | @homebridge-plugins/homebridge-resideo</title><meta name="description" content="Documentation for @homebridge-plugins/homebridge-resideo"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="../assets/style.css"/><link rel="stylesheet" href="../assets/highlight.css"/><script defer src="../assets/main.js"></script><script async src="../assets/icons.js" id="tsd-icons-script"></script><script async src="../assets/search.js" id="tsd-search-script"></script><script async src="../assets/navigation.js" id="tsd-nav-script"></script></head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os";document.body.style.display="none";setTimeout(() => window.app?app.showPage():document.body.style.removeProperty("display"),500)</script><header class="tsd-page-toolbar"><div class="tsd-toolbar-contents container"><a href="../index.html" class="title">@homebridge-plugins/homebridge-resideo</a><div id="tsd-toolbar-links"></div><button id="tsd-search-trigger" class="tsd-widget" aria-label="Search"><svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true"><use href="../assets/icons.svg#icon-search"></use></svg></button><dialog id="tsd-search" aria-label="Search"><input role="combobox" id="tsd-search-input" aria-controls="tsd-search-results" aria-autocomplete="list" aria-expanded="true" autocapitalize="off" autocomplete="off" placeholder="Search the docs" maxLength="100"/><ul role="listbox" id="tsd-search-results"></ul><div id="tsd-search-status" aria-live="polite" aria-atomic="true"><div>Preparing search index...</div></div></dialog><a href="#" class="tsd-widget menu" id="tsd-toolbar-menu-trigger" data-toggle="menu" aria-label="Menu"><svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true"><use href="../assets/icons.svg#icon-menu"></use></svg></a></div></header><div class="container container-main"><div class="col-content"><div class="tsd-page-title"><ul class="tsd-breadcrumb" aria-label="Breadcrumb"><li><a href="" aria-current="page">default</a></li></ul><h1>Variable default</h1></div><div class="tsd-signature"><span class="tsd-kind-variable">default</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">api</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">API</span><span class="tsd-signature-symbol">)</span> <span class="tsd-signature-symbol">=></span> <span class="tsd-signature-type">void</span></div><div class="tsd-type-declaration"><h4>Type Declaration</h4><ul class="tsd-parameters"><li class="tsd-parameter-signature"><ul class="tsd-signatures"><li class="tsd-signature" id="__type"><span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">api</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">API</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">void</span></li><li class="tsd-description"><div class="tsd-parameters"><h4 class="tsd-parameters-title">Parameters</h4><ul class="tsd-parameter-list"><li><span><span class="tsd-kind-parameter">api</span>: <span class="tsd-signature-type">API</span></span></li></ul></div><h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">void</span></h4></li></ul></li></ul></div><aside class="tsd-sources"><ul><li>Defined in <a href="https://github.com/homebridge-plugins/homebridge-resideo/blob/e6f95cc6c8b23a1c0a0e486f7ebff8162a93e85f/src/index.ts#L11">index.ts:11</a></li></ul></aside></div><div class="col-sidebar"><div class="page-menu"><div class="tsd-navigation settings"><details class="tsd-accordion"><summary class="tsd-accordion-summary"><svg width="20" height="20" viewBox="0 0 24 24" fill="none" aria-hidden="true"><use href="../assets/icons.svg#icon-chevronDown"></use></svg><h3>Settings</h3></summary><div class="tsd-accordion-details"><div class="tsd-filter-visibility"><span class="settings-label">Member Visibility</span><ul id="tsd-filter-options"><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-inherited" name="inherited" checked/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Inherited</span></label></li></ul></div><div class="tsd-theme-toggle"><label class="settings-label" for="tsd-theme">Theme</label><select id="tsd-theme"><option value="os">OS</option><option value="light">Light</option><option value="dark">Dark</option></select></div></div></details></div></div><div class="site-menu"><nav class="tsd-navigation"><a href="../modules.html">@homebridge-plugins/homebridge-resideo</a><ul class="tsd-small-nested-navigation" id="tsd-nav-container"><li>Loading...</li></ul></nav></div></div></div><footer></footer><div class="overlay"></div></body></html>
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@homebridge-plugins/homebridge-resideo",
|
|
3
3
|
"displayName": "Resideo",
|
|
4
4
|
"type": "module",
|
|
5
|
-
"version": "3.0.3-beta.
|
|
5
|
+
"version": "3.0.3-beta.16",
|
|
6
6
|
"description": "The Resideo plugin allows you to access your Resideo device(s) from HomeKit.",
|
|
7
7
|
"author": {
|
|
8
8
|
"name": "donavanbecker",
|