homebridge-melcloud-control 4.0.0-beta.407 → 4.0.0-beta.408

package/package.json

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

package/src/melcloud.js

@@ -291,7 +291,7 @@ class MelCloud extends EventEmitter {
 
             //const { codeVerifier, url } = await melCloudHomeToken.buildAuthorizeUrl();
             //const code = await melCloudHomeToken.loginToMelCloudHome(url);
-            const token = await melCloudHomeToken.getTokens(this.user, this.passwd);
+            const token = await melCloudHomeToken.login(this.user, this.passwd);
 
             const accountInfo = { ContextKey: token, UseFahrenheit: false };
             this.contextKey = code;

package/src/melcloudhometoken.js

@@ -19,7 +19,7 @@ class MelCloudHomeToken extends EventEmitter {
         this.http = wrapper(axios.create({ jar: this.cookieJar }));
     }
 
-    // --- Utility: generate PKCE pair ---
+    // --- PKCE ---
     _generatePkcePair() {
         const verifier = crypto.randomBytes(32).toString('base64url');
         const challenge = crypto
@@ -29,14 +29,19 @@ class MelCloudHomeToken extends EventEmitter {
         return { verifier, challenge };
     }
 
-    // --- Utility: extract CSRF token from HTML ---
-    _extractCsrf(html) {
+    // --- Extract Cognito hidden form fields ---
+    _extractLoginForm(html) {
         if (typeof html !== 'string') return null;
-        const match = html.match(/name=['"]_csrf['"][^>]*value=['"]([^'"]+)['"]/i);
-        return match ? match[1] : null;
+
+        const state = html.match(/name=['"]state['"][^>]*value=['"]([^'"]+)['"]/i)?.[1];
+        const clientId = html.match(/name=['"]client_id['"][^>]*value=['"]([^'"]+)['"]/i)?.[1];
+        const redirectUri = html.match(/name=['"]redirect_uri['"][^>]*value=['"]([^'"]+)['"]/i)?.[1];
+
+        if (!state || !clientId || !redirectUri) return null;
+        return { state, clientId, redirectUri };
     }
 
-    // --- GET request with redirect + cookie management ---
+    // --- GET helper with manual redirect handling ---
     async _get(url, depth = 0) {
         const cookies = await this.cookieJar.getCookieString(url);
         const resp = await this.http.get(url, {
@@ -61,7 +66,7 @@ class MelCloudHomeToken extends EventEmitter {
             );
         }
 
-        // Follow redirect manually
+        // Handle redirect
         if (
             resp.status >= 300 &&
             resp.status < 400 &&
@@ -76,7 +81,7 @@ class MelCloudHomeToken extends EventEmitter {
         return resp;
     }
 
-    // --- POST request helper ---
+    // --- POST helper ---
     async _post(url, data, headers = {}) {
         const cookies = await this.cookieJar.getCookieString(url);
         const resp = await this.http.post(url, data, {
@@ -103,11 +108,10 @@ class MelCloudHomeToken extends EventEmitter {
         return resp;
     }
 
-    // --- Main login flow ---
-    async getTokens(email, password) {
+    // --- MAIN LOGIN FLOW ---
+    async login(email, password) {
         const { verifier, challenge } = this._generatePkcePair();
 
-        // Build authorize URL
         const authUrl =
             `${AUTH_BASE}/oauth2/authorize?` +
             new URLSearchParams({
@@ -119,7 +123,7 @@ class MelCloudHomeToken extends EventEmitter {
                 code_challenge_method: 'S256',
             });
 
-        console.log(`[OAuth] Opening login page...`);
+        console.log('[OAuth] Opening login page...');
         let resp = await this._get(authUrl);
         if (resp.status >= 300 && resp.status < 400) {
             const redirectUrl = new URL(resp.headers.location, AUTH_BASE).href;
@@ -127,47 +131,48 @@ class MelCloudHomeToken extends EventEmitter {
             resp = await this._get(redirectUrl);
         }
 
-        // --- Extract CSRF token ---
-        const csrf = this._extractCsrf(resp.data);
-        if (!csrf) {
-            console.error('[OAuth] ❌ Cannot find CSRF token!');
-            console.log(resp.data.substring(0, 400));
-            throw new Error('Cannot find CSRF token');
+        // Extract login form fields
+        const form = this._extractLoginForm(resp.data);
+        if (!form) {
+            console.error('[OAuth] ❌ Cannot find Cognito login form fields!');
+            console.log(resp.data.substring(0, 500));
+            throw new Error('Cannot find login form');
         }
 
-        console.log(`[OAuth] Found CSRF token: ${csrf}`);
+        console.log(`[OAuth] Found form state: ${form.state.substring(0, 12)}...`);
 
-        // --- Submit login form ---
         const loginUrl = resp.request.res.responseUrl || `${AUTH_BASE}/login`;
         const formData = new URLSearchParams({
-            _csrf: csrf,
+            state: form.state,
+            client_id: form.clientId,
+            redirect_uri: form.redirectUri,
             username: email,
             password: password,
         });
 
-        console.log(`[OAuth] Submitting login form...`);
+        console.log('[OAuth] Submitting Cognito login...');
         const loginResp = await this._post(loginUrl, formData.toString());
 
+        // Cognito redirects with ?code=
         if (loginResp.status >= 300 && loginResp.status < 400) {
             const redirectUrl = new URL(loginResp.headers.location, AUTH_BASE).href;
             console.log(`[OAuth] Login redirect → ${redirectUrl}`);
 
-            // Extract code from redirect URL
             const codeMatch = redirectUrl.match(/[?&]code=([^&]+)/);
             if (!codeMatch) throw new Error('No code found after login redirect');
+
             const code = codeMatch[1];
             console.log(`[OAuth] ✅ Got authorization code: ${code}`);
 
-            // Exchange code for token
             return this.exchangeToken(code, verifier);
         }
 
-        console.error('[OAuth] ❌ Unexpected status on login:', loginResp.status);
+        console.error('[OAuth] ❌ Unexpected login status:', loginResp.status);
         console.log(loginResp.data.substring(0, 400));
-        throw new Error('Unexpected status on login page');
+        throw new Error('Unexpected login response');
     }
 
-    // --- Exchange code for access token ---
+    // --- Exchange code for token ---
     async exchangeToken(code, verifier) {
         console.log('[OAuth] Exchanging code for token...');
 
@@ -192,12 +197,14 @@ class MelCloudHomeToken extends EventEmitter {
             throw new Error('Token exchange failed');
         }
 
-        console.log('[OAuth] ✅ Token response received');
+        console.log('[OAuth] ✅ Token received successfully');
         return resp.data;
     }
 }
 
 
+
+
 export default MelCloudHomeToken;