homebridge-melcloud-control 4.0.0-beta.339 → 4.0.0-beta.340

package/package.json

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

package/src/melcloud.js

@@ -293,12 +293,12 @@ class MelCloud extends EventEmitter {
                 .on('warn', warn => this.emit('warn', warn))
                 .on('error', error => this.emit('error', error));
 
-            const data = await melCloudHomeToken.buildAuthorizeUrl();
+            const token = await melCloudHomeToken.buildAuthorizeUrl();
 
-            const url = data.url;
-            const codeVerifier = data.codeVerifier;
-            const code = await melCloudHomeToken.loginToMelCloudHome(url);
-            const token = await melCloudHomeToken.getTokens(code, codeVerifier);
+            //const url = data.url;
+            //const codeVerifier = data.codeVerifier;
+            //const code = await melCloudHomeToken.loginToMelCloudHome(url);
+            //const token = await melCloudHomeToken.getTokens(code, codeVerifier);
 
             const accountInfo = { ContextKey: token, UseFahrenheit: false };
             this.contextKey = cookies;

package/src/melcloudhometoken.js

@@ -97,17 +97,15 @@ class MelCloudHomeToken extends EventEmitter {
             const tokenResponse = await axios.post(TOKEN_ENDPOINT, tokenData.toString(), {
                 headers: {
                     'Content-Type': 'application/x-www-form-urlencoded',
-                    'Content-Length': tokenData.toString().length,
                     'Authorization': 'Basic aG9tZW1vYmlsZTo=',
                 },
             });
-            const tokens = JSON.parse(tokenResponse.data);
 
-            this.emit('warn', `Token ${tokens}`);
+            const tokens = tokenResponse.data;
+            this.emit('warn', `Token ${JSON.stringify(tokens)}`);
             return tokens;
         } catch (error) {
-            console.error('Failed to obtain OAuth tokens:', error);
-            throw error;
+            throw new Error(`Failed to obtain OAuth token: ${error.response?.data || error}`);
         }
     }
 
@@ -190,11 +188,11 @@ class MelCloudHomeToken extends EventEmitter {
             authUrl.searchParams.set('state', state);
 
             const loginPage = await this.getLoginPage(authUrl.toString());
-            const data = { codeVerifier: pkce.verifier, url: loginPage.url }
-            return data;
+            const code = await this.loginToMelCloudHome(loginPage.url);
+            const token = await this.getTokens(code, pkce.verifier);
+            return token;
         } catch (error) {
-            console.error('Failed to obtain OAuth link:', error);
-            throw error;
+            throw new Error(`Failed to obtain OAuth link: ${error}`);
         }
     }
 }