port

homebridge-plugins · Jan 22, 2024 · ba4e1ca · ba4e1ca
1 parent e74dbf6
commit ba4e1ca
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 24 deletions.
diff --git a/src/homebridge-ui/public/index.html b/src/homebridge-ui/public/index.html
@@ -48,6 +48,12 @@
       Support
    </button>
 </div>
+<div id="disabledBanner" class="alert alert-secondary mb-0 mt-3" role="alert" style="display: none;">
+   Plugin is currently disabled
+   <button id="disabledEnable" type="button" class="btn btn-link p-0 m-0 float-right">
+      Enable
+   </button>
+</div>
 <div id="pageAccount" class="mt-4" style="display: none;">
    <div class="alert alert-warning" style="display: none;" id="validateForm">
       Please enter both values
@@ -63,10 +69,6 @@
       <label for="inputConsumerSecret">Consumer Secret <span class="text-danger">*</span></label>
       <input type="text" class="form-control" id="inputConsumerSecret">
    </div>
-   <div class="form-group">
-      <label for="inputPort">Port <span class="text-danger">*</span></label>
-      <input type="text" class="form-control" id="inputPort">
-   </div>
    <div class="form-group text-center">
       <button type="button" class="btn btn-primary" id="backToIntro">&larr;</button>
       <button type="button" class="btn btn-primary" id="linkButton">Continue &rarr;</button>
@@ -170,11 +172,6 @@ <h5>Disclaimer</h5>
       try {
          const currentConfig = await homebridge.getPluginConfig()
          const hostname = window.location.hostname
-         let port = '8585'
-         if (currentConfig[0].port) {
-            document.getElementById('inputPort').value = currentConfig[0].port
-            port = currentConfig[0].port
-         }
          try {
             await homebridge.request('Start Resideo Login Server')
          } catch (err) {
@@ -191,9 +188,6 @@ <h5>Disclaimer</h5>
                      accessToken: event.data.access,
                      refreshToken: event.data.refresh
                   }
-                  currentConfig[0] = {
-                     port: event.data.port
-                  }
                   await homebridge.updatePluginConfig(currentConfig)
                   await homebridge.savePluginConfig()
                   homebridge.toast.success("Successfully Linked Resideo Account", "homebridge-resideo")
@@ -218,8 +212,7 @@ <h5>Disclaimer</h5>
             document.getElementById('validateForm').style.display = 'none'
             if (
                !document.getElementById('inputConsumerKey').value ||
-               !document.getElementById('inputConsumerSecret').value ||
-               !document.getElementById('inputPort').value
+               !document.getElementById('inputConsumerSecret').value
             ) {
                document.getElementById('validateForm').style.display = 'block'
                return
@@ -228,7 +221,7 @@ <h5>Disclaimer</h5>
             const h = 700;
             const y = window.top.outerHeight / 2 + window.top.screenY - (h / 2);
             const x = window.top.outerWidth / 2 + window.top.screenX - (w / 2);
-            const urlToOpen = 'http://' + hostname + `:${port}/start?` +
+            const urlToOpen = 'http://' + hostname + ':8585/start?' +
                'key=' + document.getElementById('inputConsumerKey').value +
                '&secret=' + document.getElementById('inputConsumerSecret').value +
                '&host=' + encodeURI(hostname);
@@ -261,7 +254,7 @@ <h5>Disclaimer</h5>
          }
          showIntro = () => {
             const introLink = document.getElementById('introLink')
-            document.getElementById('copyMe').value = 'http://' + hostname + `:${port}/auth`
+            document.getElementById('copyMe').value = 'http://' + hostname + ':8585/auth'
             introLink.addEventListener('click', () => {
                homebridge.showSpinner()
                document.getElementById('pageIntro').style.display = 'none'
@@ -396,13 +389,8 @@ <h5>Disclaimer</h5>
             if (currentConfig[0] && currentConfig[0].credentials) {
                const key = currentConfig[0].credentials.consumerKey || ''
                const secret = currentConfig[0].credentials.consumerSecret || ''
-               let port = '8585'
-               if (currentConfig[0].port) {
-                  port = currentConfig[0].port
-               }
                document.getElementById('inputConsumerKey').value = key
                document.getElementById('inputConsumerSecret').value = secret
-               document.getElementById('inputPort').value = port
                if (key && secret) {
                   isRelink = true
                   document.getElementById('unLinkButton').style.display = 'inline-block'
@@ -418,13 +406,28 @@ <h5>Disclaimer</h5>
             }
             homebridge.hideSpinner()
          }
+         showDisabledBanner = () => {
+            document.getElementById('disabledBanner').style.display = 'block'
+         }
+         enablePlugin = async () => {
+            homebridge.showSpinner()
+            document.getElementById('disabledBanner').style.display = 'none'
+            currentConfig[0].disablePlugin = false
+            await homebridge.updatePluginConfig(currentConfig)
+            await homebridge.savePluginConfig()
+            homebridge.hideSpinner()
+         }
          menuHome.addEventListener('click', () => showSupport())
          menuAccount.addEventListener('click', () => showAccount())
          menuDevices.addEventListener('click', () => showDevices())
          menuSettings.addEventListener('click', () => showSettings())
+         disabledEnable.addEventListener('click', () => enablePlugin())
          if (currentConfig.length) {
             document.getElementById('menuWrapper').style.display = 'inline-flex'
             showAccount()
+            if (currentConfig[0].disablePlugin) {
+               showDisabledBanner()
+            }
          } else {
             currentConfig.push({ name: 'Resideo' })
             await homebridge.updatePluginConfig(currentConfig)

diff --git a/src/homebridge-ui/server.ts b/src/homebridge-ui/server.ts
@@ -1,13 +1,12 @@
 /* eslint-disable no-console */
 import { HomebridgePluginUiServer } from '@homebridge/plugin-ui-utils';
-import { AuthorizeURL, ResideoPlatformConfig, TokenURL } from '../settings.js';
+import { AuthorizeURL, TokenURL } from '../settings.js';
 import { request } from 'undici';
 import { createServer } from 'http';
 import fs from 'fs';
 import url from 'node:url';
 
 class PluginUiServer extends HomebridgePluginUiServer {
-  public readonly config!: ResideoPlatformConfig;
   public port!: string;
   public key!: string;
   public secret!: string;
@@ -16,7 +15,6 @@ class PluginUiServer extends HomebridgePluginUiServer {
   constructor(
   ) {
     super();
-    //const port = this.port || '8585';
 
     this.onRequest('Start Resideo Login Server', (): any => {