homebridge-xbox-tv 2.8.2-beta.9 → 2.8.3

package/homebridge-ui/public/index.html

@@ -1,37 +1,34 @@
-<body>
-  <div>
-    <img src="homebridge-xbox-tv.png" style="text-align: center;" height="150" />
-  </div>
-
-  <div id="authorizationManager" style="display: none;" class="card card-body">
-    <form id="configForm">
-      <div class="text-center">
-        <label id="deviceNameInput" style="font-size: 23px">Xbox</label><br>
-      </div>
-      <div class="text-center">
-        <div class="text-center">
-          <label id="info" style="text-align: center; font-size: 17px; color: white;">Authorization
-            Manager</label><br><br>
-        </div>
-      </div>
-      <div class="form-group">
-        <label for="deviceHostInput">Host</label>
-        <input type="text" class="form-control" id="deviceHostInput"><br>
-        <label for="deviceLiveId">Xbox Live ID</label>
-        <input type="text" class="form-control" id="deviceLiveId"><br>
-        <label for="deviceTokenInput">Web Api Token</label>
-        <input type="text" class="form-control" id="deviceTokenInput"><br>
-        <label for="deviceWebApiControl">Web Api Control</label>
-        <input type="checkbox" class="form-control" id="deviceWebApiControl">
-      </div>
+<div>
+  <img src="homebridge-xbox-tv.png" style="text-align: center;" height="150" />
+</div>
+<div id="authorizationManager" style="display: none;" class="card card-body">
+  <form id="configForm">
+    <div class="text-center">
+      <label id="deviceNameInput" style="font-size: 23px">Xbox</label><br>
+    </div>
+    <div class="text-center">
       <div class="text-center">
-        <button id="startAuthorizationButton" type="button" class="btn btn-primary">Start authorization</button>
-        <button id="clearTokenButton" type="button" class="btn btn-primary">Clear Web Api Token</button>
-        <button id="configButton" type="button" class="btn btn-primary"><i class="fas fa-gear"></i></button>
+        <label id="info" style="text-align: center; font-size: 17px; color: white;">Authorization
+          Manager</label><br><br>
       </div>
-    </form>
-  </div>
-</body>
+    </div>
+    <div class="form-group">
+      <label for="deviceHostInput">Host</label>
+      <input type="text" class="form-control" id="deviceHostInput"><br>
+      <label for="deviceLiveId">Xbox Live ID</label>
+      <input type="text" class="form-control" id="deviceLiveId"><br>
+      <label for="deviceTokenInput">Web Api Token</label>
+      <input type="text" class="form-control" id="deviceTokenInput"><br>
+      <label for="deviceWebApiControl">Web Api Control</label>
+      <input type="checkbox" class="form-control" id="deviceWebApiControl">
+    </div>
+    <div class="text-center">
+      <button id="startAuthorizationButton" type="button" class="btn btn-primary">Start authorization</button>
+      <button id="clearTokenButton" type="button" class="btn btn-primary">Clear Web Api Token</button>
+      <button id="configButton" type="button" class="btn btn-primary"><i class="fas fa-gear"></i></button>
+    </div>
+  </form>
+</div>
 
 <script>
   (async () => {
@@ -44,7 +41,7 @@
       const devices = { 'devices': [] };
       pluginConfig.push(devices);
       await homebridge.updatePluginConfig(pluginConfig);
-      await homebridge.showSchemaForm();
+      homebridge.showSchemaForm();
       return;
     }
 
@@ -53,14 +50,13 @@
 
     //get devices count
     const devicesCount = pluginConfig[0].devices.length;
-    this.deviceIndex = 0;
 
     //get the intial from the config and add it to the form
     for (let i = 0; i < devicesCount; i++) {
       //create consoles buttons
       const button = document.createElement("button");
       button.setAttribute("type", "button");
-      button.setAttribute("id", "button" + i);
+      button.setAttribute("id", `button${i}`);
       button.setAttribute("class", "btn btn-secondary");
       button.innerText = pluginConfig[0].devices[i].name || 'Not set';
       button.style.width = '160px';
@@ -68,29 +64,28 @@
       document.body.appendChild(button);
 
       //get actuall value on console select
-      document.getElementById('button' + i).addEventListener('click', async () => {
+      document.getElementById(`button${i}`).addEventListener('click', async () => {
         document.querySelector('#deviceNameInput').innerHTML = pluginConfig[0].devices[i].name || '';
         document.querySelector('#deviceHostInput').value = pluginConfig[0].devices[i].host || '';
         document.querySelector('#deviceLiveId').value = pluginConfig[0].devices[i].xboxLiveId || '';
         document.querySelector('#deviceTokenInput').value = pluginConfig[0].devices[i].xboxWebApiToken || '';
         document.querySelector('#deviceWebApiControl').checked = pluginConfig[0].devices[i].webApiControl || false;
+
+        const tokenLength = (pluginConfig[0].devices[i].xboxWebApiToken).length || 0;
+        const setButtonName = tokenLength <= 10 ? document.getElementById('startAuthorizationButton').innerText = "Start authorization" : document.getElementById('startAuthorizationButton').innerText = "Check state";
+        const setCheckboxState = tokenLength <= 10 ? document.getElementById('deviceWebApiControl').checked = false : false;
+        const setCheckboxMode = tokenLength <= 10 ? document.getElementById('deviceWebApiControl').disabled = true : document.getElementById('deviceWebApiControl').disabled = false;
+        const setWebApiControlMode = tokenLength <= 10 ? pluginConfig[0].devices[i].webApiControl = false : false;
         this.deviceIndex = i;
       });
+      const click = i === devicesCount - 1 ? document.getElementById(`button0`).click() : false;
+      const update = i === devicesCount - 1 ? await homebridge.updatePluginConfig(pluginConfig) : false;
+      const save = i === devicesCount - 1 ? await homebridge.savePluginConfig(pluginConfig) : false;
     };
 
-    //set page to the erste console after open
-    document.getElementById('button0').trigger('click');
-
-    //check token length and set buttons name and checkbock state after open
-    const tokenLength = (document.querySelector('#deviceTokenInput').value).length || 0;
-    const setButtonMode = tokenLength <= 10 ? document.getElementById('startAuthorizationButton').innerText = "Start authorization" : document.getElementById('startAuthorizationButton').innerText = "Check state";
-    const setCheckboxState = tokenLength <= 10 ? document.getElementById('deviceWebApiControl').checked = false : false;
-    const setCheckboxMode = tokenLength <= 10 ? document.getElementById('deviceWebApiControl').disabled = true : false;
-
     //watch for changes to the config button
     document.getElementById('configButton').addEventListener('click', async () => {
-      const configButton = document.getElementById('configButton');
-      const showHideSettings = this.configButtonState ? await homebridge.hideSchemaForm() : await homebridge.showSchemaForm();
+      const showHideSettings = this.configButtonState ? homebridge.hideSchemaForm() : homebridge.showSchemaForm();
       this.configButtonState = !this.configButtonState;
     });
 
@@ -105,15 +100,14 @@
       const setButtonName = tokenLength1 <= 10 ? document.getElementById('startAuthorizationButton').innerText = "Start authorization" : false;
       const setButtonMode = tokenLength1 <= 10 ? document.getElementById('startAuthorizationButton').removeAttribute('disabled') : false;
 
-      await homebridge.savePluginConfig(pluginConfig);
       await homebridge.updatePluginConfig(pluginConfig);
+      await homebridge.savePluginConfig(pluginConfig);
     });
 
     //clear token file
     document.getElementById('clearTokenButton').addEventListener('click', async () => {
-      homebridge.showSpinner();
-
       try {
+        homebridge.showSpinner();
         const host = pluginConfig[0].devices[this.deviceIndex].host || '';
         const payload = {
           host: host
@@ -121,7 +115,6 @@
         const response = await homebridge.request('/clearToken', payload);
 
         if (response) {
-          pluginConfig[0].devices[this.deviceIndex].xboxWebApiToken = '';
           document.querySelector('#deviceTokenInput').value = '';
           document.getElementById('startAuthorizationButton').removeAttribute("disabled");
           document.getElementById('startAuthorizationButton').innerText = "Start authorization";
@@ -129,25 +122,26 @@
           document.getElementById('deviceWebApiControl').disabled = true;
           document.getElementById('info').innerHTML = 'Web Api Token cleared, now You can start new authorization process.';
           document.getElementById('info').style.color = 'green';
-          homebridge.toast.info('Web Api Token cleared!', 'Info!');
+          pluginConfig[0].devices[this.deviceIndex].xboxWebApiToken = '';
+          pluginConfig[0].devices[this.deviceIndex].webApiControl = false;
 
-          await homebridge.savePluginConfig(pluginConfig);
           await homebridge.updatePluginConfig(pluginConfig);
+          await homebridge.savePluginConfig(pluginConfig);
         };
 
         homebridge.hideSpinner();
       } catch (e) {
-        homebridge.toast.error('Web Api Token clear failed.', 'Error!');
+        homebridge.toast.error(`Clear Web Api Token error: ${JSON.stringify(e, null, 2)}`);
         homebridge.hideSpinner();
       };
     });
 
     //watch for click on the Start authorization button
     document.getElementById('startAuthorizationButton').addEventListener('click', async () => {
-      await homebridge.updatePluginConfig(pluginConfig);
-      homebridge.showSpinner();
-
       try {
+        homebridge.showSpinner();
+        await homebridge.updatePluginConfig(pluginConfig)
+
         const host = pluginConfig[0].devices[this.deviceIndex].host || '';
         this.clientId = pluginConfig[0].devices[this.deviceIndex].clientId || '5e5ead27-ed60-482d-b3fc-702b28a97404';
         this.clientSecret = pluginConfig[0].devices[this.deviceIndex].clientSecret || '';
@@ -180,29 +174,46 @@
             document.getElementById('startAuthorizationButton').innerText = "Activate console";
             document.getElementById('deviceWebApiControl').checked = false;
             document.getElementById('deviceWebApiControl').disabled = true;
-            await open(info)
+            pluginConfig[0].devices[this.deviceIndex].webApiControl = false;
+
+            // open the oauth2 URI for authentication 
+            const authWindow = open(info);
+            authWindow.addEventListener('load', async () => {
+              document.getElementById('info').innerHTML = `2: ${JSON.stringify(authWindow, null, 2)}`;
+              const locationHash = this.location.hash.substring(1);
+              const urlParams = await homebridge.request('/queryString', locationHash);
+              const code = urlParams.code;
+              if (code != null) {
+                document.querySelector('#deviceTokenInput').value = code;
+              }
+            });
             break;
           case 2:
-            document.getElementById('info').innerHTML = 'Activation done, now enable *Web Api Control*, restart plugin and have fun!!!';
+            document.getElementById('info').innerHTML = 'Activation successfull, now restart plugin and have fun!!!';
             document.getElementById('info').style.color = 'green';
             document.getElementById('startAuthorizationButton').innerText = "Check state";
             document.getElementById('deviceWebApiControl').disabled = false;
+            document.getElementById('deviceWebApiControl').checked = true;
+            pluginConfig[0].devices[this.deviceIndex].webApiControl = true;
 
-            await homebridge.savePluginConfig(pluginConfig);
             await homebridge.updatePluginConfig(pluginConfig)
+            await homebridge.savePluginConfig(pluginConfig);
             break;
           case 3:
-            document.getElementById('info').innerHTML = 'Authorization or Token save error!!!.';
+            document.getElementById('info').innerHTML = `Authorization error: ${JSON.stringify(info, null, 2)}`;
             document.getElementById('info').style.color = 'red';
             document.getElementById('startAuthorizationButton').innerText = "Start authorization";
             document.getElementById('deviceWebApiControl').checked = false;
             document.getElementById('deviceWebApiControl').disabled = true;
-            homebridge.toast.error(info, 'Error!');
+            pluginConfig[0].devices[this.deviceIndex].webApiControl = false;
+
+            await homebridge.updatePluginConfig(pluginConfig)
+            await homebridge.savePluginConfig(pluginConfig);
             break;
         };
 
       } catch (e) {
-        homebridge.toast.error('Failed to get data try again.', 'Error!');
+        homebridge.toast.error(`Data error: ${JSON.stringify(e, null, 2)}`);
       } finally {
         homebridge.hideSpinner();
       };

package/homebridge-ui/server.js

@@ -1,6 +1,7 @@
 "use strict";
 
 const { HomebridgePluginUiServer, RequestError } = require('@homebridge/plugin-ui-utils');
+const QueryString = require('querystring');
 const Authentication = require('../src/webApi/authentication.js')
 const fs = require('fs');
 const fsPromises = fs.promises;
@@ -14,22 +15,21 @@ class PluginUiServer extends HomebridgePluginUiServer {
     // clear token
     this.onRequest('/clearToken', this.clearToken.bind(this));
 
+    // clear token
+    this.onRequest('/queryString', this.queryString.bind(this));
+
     // start console authorization
-    this.onRequest('/startAuthorization', this.getWebApiToken.bind(this));
+    this.onRequest('/startAuthorization', this.startAuthorization.bind(this));
 
     // this MUST be called when you are ready to accept requests
     this.ready();
   };
 
   async clearToken(payload) {
-    const host = payload.host;
-    const authTokenFile = `${this.homebridgeStoragePath}/xboxTv/authToken_${host.split('.').join('')}`;
-
     try {
-      if (fs.existsSync(authTokenFile)) {
-        await fsPromises.writeFile(authTokenFile, JSON.stringify({}));
-      };
-
+      const host = payload.host;
+      const authTokenFile = `${this.homebridgeStoragePath}/xboxTv/authToken_${host.split('.').join('')}`;
+      await fsPromises.writeFile(authTokenFile, JSON.stringify({}));
       return true;
     } catch (e) {
       throw new RequestError('Clear token file failed.', {
@@ -38,21 +38,32 @@ class PluginUiServer extends HomebridgePluginUiServer {
     };
   };
 
-  async getWebApiToken(payload) {
+  async queryString(locationHash) {
+    try {
+      const urlParams = QueryString.parse(locationHash);
+      return urlParams;
+    } catch (e) {
+      throw new RequestError('Query string failed.', {
+        message: e.message
+      });
+    };
+  };
+
+  async startAuthorization(payload) {
 
     try {
       const host = payload.host;
       const webApiToken = payload.webApiToken;
       const authTokenFile = `${this.homebridgeStoragePath}/xboxTv/authToken_${host.split('.').join('')}`;
 
-      const authenticationConfig = {
+      const authConfig = {
         clientId: payload.clientId,
         clientSecret: payload.clientSecret,
         userToken: payload.userToken,
         uhs: payload.uhs,
         tokensFile: authTokenFile
       }
-      const authentication = new Authentication(authenticationConfig);
+      const authentication = new Authentication(authConfig);
 
       try {
         await authentication.isAuthenticated();
@@ -70,15 +81,22 @@ class PluginUiServer extends HomebridgePluginUiServer {
             };
           } catch (error) {
             this.data = {
-              info: 'Authorization or save token file error.',
+              info: error,
               status: 3
             };
           };
         } else {
-          const oauth2URI = await authentication.generateAuthorizationUrl();
-          this.data = {
-            info: oauth2URI,
-            status: 1
+          try {
+            const oauth2URI = await authentication.generateAuthorizationUrl();
+            this.data = {
+              info: oauth2URI,
+              status: 1
+            };
+          } catch (error) {
+            this.data = {
+              info: error,
+              status: 3
+            };
           };
         };
       };

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Xbox TV",
   "name": "homebridge-xbox-tv",
-  "version": "2.8.2-beta.9",
+  "version": "2.8.3",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to control Xbox game consoles.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/webApi/authentication.js

@@ -242,7 +242,7 @@ class AUTHENTICATION {
                     "grant_type": 'authorization_code',
                     "scope": CONSTANS.Scopes.join(' '),
                     "code": webApiToken,
-                    "redirect_uri": 'http://localhost/auth/callback'
+                    "redirect_uri": 'http://localhost:8080/auth/callback'
                 }
 
                 if (this.clientSecret !== '') {
@@ -272,7 +272,7 @@ class AUTHENTICATION {
                     "response_type": 'code',
                     "approval_prompt": 'auto',
                     "scope": CONSTANS.Scopes.join(' '),
-                    "redirect_uri": 'http://localhost/auth/callback'
+                    "redirect_uri": 'http://localhost:8080/auth/callback'
                 }
                 const params = QueryString.stringify(paramsObject);
                 const oauth2URI = `https://login.live.com/oauth20_authorize.srf?${params}`;