homebridge-melcloud-control 4.0.0-beta.290 → 4.0.0-beta.291

package/package.json

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

package/src/melcloudhometoken.js

@@ -96,44 +96,62 @@ class MelCloudHomeToken {
      */
     async loginWithCredentials(email, password) {
         const authorizeUrl = await this.buildAuthorizeUrl();
-        this.log.debug('Fetching login page...');
+        console.log('Fetching login page...');
         const res = await this.client.get(authorizeUrl);
 
         const $ = cheerio.load(res.data);
         const form = $('form');
-        const action = form.attr('action') || '/Account/Login';
+        if (!form.length) throw new Error('Login form not found on page');
+
+        // ✅ dynamicznie pobieramy action z formularza
+        let action = form.attr('action');
+        if (!action) throw new Error('Form action not found');
+        if (!action.startsWith('http')) {
+            action = new URL(action, 'https://auth.melcloudhome.com').toString();
+        }
+
         const requestVerificationToken = $('input[name="__RequestVerificationToken"]').val();
         const returnUrl = $('input[name="ReturnUrl"]').val() || '';
 
-        this.log.debug('Submitting credentials...');
-        const loginRes = await this.client.post(
-            new URL(action, LOGIN_ENDPOINT).toString(),
-            new URLSearchParams({
-                Username: email,
-                Password: password,
-                __RequestVerificationToken: requestVerificationToken,
-                ReturnUrl: returnUrl,
-            }),
-            {
-                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-                maxRedirects: 0,
-                validateStatus: status => status < 400 || status === 302 || status === 500,
-            }
-        );
+        const body = new URLSearchParams({
+            Username: email,
+            Password: password,
+        });
+
+        if (requestVerificationToken) {
+            body.set('__RequestVerificationToken', requestVerificationToken);
+        }
+        if (returnUrl) {
+            body.set('ReturnUrl', returnUrl);
+        }
+
+        console.log(`Submitting credentials to: ${action}`);
+
+        const loginRes = await this.client.post(action, body, {
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+            maxRedirects: 0,
+            validateStatus: status => status < 400 || status === 302 || status === 500,
+        });
 
         let html = loginRes.data;
-        if (typeof html !== 'string' && loginRes.headers.location) {
-            const redirect = await this.client.get(loginRes.headers.location);
-            html = redirect.data;
+
+        if (loginRes.headers.location) {
+            console.log(`Redirecting to: ${loginRes.headers.location}`);
+            const redirectRes = await this.client.get(loginRes.headers.location);
+            html = redirectRes.data;
         }
 
         const code = await this.extractCodeFromHtml(html);
-        if (!code) throw new Error('Authorization code not found in HTML');
+        if (!code) {
+            console.log('Authorization code not found in HTML');
+            throw new Error('Authorization code not found in HTML');
+        }
 
-        this.log.debug(`Found authorization code: ${code}`);
+        console.log(`Found authorization code: ${code}`);
 
         return await this.exchangeCodeForTokens(code);
     }
+
 }
 
 export default MelCloudHomeToken;