iobroker.bmw 2.5.3 → 2.5.4

package/io-package.json

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

package/main.js

@@ -26,6 +26,9 @@ class Bmw extends utils.Adapter {
         this.on("ready", this.onReady.bind(this));
         this.on("stateChange", this.onStateChange.bind(this));
         this.on("unload", this.onUnload.bind(this));
+        this.userAgent = "My%20BMW/8932 CFNetwork/978.0.7 Darwin/18.7.0";
+        this.userAgentDart = "Dart/2.14 (dart:io)";
+        this.xuserAgent = "android(SP1A.210812.016.C1);brand;2.5.2(14945);row";
     }
 
     /**
@@ -171,7 +174,7 @@ class Bmw extends utils.Adapter {
             withCredentials: true,
             headers: {
                 "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
-                "User-Agent": "My%20BMW/8932 CFNetwork/978.0.7 Darwin/18.7.0",
+                "User-Agent": this.userAgent,
                 Accept: "*/*",
                 "Accept-Language": "de-de",
                 Authorization: "Basic MzFjMzU3YTAtN2ExZC00NTkwLWFhOTktMzNiOTcyNDRkMDQ4OmMwZTMzOTNkLTcwYTItNGY2Zi05ZDNjLTg1MzBhZjY0ZDU1Mg==",
@@ -254,8 +257,8 @@ class Bmw extends utils.Adapter {
         const brands = ["bmw", "mini"];
         for (const brand of brands) {
             const headers = {
-                "user-agent": "Dart/2.10 (dart:io)",
-                "x-user-agent": "android(v1.07_20200330);" + brand + ";1.5.2(8932)",
+                "user-agent": this.userAgentDart,
+                "x-user-agent": this.xuserAgent.replace(";brand;", `;${brand};`),
                 authorization: "Bearer " + this.session.access_token,
                 "accept-language": "de-DE",
                 host: "cocoapi.bmwgroup.com",
@@ -324,6 +327,7 @@ class Bmw extends utils.Adapter {
                 .catch((error) => {
                     this.log.error("getvehicles v2 failed");
                     this.log.error(error);
+                    error.response && this.log.error(JSON.stringify(error.response.data));
                 });
         }
     }
@@ -332,8 +336,8 @@ class Bmw extends utils.Adapter {
             return;
         }
         const headers = {
-            "user-agent": "Dart/2.10 (dart:io)",
-            "x-user-agent": "android(v1.07_20200330);bmw;1.5.2(8932)",
+            "user-agent": this.userAgentDart,
+            "x-user-agent": this.xuserAgent.replace(";brand;", `;bmw;`),
             authorization: "Bearer " + this.session.access_token,
             "accept-language": "de-DE",
             "24-hour-format": "true",
@@ -501,8 +505,8 @@ class Bmw extends utils.Adapter {
                 command = command.split("_")[0];
 
                 const headers = {
-                    "user-agent": "Dart/2.10 (dart:io)",
-                    "x-user-agent": "android(v1.07_20200330);bmw;1.5.2(8932)",
+                    "user-agent": this.userAgentDart,
+                    "x-user-agent": this.xuserAgent.replace(";brand;", `;bmw;`),
                     authorization: "Bearer " + this.session.access_token,
                     "accept-language": "de-DE",
                     host: "cocoapi.bmwgroup.com",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.bmw",
-    "version": "2.5.3",
+    "version": "2.5.4",
     "description": "Adapter for BMW",
     "author": {
         "name": "TA2k",
@@ -24,9 +24,7 @@
         "tough-cookie": "^4.0.0"
     },
     "devDependencies": {
-        "@alcalzone/release-script": "^2.2.2",
-        "@iobroker/adapter-dev": "^1.0.0",
-        "@iobroker/testing": "^2.5.4",
+        "@iobroker/testing": "^2.5.6",
         "@types/chai": "^4.3.0",
         "@types/chai-as-promised": "^7.1.5",
         "@types/mocha": "^9.1.0",
@@ -36,12 +34,12 @@
         "@types/sinon-chai": "^3.2.8",
         "chai": "^4.3.6",
         "chai-as-promised": "^7.1.1",
-        "eslint": "^8.10.0",
-        "mocha": "^9.2.1",
+        "eslint": "^8.13.0",
+        "mocha": "^9.2.2",
         "proxyquire": "^2.1.3",
         "sinon": "^13.0.1",
         "sinon-chai": "^3.7.0",
-        "typescript": "~4.5.5"
+        "typescript": "^4.6.3"
     },
     "main": "main.js",
     "scripts": {
@@ -57,4 +55,4 @@
         "url": "https://github.com/TA2k/ioBroker.bmw/issues"
     },
     "readmeFilename": "README.md"
-}
+}