homebridge-melcloud-control 4.0.0-beta.247 → 4.0.0-beta.249

package/package.json

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

package/src/melcloudhometoken.js

@@ -75,7 +75,7 @@ class MelCloudHomeToken {
 
     // --- Get login page ---
     async getLoginPage(authUrl) {
-        this.log.info('Getting login page...');
+        console.log('Getting login page...');
         const resp = await this.httpsRequest(authUrl, {
             method: 'GET',
             headers: {
@@ -93,7 +93,7 @@ class MelCloudHomeToken {
 
     // --- Submit login and handle form_post ---
     async submitLogin(form, email, password, cookies, loginPageUrl) {
-        this.log.info('Submitting login credentials...');
+        console.log('Submitting login credentials...');
 
         // Step 1: Collect all hidden inputs
         const formData = new URLSearchParams();
@@ -149,33 +149,52 @@ class MelCloudHomeToken {
 
     // --- Exchange code for tokens ---
     async exchangeCodeForTokens(code, codeVerifier) {
-        this.log.info('Exchanging authorization code for tokens...');
+         console.log('Exchanging authorization code for tokens...');
 
+        // Dane POST do token endpoint
         const tokenData = new URLSearchParams({
             grant_type: 'authorization_code',
             code,
-            redirect_uri: REDIRECT_URI,
+            redirect_uri: REDIRECT_URI,   // musi być dokładnie ten sam co w authorize URL
             client_id: CLIENT_ID,
             code_verifier: codeVerifier,
         });
 
+        // Wysyłamy POST bez Basic Auth (PKCE wystarczy)
         const resp = await this.httpsRequest(TOKEN_ENDPOINT, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded',
                 'Content-Length': tokenData.toString().length,
-                'Authorization': 'Basic aG9tZW1vYmlsZTo=', // base64(homemobile:)
             }
         }, tokenData.toString());
 
-        const tokens = JSON.parse(resp.html);
-        if (tokens.error) throw new Error(`Token exchange failed: ${tokens.error_description || tokens.error}`);
-        return tokens;
+        // Parsujemy odpowiedź
+        let tokens;
+        try {
+            tokens = JSON.parse(resp.html);
+        } catch (err) {
+             console.log('Failed to parse token response:', resp.html);
+            throw err;
+        }
+
+        if (tokens.error) {
+             console.log('Token response error:', tokens);
+            throw new Error(`Token exchange failed: ${tokens.error_description || tokens.error}`);
+        }
+
+        return {
+            accessToken: tokens.access_token,
+            refreshToken: tokens.refresh_token,
+            expiresIn: tokens.expires_in,
+            idToken: tokens.id_token,
+        };
     }
 
+
     // --- Main flow ---
     async getTokensWithCredentials(email, password) {
-        this.log.info('Obtaining OAuth tokens automatically...');
+        console.log('Obtaining OAuth tokens automatically...');
 
         const pkce = this.generatePKCE();
         const state = this.generateState();
@@ -197,7 +216,7 @@ class MelCloudHomeToken {
 
         // 3️⃣ Exchange code for tokens
         const tokens = await this.exchangeCodeForTokens(authCode, pkce.verifier);
-        this.log.info('✓ Successfully obtained OAuth tokens');
+        console.log('✓ Successfully obtained OAuth tokens');
         return tokens;
     }
 }