iobroker.bmw 2.5.2 → 2.5.3

package/io-package.json

@@ -1,8 +1,11 @@
 {
     "common": {
         "name": "bmw",
-        "version": "2.5.2",
+        "version": "2.5.3",
         "news": {
+            "2.5.3": {
+                "en": "Fix login"
+            },
             "2.5.2": {
                 "en": "Bugfixes"
             },

package/main.js

@@ -9,10 +9,10 @@
 const utils = require("@iobroker/adapter-core");
 const axios = require("axios");
 
+const { HttpsCookieAgent } = require("http-cookie-agent");
 const crypto = require("crypto");
 const qs = require("qs");
 const { extractKeys } = require("./lib/extractKeys");
-const axiosCookieJarSupport = require("axios-cookiejar-support").default;
 const tough = require("tough-cookie");
 class Bmw extends utils.Adapter {
     /**
@@ -38,9 +38,15 @@ class Bmw extends utils.Adapter {
             this.log.info("Set interval to minimum 0.5");
             this.config.interval = 0.5;
         }
-        axiosCookieJarSupport(axios);
-        this.cookieJar = new tough.CookieJar();
-        this.requestClient = axios.create();
+        this.cookieJar = new tough.CookieJar(null, { ignoreError: true });
+
+        this.requestClient = axios.create({
+            jar: this.cookieJar,
+            withCredentials: true,
+            httpsAgent: new HttpsCookieAgent({
+                jar: this.cookieJar,
+            }),
+        });
         this.updateInterval = null;
         this.reLoginTimeout = null;
         this.refreshTokenTimeout = null;
@@ -136,6 +142,7 @@ class Bmw extends utils.Adapter {
             data: qs.stringify(data),
             jar: this.cookieJar,
             withCredentials: true,
+            maxRedirects: 0,
         })
             .then((res) => {
                 this.log.debug(JSON.stringify(res.data));
@@ -143,16 +150,18 @@ class Bmw extends utils.Adapter {
             })
             .catch((error) => {
                 let code = "";
-                if (error.response && error.response.status === 400) {
+                if (error.response && error.response.status >= 400) {
                     this.log.error(JSON.stringify(error.response.data));
                     return;
                 }
-                if (error.config) {
-                    this.log.debug(JSON.stringify(error.config.url));
-                    code = qs.parse(error.config.url.split("?")[1]).code;
+                if (error.response.status === 302) {
+                    this.log.debug(JSON.stringify(error.response.headers.location));
+                    code = qs.parse(error.response.headers.location.split("?")[1]).code;
                     this.log.debug(code);
                     return code;
                 }
+                this.log.error(error);
+                return;
             });
         await this.requestClient({
             method: "post",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.bmw",
-    "version": "2.5.2",
+    "version": "2.5.3",
     "description": "Adapter for BMW",
     "author": {
         "name": "TA2k",
@@ -17,17 +17,18 @@
     },
     "dependencies": {
         "@iobroker/adapter-core": "^2.6.0",
-        "axios": "^0.24.0",
-        "axios-cookiejar-support": "^1.0.1",
+        "axios": "^0.26.1",
+        "http-cookie-agent": "^1.0.5",
         "json-bigint": "^1.0.0",
         "qs": "^6.10.3",
         "tough-cookie": "^4.0.0"
     },
     "devDependencies": {
-        "@iobroker/testing": "^2.5.6",
+        "@alcalzone/release-script": "^2.2.2",
+        "@iobroker/adapter-dev": "^1.0.0",
+        "@iobroker/testing": "^2.5.4",
         "@types/chai": "^4.3.0",
         "@types/chai-as-promised": "^7.1.5",
-        "@types/gulp": "^4.0.9",
         "@types/mocha": "^9.1.0",
         "@types/node": "^14.18.12",
         "@types/proxyquire": "^1.3.28",
@@ -35,12 +36,12 @@
         "@types/sinon-chai": "^3.2.8",
         "chai": "^4.3.6",
         "chai-as-promised": "^7.1.1",
-        "eslint": "^7.32.0",
+        "eslint": "^8.10.0",
         "mocha": "^9.2.1",
         "proxyquire": "^2.1.3",
-        "sinon": "^12.0.1",
+        "sinon": "^13.0.1",
         "sinon-chai": "^3.7.0",
-        "typescript": "~4.4.4"
+        "typescript": "~4.5.5"
     },
     "main": "main.js",
     "scripts": {