@homebridge-plugins/homebridge-tado 8.6.0-beta.0 → 8.6.0-beta.2

package/CHANGELOG.md

@@ -1,8 +1,11 @@
 # Changelog
 
 ## v8.6.0 - 2025-10-30
-- Fix: Incorrect update zones handling leading to unwanted heating changes (#178)
-- Improve zone update handling when setting state and update all zones if next scheduled update is more than 10s away
+- BREAKING CHANGE: If you use tadoApiUrl or skipAuth, you must now define them under each corresponding home in your configuration (#176)
+- Refactor configuration: moved tadoApiUrl and skipAuth into individual home configs to support multiple API URLs (#176)
+- Persist tado zone states after every zone states update
+- Improved zone update logic: when setting a state, all zones are now updated immediately if the next scheduled update is more than 10 seconds away
+- Fix: Corrected zone update handling that could previously cause unintended heating changes (#178)
 
 ## v8.5.0 - 2025-10-27
 - Change minimum polling interval to 30s due to improvements made in v8.2.0

package/config.schema.json

@@ -41,6 +41,16 @@
               "description": "The user name that you use for the app and the web app of Tado.",
               "required": true
             },
+            "tadoApiUrl": {
+              "title": "Tado API URL",
+              "type": "string",
+              "description": "Optional: Use a custom tado api url (e.g. http://localhost:8080)."
+            },
+            "skipAuth": {
+              "title": "Skip Authentication",
+              "type": "boolean",
+              "description": "Optional: Skip authentication for tado api."
+            },
             "polling": {
               "title": "Polling",
               "description": "The polling interval in seconds (recommended value: 300).",
@@ -554,16 +564,6 @@
           }
         }
       },
-      "tadoApiUrl": {
-        "title": "Tado API URL",
-        "type": "string",
-        "description": "Optional: Use a custom tado api url (e.g. http://localhost:8080)."
-      },
-      "skipAuth": {
-        "title": "Skip Authentication",
-        "type": "boolean",
-        "description": "Optional: Skip authentication for tado api."
-      },
       "disableHistoryService": {
         "title": "Disable History Service",
         "type": "boolean",
@@ -574,8 +574,6 @@
   "layout": [
     "name",
     "debug",
-    "tadoApiUrl",
-    "skipAuth",
     "disableHistoryService",
     {
       "key": "homes",
@@ -588,13 +586,15 @@
         "homes[].temperatureUnit",
         {
           "key": "homes[]",
-          "title": "Credentials",
+          "title": "Authentication",
           "type": "section",
           "expandable": true,
           "expanded": false,
           "orderable": false,
           "items": [
             "homes[].id",
+            "homes[].tadoApiUrl",
+            "homes[].skipAuth",
             "homes[].username"
           ]
         },

package/homebridge-ui/public/index.html

@@ -89,6 +89,10 @@
       <div class="form-group">
         <label for="homeUsername">Username <span class="text-danger">*</span> </label>
         <input type="text" class="form-control" id="homeUsername">
+        <label for="homeTadoApiUrl">Tado API URL (optional) </label>
+        <input type="text" class="form-control" id="homeTadoApiUrl">
+        <label for="homeSkipAuth">Skip Authentication (optional) </label>
+        <input type="checkbox" class="form-control" id="homeSkipAuth">
       </div>
       <button id="auth" type="submit" class="btn btn-primary float-right mt-3 mr-0">Next</button>
     </div>

package/homebridge-ui/public/js/main.js

@@ -132,8 +132,6 @@ async function createCustomSchema(home) {
   customSchemaActive = homebridge.createForm(schema, {
     name: pluginConfig[0].name,
     debug: pluginConfig[0].debug,
-    tadoApiUrl: pluginConfig[0].tadoApiUrl,
-    skipAuth: pluginConfig[0].skipAuth,
     disableHistoryService: pluginConfig[0].disableHistoryService,
     homes: home
   });
@@ -142,8 +140,6 @@ async function createCustomSchema(home) {
 
     pluginConfig[0].name = config.name;
     pluginConfig[0].debug = config.debug;
-    pluginConfig[0].tadoApiUrl = config.tadoApiUrl;
-    pluginConfig[0].skipAuth = config.skipAuth;
     pluginConfig[0].disableHistoryService = config.disableHistoryService;
     pluginConfig[0].homes = pluginConfig[0].homes.map(myHome => {
       if (myHome.name === config.homes.name) {
@@ -185,6 +181,8 @@ async function resetUI() {
 function resetForm() {
 
   $('#homeUsername').val('');
+  $('#homeTadoApiUrl').val('');
+  $('#homeSkipAuth').prop('checked', false);
 
   if (fetchDevicesBar)
     fetchDevicesBar.set(0);
@@ -285,8 +283,6 @@ async function removeDeviceFromConfig(name) {
 
       if (!pluginConfig[0].homes.length) {
         delete pluginConfig[0].debug;
-        delete pluginConfig[0].tadoApiUrl;
-        delete pluginConfig[0].skipAuth;
         delete pluginConfig[0].disableHistoryService;
       }
 
@@ -313,9 +309,9 @@ async function removeDeviceFromConfig(name) {
 
 }
 
-async function fetchDevices(credentials, refresh, resync) {
+async function fetchDevices(auth, refresh, resync) {
 
-  if (!credentials && !resync)
+  if (!auth && !resync)
     return homebridge.toast.error('No credentials!', 'Error');
 
   const config = JSON.parse(JSON.stringify(pluginConfig));
@@ -337,7 +333,7 @@ async function fetchDevices(credentials, refresh, resync) {
 
     if (!resync) {
       //Init API with credentials
-      await fnAuthenticate(credentials);
+      await fnAuthenticate(auth);
 
       await TIMEOUT(2000);
 
@@ -355,7 +351,7 @@ async function fetchDevices(credentials, refresh, resync) {
         return homebridge.toast.error('Cannot refresh ' + currentHome + '. Not found in config!', 'Error');
 
       if (!home.id) {
-        homebridge.toast.info('No Home ID defined in config. Getting Home ID for ' + home.name, credentials.username);
+        homebridge.toast.info('No Home ID defined in config. Getting Home ID for ' + home.name, auth.username);
         const me = await homebridge.request('/exec', { dest: 'getMe' });
         me.homes.map(foundHome => {
           if (foundHome.name === home.name)
@@ -363,7 +359,7 @@ async function fetchDevices(credentials, refresh, resync) {
         });
         await TIMEOUT(1000);
         if (!home.id)
-          return homebridge.toast.error('Cannot get a Home ID for ' + home.name + '. ' + home.name + ' not found for this user!', credentials.username);
+          return homebridge.toast.error('Cannot get a Home ID for ' + home.name + '. ' + home.name + ' not found for this user!', auth.username);
       }
 
       await TIMEOUT(2000);
@@ -377,7 +373,9 @@ async function fetchDevices(credentials, refresh, resync) {
         if (config[0].homes[i].name === homeInfo.name) {
 
           config[0].homes[i].id = homeInfo.id;
-          config[0].homes[i].username = credentials.username;
+          config[0].homes[i].username = auth.username;
+          config[0].homes[i].tadoApiUrl = auth.tadoApiUrl;
+          config[0].homes[i].skipAuth = auth.skipAuth;
           config[0].homes[i].temperatureUnit = homeInfo.temperatureUnit || 'CELSIUS';
           config[0].homes[i].zones = config[0].homes[i].zones || [];
 
@@ -416,7 +414,7 @@ async function fetchDevices(credentials, refresh, resync) {
               }
             });
             if (!found) {
-              homebridge.toast.info(user.name + ' removed from config!', credentials.username);
+              homebridge.toast.info(user.name + ' removed from config!', auth.username);
               config[0].homes[i].presence.user.splice(index, 1);
             }
           });
@@ -464,7 +462,7 @@ async function fetchDevices(credentials, refresh, resync) {
               }
             });
             if (!found) {
-              homebridge.toast.info(zone.name + ' removed from config!', credentials.username);
+              homebridge.toast.info(zone.name + ' removed from config!', auth.username);
               config[0].homes[i].zones.splice(index, 1);
             }
           });
@@ -628,7 +626,7 @@ async function fetchDevices(credentials, refresh, resync) {
               }
             });
             if (!found) {
-              homebridge.toast.info(childLockSwitch.name + ' removed from config!', credentials.username);
+              homebridge.toast.info(childLockSwitch.name + ' removed from config!', auth.username);
               config[0].homes[i].extras.childLockSwitches.splice(index, 1);
             }
           });
@@ -675,7 +673,11 @@ async function fetchDevices(credentials, refresh, resync) {
         if (home.name && home.username) {
 
           //Init API with credentials
-          await fnAuthenticate({ username: home.username });
+          await fnAuthenticate({
+            username: home.username,
+            tadoApiUrl: home.tadoApiUrl,
+            skipAuth: home.skipAuth
+          });
 
           //resync home (refresh/remove)
           const me = await homebridge.request('/exec', { dest: 'getMe' });
@@ -684,7 +686,9 @@ async function fetchDevices(credentials, refresh, resync) {
             availableHomesInApis.push({
               id: foundHome.id,
               name: foundHome.name,
-              username: home.username
+              username: home.username,
+              tadoApiUrl: home.tadoApiUrl,
+              skipAuth: home.skipAuth
             });
           });
 
@@ -708,7 +712,11 @@ async function fetchDevices(credentials, refresh, resync) {
         if (home.name && home.username) {
 
           //Init API with credentials
-          await fnAuthenticate({ username: home.username });
+          await fnAuthenticate({
+            username: home.username,
+            tadoApiUrl: home.tadoApiUrl,
+            skipAuth: home.skipAuth
+          });
 
           let foundHome;
 
@@ -748,7 +756,11 @@ async function fetchDevices(credentials, refresh, resync) {
         if (home.name && home.username) {
 
           //Init API with credentials
-          await fnAuthenticate({ username: home.username });
+          await fnAuthenticate({
+            username: home.username,
+            tadoApiUrl: home.tadoApiUrl,
+            skipAuth: home.skipAuth
+          });
 
           let foundHome;
 
@@ -767,6 +779,8 @@ async function fetchDevices(credentials, refresh, resync) {
 
             config[0].homes[i].id = homeInfo.id;
             config[0].homes[i].username = foundHome.username;
+            config[0].homes[i].tadoApiUrl = foundHome.tadoApiUrl;
+            config[0].homes[i].skipAuth = foundHome.skipAuth;
             config[0].homes[i].temperatureUnit = homeInfo.temperatureUnit || 'CELSIUS';
             config[0].homes[i].zones = config[0].homes[i].zones || [];
 
@@ -1078,12 +1092,18 @@ async function fetchDevices(credentials, refresh, resync) {
           addedHomes += 1;
 
           //Init API with credentials
-          await fnAuthenticate({ username: foundHome.username });
+          await fnAuthenticate({
+            username: foundHome.username,
+            tadoApiUrl: foundHome.tadoApiUrl,
+            skipAuth: foundHome.skipAuth
+          });
 
           const homeConfig = {
             id: foundHome.id,
             name: foundHome.name,
             username: foundHome.username,
+            tadoApiUrl: foundHome.tadoApiUrl,
+            skipAuth: foundHome.skipAuth,
             polling: 300,
             zones: [],
             presence: {
@@ -1239,7 +1259,9 @@ async function fetchDevices(credentials, refresh, resync) {
           const homeConfig = {
             id: foundHome.id,
             name: foundHome.name,
-            username: credentials.username,
+            username: auth.username,
+            tadoApiUrl: auth.tadoApiUrl,
+            skipAuth: auth.skipAuth,
             polling: 300,
             zones: [],
             presence: {
@@ -1384,7 +1406,7 @@ async function fetchDevices(credentials, refresh, resync) {
     fetchDevicesBar.animate(1.00);
 
     if (resync)
-      homebridge.toast.info('Resynchronized!', credentials.username);
+      homebridge.toast.info('Resynchronized!', auth.username);
 
     await TIMEOUT(2000);
 
@@ -1501,13 +1523,15 @@ $('#auth').on('click', async () => {
 
   try {
 
-    let credentials = {
+    let auth = {
       username: $('#homeUsername').val(),
+      tadoApiUrl: $('#homeTadoApiUrl').val(),
+      skipAuth: $('#homeSkipAuth').prop('checked')
     };
 
     transPage($('#configureDevice'), $('#fetchDevices'));
 
-    const config = await fetchDevices(credentials, false, false);
+    const config = await fetchDevices(auth, false, false);
 
     if (config) {
       await addNewDeviceToConfig(config, false, false);
@@ -1553,7 +1577,11 @@ $('#refreshDevice').on('click', async () => {
 
     transPage($('#isConfigured'), $('#fetchDevices'));
 
-    const config = await fetchDevices({ username: home.username }, true, false);
+    const config = await fetchDevices({
+      username: home.username,
+      tadoApiUrl: home.tadoApiUrl,
+      skipAuth: home.skipAuth
+    }, true, false);
 
     if (config) {
       await addNewDeviceToConfig(config, true, false);

package/homebridge-ui/public/js/schema.js

@@ -34,6 +34,16 @@ const schema = {
           'description': 'The user name that you use for the app and the web app of Tado.',
           'required': true
         },
+        'tadoApiUrl': {
+          'title': 'Tado API URL',
+          'type': 'string',
+          'description': 'Optional: Use a custom tado api url (e.g. http://localhost:8080).'
+        },
+        'skipAuth': {
+          'title': 'Skip Authentication',
+          'type': 'boolean',
+          'description': 'Optional: Skip authentication for tado api.'
+        },
         'polling': {
           'title': 'Polling',
           'description': 'The polling interval in seconds (recommended value: 300).',
@@ -546,16 +556,6 @@ const schema = {
         }
       }
     },
-    'tadoApiUrl': {
-      'title': 'Tado API URL',
-      'type': 'string',
-      'description': 'Optional: Use a custom tado api url (e.g. http://localhost:8080).'
-    },
-    'skipAuth': {
-      'title': 'Skip Authentication',
-      'type': 'boolean',
-      'description': 'Optional: Skip authentication for tado api.'
-    },
     'disableHistoryService': {
       'title': 'Disable History Service',
       'type': 'boolean',
@@ -565,21 +565,21 @@ const schema = {
   'layout': [
     'name',
     'debug',
-    'tadoApiUrl',
-    'skipAuth',
     'disableHistoryService',
     'homes.name',
     'homes.polling',
     'homes.temperatureUnit',
     {
       'key': 'homes',
-      'title': 'Credentials',
+      'title': 'Authentication',
       'type': 'section',
       'expandable': true,
       'expanded': false,
       'orderable': false,
       'items': [
         'homes.id',
+        'homes.tadoApiUrl',
+        'homes.skipAuth',
         'homes.username'
       ]
     },

package/homebridge-ui/server.js

@@ -17,10 +17,13 @@ class UiServer extends HomebridgePluginUiServer {
 
   authenticate(config) {
 
-    this.tado = new TadoApi('Config UI X', { username: config.username }, this.homebridgeStoragePath);
+    this.tado = new TadoApi('Config UI X', {
+      username: config.username,
+      tadoApiUrl: config.tadoApiUrl,
+      skipAuth: config.skipAuth
+    }, this.homebridgeStoragePath);
 
     return;
-
   }
 
   reset() {
@@ -28,7 +31,6 @@ class UiServer extends HomebridgePluginUiServer {
     this.tado = false;
 
     return;
-
   }
 
   async exec(payload) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homebridge-plugins/homebridge-tado",
-  "version": "8.6.0-beta.0",
+  "version": "8.6.0-beta.2",
   "description": "Homebridge plugin for controlling tado° devices.",
   "main": "index.js",
   "scripts": {

package/src/helper/handler.js

@@ -729,7 +729,7 @@ export default (api, accessories, config, tado, telegram) => {
     }
   }
 
-  async function persistStates(homeId, zoneStates) {
+  async function persistZoneStates(homeId, zoneStates) {
     try {
       if (zoneStates && Object.keys(zoneStates).length) {
         const homeData = {};
@@ -741,6 +741,9 @@ export default (api, accessories, config, tado, telegram) => {
     } catch (error) {
       Logger.error(`Error while updating the tado states file for home ${homeId}: ${error.message || error}`);
     }
+  }
+
+  async function persistStates() {
     try {
       const data = {};
       data.counterData = await tado.getCounterData();
@@ -781,7 +784,6 @@ export default (api, accessories, config, tado, telegram) => {
 
   async function getStates() {
     lastGetStates = Date.now();
-    let zoneStates = {};
     try {
       //ME
       if (!config.homeId) await updateMe();
@@ -790,7 +792,7 @@ export default (api, accessories, config, tado, telegram) => {
       if (!config.temperatureUnit) await updateHome();
 
       //Zones
-      if (config.zones.length) zoneStates = await updateZones();
+      if (config.zones.length) await updateZones();
 
       //MobileDevices
       if (config.presence.length) await updateMobileDevices();
@@ -809,7 +811,7 @@ export default (api, accessories, config, tado, telegram) => {
     } catch (err) {
       errorHandler(err);
     } finally {
-      void persistStates(config.homeId, zoneStates);
+      void persistStates();
     }
   }
 
@@ -903,9 +905,9 @@ export default (api, accessories, config, tado, telegram) => {
     }
 
     const zoneStates = (await tado.getZoneStates(config.homeId))["zoneStates"] ?? {};
-    const zonesToUpdate = config.zones;
+    void persistZoneStates(config.homeId, zoneStates);
 
-    for (const zone of zonesToUpdate) {
+    for (const zone of config.zones) {
       const zoneState = zoneStates[zone.id.toString()];
       Logger.debug(`Update state of zone ${zone.id} to:`, zoneState);
 

package/src/platform.js

@@ -59,45 +59,49 @@ class TadoPlatform {
   async setupPlugin(storagePath) {
     try {
       if (this.config.user && this.config.user.length) {
-        for (const credentials of this.config.user) {
+        for (const auth of this.config.user) {
           let error = false;
 
-          if (!credentials.username) {
+          if (!auth.username) {
             Logger.warn('There is no username configured for the user. This user will be skipped.');
             error = true;
-          } else if (credentials.reconfigure === false) {
+          } else if (auth.reconfigure === false) {
             error = true;
           }
 
           if (!error) {
             this.user.push({
-              username: credentials.username
+              username: auth.username,
+              tadoApiUrl: auth.tadoApiUrl,
+              skipAuth: auth.skipAuth
             });
           }
         }
       }
 
       if (this.user.length) {
-        for (const user of this.user) {
-          if (user.reconfigure || user.reconfigure === undefined) {
+        for (const auth of this.user) {
+          if (auth.reconfigure || auth.reconfigure === undefined) {
             if (this.config.homes && this.config.homes.length) {
-              let foundHome = this.config.homes.filter((home) => home && home.username === user.username);
+              let foundHome = this.config.homes.filter((home) => home && home.username === auth.username);
 
               if (foundHome.length) {
                 //refresh
                 if (foundHome[0].name && foundHome[0].username) {
                   Logger.info('Refreshing home...', foundHome[0].name);
                   this.config = await TadoConfig.refresh(foundHome[0].name, this.config, {
-                    username: foundHome[0].username
-                  }, storagePath, this.config.tadoApiUrl, this.config.skipAuth);
+                    username: foundHome[0].username,
+                    tadoApiUrl: foundHome[0].tadoApiUrl,
+                    skipAuth: foundHome[0].skipAuth
+                  }, storagePath);
                 }
               } else {
-                Logger.info('Generating new home...', user.username);
-                this.config = await TadoConfig.add(this.config, [user], storagePath, this.config.tadoApiUrl, this.config.skipAuth);
+                Logger.info('Generating new home...', auth.username);
+                this.config = await TadoConfig.add(this.config, [auth], storagePath);
               }
             } else {
-              Logger.info('Generating new home...', user.username);
-              this.config = await TadoConfig.add(this.config, [user], storagePath, this.config.tadoApiUrl, this.config.skipAuth);
+              Logger.info('Generating new home...', auth.username);
+              this.config = await TadoConfig.add(this.config, [auth], storagePath);
             }
           }
         }
@@ -114,7 +118,7 @@ class TadoPlatform {
           })
           .filter((user) => user);
 
-        await TadoConfig.store(this.config, storagePath, this.config.tadoApiUrl, this.config.skipAuth);
+        await TadoConfig.store(this.config, storagePath);
 
         Logger.info('Done!');
 

package/src/tado/tado-api.js

@@ -9,14 +9,14 @@ const tado_auth_url = "https://login.tado.com/oauth2";
 const tado_client_id = "1bb50063-6b0c-4d11-bd99-387f4a91cc46";
 
 export default class Tado {
-  constructor(name, config, storagePath, tadoApiUrl, skipAuth) {
-    this.tadoApiUrl = tadoApiUrl || tado_url;
-    this.customTadoApiUrlActive = !!tadoApiUrl;
-    this.skipAuth = skipAuth?.toString() === "true";
+  constructor(name, auth, storagePath) {
+    this.tadoApiUrl = auth.tadoApiUrl || tado_url;
+    this.customTadoApiUrlActive = !!auth.tadoApiUrl;
+    this.skipAuth = auth.skipAuth?.toString() === "true";
     this.storagePath = storagePath;
     this.name = name;
-    const usesExternalTokenFile = config.username?.toLowerCase().endsWith(".json");
-    this._tadoExternalTokenFilePath = usesExternalTokenFile ? config.username : undefined;
+    const usesExternalTokenFile = auth.username?.toLowerCase().endsWith(".json");
+    this._tadoExternalTokenFilePath = usesExternalTokenFile ? auth.username : undefined;
     const fnSimpleHash = (str) => {
       let hash = 0;
       for (let i = 0; i < str.length; i++) {
@@ -25,8 +25,8 @@ export default class Tado {
       }
       return (hash >>> 0).toString(36).padStart(7, '0');
     };
-    this.username = usesExternalTokenFile ? undefined : config.username;
-    this._tadoInternalTokenFilePath = usesExternalTokenFile ? undefined : join(this.storagePath, `.tado-token-${fnSimpleHash(config.username)}.json`);
+    this.username = usesExternalTokenFile ? undefined : auth.username;
+    this._tadoInternalTokenFilePath = usesExternalTokenFile ? undefined : join(this.storagePath, `.tado-token-${fnSimpleHash(auth.username)}.json`);
     this._tadoApiClientId = tado_client_id;
     this._tadoTokenPromise = undefined;
     this._tadoAuthenticationCallback = undefined;

package/src/tado/tado-config.js

@@ -18,15 +18,12 @@ const deviceHandler = new Map();
 let telegram;
 
 export default {
-  add: async function (config, credentials, storagePath, tadoApiUrl, skipAuth) {
+  add: async function (config, auths, storagePath) {
     config.homes = config.homes || [];
 
-    for (const user of credentials) {
-      let username = user.username;
+    for (const auth of auths) {
 
-      const tado = new TadoApi('Configuration', {
-        username: username,
-      }, storagePath, tadoApiUrl, skipAuth);
+      const tado = new TadoApi('Configuration', auth, storagePath);
 
       const me = await tado.getMe();
 
@@ -42,7 +39,9 @@ export default {
           const homeConfig = {
             id: foundHome.id,
             name: foundHome.name,
-            username: username,
+            username: auth.username,
+            tadoApiUrl: auth.tadoApiUrl,
+            skipAuth: auth.skipAuth,
             polling: 300,
             zones: [],
             presence: {
@@ -152,14 +151,16 @@ export default {
     return config;
   },
 
-  resync: async function (config, credentials, storagePath, tadoApiUrl, skipAuth) {
+  resync: async function (config, auths, storagePath) {
     const availableHomesInApis = [];
 
-    for (const user of credentials) {
+    for (const auth of auths) {
       //Init API with credentials
       const tado = new TadoApi('Configuration', {
-        username: user.username
-      }, storagePath, tadoApiUrl, skipAuth);
+        username: auth.username,
+        tadoApiUrl: auth.tadoApiUrl,
+        skipAuth: auth.skipAuth
+      }, storagePath);
 
       const me = await tado.getMe();
 
@@ -167,7 +168,9 @@ export default {
         availableHomesInApis.push({
           id: foundHome.id,
           name: foundHome.name,
-          username: user.username
+          username: auth.username,
+          tadoApiUrl: auth.tadoApiUrl,
+          skipAuth: auth.skipAuth
         });
       });
     }
@@ -191,22 +194,21 @@ export default {
     for (let home of config.homes.entries()) {
       if (home.name && home.username) {
         config = await this.refresh(home.name, config, {
-          username: home.username
-        }, storagePath, tadoApiUrl, skipAuth);
+          username: home.username,
+          tadoApiUrl: home.tadoApiUrl,
+          skipAuth: home.skipAuth
+        }, storagePath);
       }
     }
 
-    config = await this.add(config, availableHomesInApis, storagePath, tadoApiUrl, skipAuth);
+    config = await this.add(config, availableHomesInApis, storagePath);
 
     return config;
   },
 
-  refresh: async function (currentHome, config, credentials, storagePath, tadoApiUrl, skipAuth) {
-    let username = credentials.username;
+  refresh: async function (currentHome, config, auth, storagePath) {
 
-    const tado = new TadoApi('Configuration', {
-      username: username
-    }, storagePath, tadoApiUrl, skipAuth);
+    const tado = new TadoApi('Configuration', auth, storagePath);
 
     //Home Informations
     let home = config.homes.find((home) => home && home.name === currentHome);
@@ -229,7 +231,9 @@ export default {
     for (let [i, home] of config.homes.entries()) {
       if (config.homes[i].name === homeInfo.name) {
         config.homes[i].id = homeInfo.id;
-        config.homes[i].username = credentials.username;
+        config.homes[i].username = auth.username;
+        config.homes[i].tadoApiUrl = auth.tadoApiUrl;
+        config.homes[i].skipAuth = auth.skipAuth;
         config.homes[i].temperatureUnit = homeInfo.temperatureUnit || 'CELSIUS';
         config.homes[i].zones = config.homes[i].zones || [];
 
@@ -498,13 +502,17 @@ export default {
         if (!error) {
           //Base Config
           const tado = new TadoApi(home.name, {
-            username: home.username
-          }, storagePath, config.tadoApiUrl, config.skipAuth);
+            username: home.username,
+            tadoApiUrl: home.tadoApiUrl,
+            skipAuth: home.skipAuth
+          }, storagePath);
 
           const accessoryConfig = {
             homeId: home.id,
             homeName: home.name,
             username: home.username,
+            tadoApiUrl: home.tadoApiUrl,
+            skipAuth: home.skipAuth,
             temperatureUnit: home.temperatureUnit || 'CELSIUS',
             geolocation: home.geolocation,
             tado: tado,