fix a login issue with using 2fa

homebridge-plugins · Jul 13, 2024 · dc133fa · dc133fa
1 parent 532d0e7
commit dc133fa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,12 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 - `MINOR` version when a new device type is added, or when a new feature is added that is backwards-compatible
 - `PATCH` version when backwards-compatible bug fixes are implemented
 
+## 10.5.1 (2024-07-13)
+
+### Fixed
+
+- fix a login issue with using 2fa
+
 ## 10.5.0 (2024-07-13)
 
 ### Added

diff --git a/lib/connection/http.js b/lib/connection/http.js
@@ -224,6 +224,8 @@ export default class {
             await this.login();
             return this.getDevices();
           }
+
+          await this.storageData.removeItem('Meross_All_Devices_temp');
           throw new Error(platformLang.accTokenInvalid);
         }
         throw new Error(`${platformLang.invalidDevices} - ${JSON.stringify(res.data)}`);

diff --git a/lib/platform.js b/lib/platform.js
@@ -365,12 +365,17 @@ export default class {
           this.log.debug('[HTTP] %s.', platformLang.accTokenFromCache);
 
           this.cloudClient = new httpClient(this);
+          this.accountDetails = await this.cloudClient.login();
         } catch (err) {
           this.log.warn('[HTTP] %s %s.', platformLang.accTokenFail, parseError(err, [
             platformLang.accTokenUserChange,
             platformLang.accTokenNoExist,
+            platformLang.accTokenInvalid,
           ]));
 
+          // Remove existing cache info if it exists
+          await this.storageData.removeItem('Meross_All_Devices_temp');
+
           this.cloudClient = new httpClient(this);
           this.accountDetails = await this.cloudClient.login();
         }
@@ -379,7 +384,7 @@ export default class {
         cloudDevices = await this.cloudClient.getDevices();
         cloudDevices.forEach((device) => this.initialiseDevice(device));
       } catch (err) {
-        const eText = parseError(err, [platformLang.mfaFail, platformLang.missingCreds]);
+        const eText = parseError(err, [platformLang.mfaFail, platformLang.missingCreds, platformLang.accTokenInvalid]);
         this.log.warn('%s %s.', platformLang.disablingCloud, eText);
         this.cloudClient = false;
         this.accountDetails = {