homebridge-melcloud-control 4.0.0-beta.370 → 4.0.0-beta.372

package/package.json

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

package/src/melcloudhometoken.js

@@ -1,7 +1,5 @@
 import axios from 'axios';
 import crypto from 'crypto';
-import { wrapper } from 'axios-cookiejar-support';
-import { CookieJar } from 'tough-cookie';
 import { JSDOM } from 'jsdom';
 import EventEmitter from 'events';
 
@@ -19,9 +17,7 @@ class MelCloudHomeToken extends EventEmitter {
         this.passwd = config.passwd;
         this.logWarn = config.logWarn;
         this.logError = config.logError;
-
-        const jar = new CookieJar();
-        this.axiosInstance = wrapper(axios.create({ jar, withCredentials: true }));
+        this.axiosInstance = axios.create({ headers: { 'User-Agent': MOBILE_USER_AGENT } });
     }
 
     generatePKCE() {
@@ -96,7 +92,7 @@ class MelCloudHomeToken extends EventEmitter {
                 code_verifier: codeVerifier,
             });
 
-            const tokenResponse = await this.axiosInstance({
+            const tokenResponse = await this.axiosInstance(tokenData.toString(), {
                 method: 'POST',
                 baseURL: TOKEN_ENDPOINT,
                 headers: {
@@ -104,7 +100,6 @@ class MelCloudHomeToken extends EventEmitter {
                     'Content-Length': tokenData.toString().length,
                     'Authorization': 'Basic aG9tZW1vYmlsZTo=',
                 },
-                data: tokenData.toString()
             });
 
             const tokens = tokenResponse.data;
@@ -122,7 +117,6 @@ class MelCloudHomeToken extends EventEmitter {
                 method: 'GET',
                 baseURL: url,
                 headers: {
-                    'User-Agent': MOBILE_USER_AGENT,
                     'Accept': 'text/html',
                 },
                 withCredentials: true,
@@ -146,11 +140,10 @@ class MelCloudHomeToken extends EventEmitter {
             if (this.logWarn) this.emit('warn', `Redirect URL: ${url}`);
 
             // Step 3: Wyślij POST z danymi logowania
-            const response = await this.axiosInstance({
+            const response = await this.axiosInstance(formData.toString(), {
                 method: 'POST',
                 baseURL: url,
                 headers: {
-                    'User-Agent': MOBILE_USER_AGENT,
                     'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
                     'Accept-Language': 'en-US,en;q=0.9',
                     'Content-Type': 'application/x-www-form-urlencoded',
@@ -159,7 +152,6 @@ class MelCloudHomeToken extends EventEmitter {
                     'Origin': 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
                     'Referer': url,
                 },
-                data: formData.toString(),
                 maxRedirects: 0,
                 validateStatus: status => [200, 302, 400].includes(status),
             });