homebridge-melcloud-control 4.0.0-beta.383 → 4.0.0-beta.385

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.383",
+  "version": "4.0.0-beta.385",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/melcloud.js

@@ -277,7 +277,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectToMelCloudHome1() {
+    async connectToMelCloudHome() {
         try {
             const melCloudHomeToken = new MelCloudHomeToken({
                 user: this.user,
@@ -289,10 +289,7 @@ class MelCloud extends EventEmitter {
                 .on('warn', warn => this.emit('warn', warn))
                 .on('error', error => this.emit('error', error));
 
-            const data = await melCloudHomeToken.buildAuthorizeUrl();
-
-            const url = data.url;
-            const codeVerifier = data.codeVerifier;
+            const { codeVerifier, url } = await melCloudHomeToken.buildAuthorizeUrl();
             const code = await melCloudHomeToken.loginToMelCloudHome(url);
             const token = await melCloudHomeToken.getTokens(code, codeVerifier);
 
@@ -305,7 +302,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectToMelCloudHome(refresh = false) {
+    async connectToMelCloudHome1(refresh = false) {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
 
         let browser;

package/src/melcloudhometoken.js

@@ -7,7 +7,7 @@ import EventEmitter from 'events';
 
 const MOBILE_USER_AGENT = 'MonitorAndControl.App.Mobile/35 CFNetwork/3860.100.1 Darwin/25.0.0';
 const CLIENT_ID = 'homemobile';
-const REDIRECT_URI = 'melcloudhome://';
+const REDIRECT_URI = 'https://auth.melcloudhome.com/signin-oidc-meu';
 const SCOPE = 'openid profile email offline_access IdentityServerApi';
 const TOKEN_ENDPOINT = 'https://auth.melcloudhome.com/connect/token';
 const AUTHORIZE_ENDPOINT = 'https://auth.melcloudhome.com/connect/authorize';
@@ -44,16 +44,19 @@ class MelCloudHomeToken extends EventEmitter {
         try {
             const tokenData = new URLSearchParams({
                 grant_type: 'authorization_code',
-                code: this.code,
+                code: code,
                 redirect_uri: REDIRECT_URI,
                 client_id: CLIENT_ID,
                 code_verifier: codeVerifier,
             });
 
+            this.emit('warn', `Code used: ${code}`);
+            this.emit('warn', `Verifier: ${codeVerifier}`);
+            this.emit('warn', `Redirect URI: ${REDIRECT_URI}`);
+
             const tokenResponse = await this.client.post(TOKEN_ENDPOINT, tokenData.toString(), {
                 headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                    'Authorization': 'Basic aG9tZW1vYmlsZTo=',
+                    'Content-Type': 'application/x-www-form-urlencoded'
                 },
             });
 
@@ -61,6 +64,9 @@ class MelCloudHomeToken extends EventEmitter {
             this.emit('warn', `Token ${JSON.stringify(tokens)}`);
             return tokens;
         } catch (error) {
+            if (error.response) {
+                this.emit('warn', `Token error response: ${JSON.stringify(error.response.data)}`);
+            }
             throw new Error(`Failed to obtain OAuth token: ${error}`);
         }
     }
@@ -115,7 +121,6 @@ class MelCloudHomeToken extends EventEmitter {
                 if (match) {
                     const code = match[1];
                     if (this.logWarn) this.emit('warn', `Redirect URL found code: ${code}`);
-                    this.code = code
                     return code;
                 } else {
                     if (this.logWarn) this.emit('warn', `Redirect URL found, but no "code=" param: ${redirectUrl}`);