Trying to fix token refresh bug

README.md

@@ -31,7 +31,7 @@ This is a plugin for Aqua Temp pool heater.
 1.4.2
 * Fixing with correct Characteristic
 
-1.4.3, 1.4.4
+1.4.3, 1.4.4, 1.4.5
 * Trying to fix token refresh bug
 
 

package.json

@@ -2,7 +2,7 @@
   "private": false,
   "displayName": "Aqua Temp Plugin",
   "name": "homebridge-aqua-temp",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "description": "This is a plugin for Aqua Temp pool heater.",
   "license": "Apache-2.0",
   "repository": {

src/accessories/ThermometerAccessory.ts

@@ -12,7 +12,6 @@ export class ThermometerAccessory {
     private readonly device: ObjectResult,
     public readonly config: PlatformConfig,
     public readonly log: Logger,
-    public readonly token: string,
   ) {
     this.accessory.getService(this.platform.Service.AccessoryInformation)!
       .setCharacteristic(this.platform.Characteristic.Manufacturer, 'AquaTemp')

src/accessories/ThermostatAccessory.ts

@@ -15,7 +15,6 @@ export class ThermostatAccessory {
     private readonly jsonItem: ObjectResult,
     public readonly config: PlatformConfig,
     public readonly log: Logger,
-    public readonly token: string,
   ) {
     const startUp = true;
 
@@ -62,7 +61,7 @@ export class ThermostatAccessory {
     }
 
     const httpRequest = new HttpRequest(this.config, this.log);
-    httpRequest.ChangePowerOfDevice(this.accessory.context.device.device_code, on, this.token).then((results)=> {
+    httpRequest.ChangePowerOfDevice(this.accessory.context.device.device_code, on, this.platform.Token).then((results)=> {
 
       const result = <AquaTempObject>results;
 
@@ -75,6 +74,10 @@ export class ThermostatAccessory {
           this.log.info('Changed state to ' +(value?'HEAT':'OFF'));
         }
       }
+    }).catch((error) => {
+      if (error==='NotLoggedIn') {
+        this.platform.getToken(false);
+      }
     });
   }
 
@@ -86,7 +89,7 @@ export class ThermostatAccessory {
     const temp = value as string;
 
     const httpRequest = new HttpRequest(this.config, this.log);
-    httpRequest.ChangeTargetTemperatureOfDevice(this.accessory.context.device.device_code, temp, this.token).then((results)=> {
+    httpRequest.ChangeTargetTemperatureOfDevice(this.accessory.context.device.device_code, temp, this.platform.Token).then((results)=> {
 
       const result = <AquaTempObject>results;
 
@@ -99,6 +102,10 @@ export class ThermostatAccessory {
           this.log.info('Changed target temperature to ' +(value));
         }
       }
+    }).catch((error) => {
+      if (error==='NotLoggedIn') {
+        this.platform.getToken(false);
+      }
     });
   }
 }

src/platform.ts

@@ -206,11 +206,11 @@ export class AquaTempHomebridgePlatform implements DynamicPlatformPlugin {
 
           for (const device of aquaTempObject.object_result) {
             const thermostatObject = this.getAccessory(device, 'thermostat');
-            new ThermostatAccessory(this, thermostatObject.accessory, device, this.config, this.log, this.Token);
+            new ThermostatAccessory(this, thermostatObject.accessory, device, this.config, this.log);
             this.addOrRestorAccessory(thermostatObject.accessory, device.device_nick_name, 'thermostat', thermostatObject.exists);
 
             const airObject = this.getAccessory(device, 'thermometer');
-            new ThermometerAccessory(this, airObject.accessory, device, this.config, this.log, this.Token);
+            new ThermometerAccessory(this, airObject.accessory, device, this.config, this.log);
             this.addOrRestorAccessory(airObject.accessory, device.device_nick_name, 'thermometer', airObject.exists);
           }