homebridge-melcloud-control 4.0.0-beta.298 → 4.0.0-beta.299

package/package.json

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

package/src/melcloud.js

@@ -9,6 +9,7 @@ import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome } from './constants.js';
 import { URLSearchParams } from 'url';
 const TOKEN_ENDPOINT = 'https://auth.melcloudhome.com/connect/token';
+const REDIRECT_URI = 'melcloudhome://';
 
 class MelCloud extends EventEmitter {
     constructor(accountType, user, passwd, language, accountFile, buildingsFile, devicesFile, logWarn, logDebug, requestConfig) {
@@ -304,16 +305,8 @@ class MelCloud extends EventEmitter {
             this.emit('warn', authCode);
 
             // 5. Wymień code na access_token
-            const tokenResponse = await axios.post(TOKEN_ENDPOINT, new URLSearchParams({
-                client_id: 'homemobile',
-                grant_type: 'authorization_code',
-                code: authCode,
-                redirect_uri: 'melcloudhome://'
-            }).toString(), {
-                headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-            });
-
-            const tokenData = await tokenResp.json();
+            const tokenResponse = await melCloudHomeToken.getTokens(authCode);
+            const tokenData = await tokenResponse.json();
             this.emit('debug', `Token: ${JSON.stringify(tokenData, null, 2)}`);
             return {
                 accessToken: tokenData.access_token,

package/src/melcloudhometoken.js

@@ -75,6 +75,29 @@ class MelCloudHomeToken {
         }
     }
 
+    async getTokens(code) {
+        const pkce = this.generatePKCE();
+        const data = new URLSearchParams();
+        data.append('grant_type', 'authorization_code');
+        data.append('client_id', CLIENT_ID);
+        data.append('code', code);
+        data.append('redirect_uri', REDIRECT_URI);
+        data.append('code_verifier', pkce.verifier);
+
+        const res = await this.client.post(TOKEN_ENDPOINT, data.toString(), {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'Authorization': 'Basic aG9tZW1vYmlsZTo='
+            },
+        });
+
+        if (res.status !== 200) {
+            throw new Error(`Token exchange failed: ${res.status} ${res.statusText}`);
+        }
+
+        return res.data;
+    }
+
 
     async buildAuthorizeUrl() {
         try {
@@ -88,7 +111,6 @@ class MelCloudHomeToken {
             authUrl.searchParams.set('code_challenge', pkce.challenge);
             authUrl.searchParams.set('code_challenge_method', 'S256');
             authUrl.searchParams.set('state', state);
-
             const loginPage = await this.getLoginPage(authUrl.toString());
 
             return loginPage.url;