homebridge-melcloud-control 4.9.0-beta.6 → 4.9.0-beta.8

package/package.json

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

package/src/melcloudhome.js

@@ -408,30 +408,27 @@ class MelCloudHome extends EventEmitter {
             if (this.logDebug) this.emit('debug', 'Step 4: Follow Cognito → IdentityServer redirect');
 
             const cognitoRedirectLocation = credResp.headers?.location ?? '';
-
-            if (!cognitoRedirectLocation) {
-                throw new Error('No Location header in Cognito response');
-            }
+            if (!cognitoRedirectLocation) throw new Error('No Location header in Cognito response');
 
             if (this.logDebug) this.emit('debug', `Step 4 location: ${cognitoRedirectLocation}`);
 
-            // 🔥 NOWA LOGIKA
-            if (cognitoRedirectLocation.includes('/signin-oidc-meu')) {
-                if (this.logDebug) this.emit('debug', 'Detected direct code in signin-oidc-meu');
-
-                const codeMatch = /code=([^&]+)/.exec(cognitoRedirectLocation);
-                if (!codeMatch) throw new Error('No code in signin-oidc-meu redirect');
+            const signinUrl = cognitoRedirectLocation.startsWith('http')
+                ? cognitoRedirectLocation
+                : `https://${cognitoHostname}${cognitoRedirectLocation}`;
 
-                const authCode = codeMatch[1];
-
-                if (this.logDebug) this.emit('debug', `Got auth code directly: ${authCode.slice(0, 20)}...`);
+            // GET na signin-oidc-meu — IdentityServer przetworzy i przekieruje do melcloudhome://
+            const signinResp = await this.pace(() =>
+                client.post(signinUrl, {
+                    headers: { 'User-Agent': ApiUrls.Home.UserAgent },
+                    maxRedirects: 0, // przechwytujemy redirect do melcloudhome://
+                })
+            );
 
-                const exchangeRes = await this.exchangeCodeForTokens(client, authCode, codeVerifier);
-                return this._buildConnectInfo(connectInfo, exchangeRes);
+            if (this.logDebug) {
+                this.emit('debug', `Step 4 signin status: ${signinResp.status}`);
+                this.emit('debug', `Step 4 signin location: ${signinResp.headers?.location ?? '(none)'}`);
             }
 
-
-
             // ── Step 5: Wyciągnij auth code z redirectu melcloudhome:// ───────────
             if (this.logDebug) this.emit('debug', 'Step 5: Extract auth code from redirect');
 
@@ -461,7 +458,7 @@ class MelCloudHome extends EventEmitter {
 
             if (this.logDebug) this.emit('debug', `Got auth code: ${authCode.slice(0, 20)}...`);
 
-            // ── Step 6: Wymień kod na tokeny (WAŻNE: await!) ──────────────────
+            // ── Step 6: Wymień kod na tokeny ──────────────────
             const exchangeRes = await this.exchangeCodeForTokens(client, authCode, codeVerifier);
             return this._buildConnectInfo(connectInfo, exchangeRes);