homebridge-melcloud-control 4.0.0-beta.305 → 4.0.0-beta.307

package/package.json

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

package/src/melcloud.js

@@ -290,10 +290,10 @@ class MelCloud extends EventEmitter {
             });
 
             const melCloudHomeToken = new MelCloudHomeToken();
-            const url = await melCloudHomeToken.buildAuthorizeUrl();
+            const data = await melCloudHomeToken.buildAuthorizeUrl();
 
             const page = await browser.newPage();
-            await page.goto(url, { waitUntil: 'networkidle2' });
+            await page.goto(data.url, { waitUntil: 'networkidle2' });
 
             await page.waitForSelector('input[name="username"]', { timeout: 5000 });
             await page.type('input[name="username"]', this.user, { delay: 50 });
@@ -305,7 +305,7 @@ class MelCloud extends EventEmitter {
             this.emit('warn', code);
 
             // 5. Wymień code na access_token
-            const tokenResponse = await melCloudHomeToken.getTokens(code);
+            const tokenResponse = await melCloudHomeToken.getTokens(code, data.codeVerifier);
             const tokenData = await tokenResponse.json();
             this.emit('debug', `Token: ${JSON.stringify(tokenData, null, 2)}`);
             const accountInfo = {

package/src/melcloudhometoken.js

@@ -15,13 +15,11 @@ class MelCloudHomeToken {
         const jar = new CookieJar();
         this.client = wrapper(axios.create({ jar, withCredentials: true }));
         this.client.defaults.headers['User-Agent'] = MOBILE_USER_AGENT;
-        this.verifier;
     }
 
     generatePKCE() {
         const verifier = crypto.randomBytes(32).toString('base64url');
         const challenge = crypto.createHash('sha256').update(verifier).digest('base64url');
-        this.verifier = verifier;
         return { verifier, challenge };
     }
 
@@ -77,14 +75,14 @@ class MelCloudHomeToken {
         }
     }
 
-    async getTokens(code) {
+    async getTokens(code, codeVerifier) {
         try {
             const data = new URLSearchParams({
                 grant_type: 'authorization_code',
                 code: code,
                 redirect_uri: REDIRECT_URI,
                 client_id: CLIENT_ID,
-                code_verifier: this.verifier,
+                code_verifier: codeVerifier,
             });
 
             const res = await axios({
@@ -92,7 +90,7 @@ class MelCloudHomeToken {
                 url: TOKEN_ENDPOINT,
                 headers: {
                     'Content-Type': 'application/x-www-form-urlencoded',
-                    'Content-Length': tokenData.toString().length,
+                    'Content-Length': data.toString().length,
                     'Authorization': 'Basic aG9tZW1vYmlsZTo='
                 },
                 data: data
@@ -124,7 +122,8 @@ class MelCloudHomeToken {
             authUrl.searchParams.set('state', state);
             const loginPage = await this.getLoginPage(authUrl.toString());
 
-            return loginPage.url;
+            const data = { codeVerifier: pkce.verifier, url: loginPage.url }
+            return data;
         } catch (error) {
             console.error('Failed to obtain OAuth link:', error);
             throw error;