iobroker.bmw 2.4.1 → 2.5.2

package/README.md

@@ -27,6 +27,10 @@ bmw.0.VIN.remotev2
 
 ## Changelog
 
+### 2.5.0
+
+-   Fix login
+  
 ### 2.4.1
 
 -   Add support for MINI and force refresh remote

package/io-package.json

@@ -1,8 +1,19 @@
 {
     "common": {
         "name": "bmw",
-        "version": "2.4.1",
+        "version": "2.5.2",
         "news": {
+            "2.5.2": {
+                "en": "Bugfixes"
+            },
+            "2.5.1": {
+                "en": "Add login error message",
+                "de": "Loginproblem Nachricht hinzugefügt"
+            },
+            "2.5.0": {
+                "en": "Fix Login",
+                "de": "Loginproblem behoben"
+            },
             "2.4.1": {
                 "en": "Add support for MINI and a force refresh remote",
                 "de": "Support für MINI hinzugefügt und ein Update erzwingen remote"

package/lib/extractKeys.js

@@ -324,7 +324,7 @@ const description = {
     cbsType: "Service Art",
     VEHICLE_CHECK: "Fahrzeug Überprüfung",
     position: "Position",
-    heading: "Überschrift",
+    heading: "Richtung",
     lat: "Latitude",
     lon: "Longitude",
     DCS_CCH_Activation: "DCS CCH Aktivierung",

package/main.js

@@ -8,6 +8,8 @@
 // you need to create an adapter
 const utils = require("@iobroker/adapter-core");
 const axios = require("axios");
+
+const crypto = require("crypto");
 const qs = require("qs");
 const { extractKeys } = require("./lib/extractKeys");
 const axiosCookieJarSupport = require("axios-cookiejar-support").default;
@@ -48,10 +50,13 @@ class Bmw extends utils.Adapter {
         this.statusBlock = {};
         this.nonChargingHistory = {};
         this.subscribeStates("*");
-
+        if (!this.config.username || !this.config.password) {
+            this.log.error("Please set username and password");
+            return;
+        }
         await this.login();
         if (this.session.access_token) {
-            await this.getVehicles();
+            // await this.getVehicles(); //old depracted api
             await this.cleanObjects();
             await this.getVehiclesv2();
             this.updateInterval = setInterval(async () => {
@@ -69,17 +74,21 @@ class Bmw extends utils.Adapter {
             "Accept-Language": "de-de",
             "Content-Type": "application/x-www-form-urlencoded",
         };
+        const [code_verifier, codeChallenge] = this.getCodeChallenge();
         const data = {
             client_id: "31c357a0-7a1d-4590-aa99-33b97244d048",
             response_type: "code",
             scope: "openid profile email offline_access smacc vehicle_data perseus dlm svds cesim vsapi remote_services fupo authenticate_user",
             redirect_uri: "com.bmw.connected://oauth",
-            state: "cEG9eLAIi6Nv-aaCAniziE_B6FPoobva3qr5gukilYw",
+            state: "cwU-gIE27j67poy2UcL3KQ",
             nonce: "login_nonce",
+            code_challenge_method: "S256",
+            code_challenge: codeChallenge,
             username: this.config.username,
             password: this.config.password,
             grant_type: "authorization_code",
         };
+
         const authUrl = await this.requestClient({
             method: "post",
             url: "https://customer.bmwgroup.com/gcdm/oauth/authenticate",
@@ -93,12 +102,19 @@ class Bmw extends utils.Adapter {
                 return res.data;
             })
             .catch((error) => {
+                this.log.error("Login failed");
                 this.log.error(error);
                 if (error.response) {
                     this.log.error(JSON.stringify(error.response.data));
                 }
                 if (error.response && error.response.status === 401) {
-                    this.log.error("Please check username and password");
+                    this.log.error("Please check username and password or too many logins in 5 minutes");
+
+                    this.log.error("Start relogin in 5min");
+                    this.reLoginTimeout && clearTimeout(this.reLoginTimeout);
+                    this.reLoginTimeout = setTimeout(() => {
+                        this.login();
+                    }, 5000 * 60 * 1);
                 }
                 if (error.response && error.response.status === 400) {
                     this.log.error("Please check username and password");
@@ -151,7 +167,7 @@ class Bmw extends utils.Adapter {
                 "Accept-Language": "de-de",
                 Authorization: "Basic MzFjMzU3YTAtN2ExZC00NTkwLWFhOTktMzNiOTcyNDRkMDQ4OmMwZTMzOTNkLTcwYTItNGY2Zi05ZDNjLTg1MzBhZjY0ZDU1Mg==",
             },
-            data: "code=" + code + "&code_verifier=7PsmfPS5MpaNt0jEcPpi-B7M7u0gs1Nzw6ex0Y9pa-0&redirect_uri=com.bmw.connected://oauth&grant_type=authorization_code",
+            data: "code=" + code + "&redirect_uri=com.bmw.connected://oauth&grant_type=authorization_code&code_verifier=" + code_verifier,
         })
             .then((res) => {
                 this.log.debug(JSON.stringify(res.data));
@@ -160,12 +176,24 @@ class Bmw extends utils.Adapter {
                 return res.data;
             })
             .catch((error) => {
+                this.log.error("Login step 3 failed");
                 this.log.error(error);
                 if (error.response) {
                     this.log.error(JSON.stringify(error.response.data));
                 }
             });
     }
+    getCodeChallenge() {
+        let hash = "";
+        let result = "";
+        const chars = "0123456789abcdef";
+        result = "";
+        for (let i = 64; i > 0; --i) result += chars[Math.floor(Math.random() * chars.length)];
+        hash = crypto.createHash("sha256").update(result).digest("base64");
+        hash = hash.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+
+        return [result, hash];
+    }
     async getVehicles() {
         const headers = {
             "Content-Type": "application/json",
@@ -208,6 +236,7 @@ class Bmw extends utils.Adapter {
                 }
             })
             .catch((error) => {
+                this.log.error("getVehicles failed");
                 this.log.error(error);
                 error.response && this.log.error(JSON.stringify(error.response.data));
             });
@@ -284,6 +313,7 @@ class Bmw extends utils.Adapter {
                     }
                 })
                 .catch((error) => {
+                    this.log.error("getvehicles v2 failed");
                     this.log.error(error);
                 });
         }
@@ -344,6 +374,7 @@ class Bmw extends utils.Adapter {
                         this.nonChargingHistory[vin] = true;
                         return;
                     }
+                    this.log.error("updateChargingSessionv2 failed");
                     this.log.error(element.url);
                     this.log.error(error);
                     error.response && this.log.error(JSON.stringify(error.response.data));
@@ -412,6 +443,7 @@ class Bmw extends utils.Adapter {
                 this.log.error(error);
                 error.response && this.log.error(JSON.stringify(error.response.data));
                 this.log.error("Start relogin in 1min");
+                this.reLoginTimeout && clearTimeout(this.reLoginTimeout);
                 this.reLoginTimeout = setTimeout(() => {
                     this.login();
                 }, 1000 * 60 * 1);
@@ -483,6 +515,7 @@ class Bmw extends utils.Adapter {
                         return res.data;
                     })
                     .catch((error) => {
+                        this.log.error("Remote command failed");
                         this.log.error(error);
                         if (error.response) {
                             this.log.error(JSON.stringify(error.response.data));

package/package.json

@@ -1,60 +1,59 @@
 {
-  "name": "iobroker.bmw",
-  "version": "2.4.1",
-  "description": "Adapter for BMW",
-  "author": {
-    "name": "TA2k",
-    "email": "tombox2020@gmail.com"
-  },
-  "homepage": "https://github.com/TA2k/ioBroker.bmw",
-  "license": "MIT",
-  "keywords": [
-    "BMW"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/TA2k/ioBroker.bmw"
-  },
-  "dependencies": {
-    "@iobroker/adapter-core": "^2.5.1",
-    "axios": "^0.24.0",
-    "json-bigint": "^1.0.0",
-    "qs": "^6.10.1",
-    "axios-cookiejar-support": "^1.0.1",
-    "tough-cookie": "^4.0.0"
-  },
-  "devDependencies": {
-    "@iobroker/testing": "^2.5.2",
-    "@types/chai": "^4.2.22",
-    "@types/chai-as-promised": "^7.1.4",
-    "@types/gulp": "^4.0.9",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^14.17.32",
-    "@types/proxyquire": "^1.3.28",
-    "@types/sinon": "^10.0.6",
-    "@types/sinon-chai": "^3.2.5",
-    "chai": "^4.3.4",
-    "chai-as-promised": "^7.1.1",
-    "eslint": "^8.1.0",
-    "gulp": "^4.0.2",
-    "mocha": "^9.1.3",
-    "proxyquire": "^2.1.3",
-    "sinon": "^12.0.0",
-    "sinon-chai": "^3.7.0",
-    "typescript": "~4.4.4"
-  },
-  "main": "main.js",
-  "scripts": {
-    "test:js": "mocha --config test/mocharc.custom.json \"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\"",
-    "test:package": "mocha test/package --exit",
-    "test:unit": "mocha test/unit --exit",
-    "test:integration": "mocha test/integration --exit",
-    "test": "npm run test:js && npm run test:package",
-    "check": "tsc --noEmit -p tsconfig.check.json",
-    "lint": "eslint"
-  },
-  "bugs": {
-    "url": "https://github.com/TA2k/ioBroker.bmw/issues"
-  },
-  "readmeFilename": "README.md"
-}
+    "name": "iobroker.bmw",
+    "version": "2.5.2",
+    "description": "Adapter for BMW",
+    "author": {
+        "name": "TA2k",
+        "email": "tombox2020@gmail.com"
+    },
+    "homepage": "https://github.com/TA2k/ioBroker.bmw",
+    "license": "MIT",
+    "keywords": [
+        "BMW"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/TA2k/ioBroker.bmw"
+    },
+    "dependencies": {
+        "@iobroker/adapter-core": "^2.6.0",
+        "axios": "^0.24.0",
+        "axios-cookiejar-support": "^1.0.1",
+        "json-bigint": "^1.0.0",
+        "qs": "^6.10.3",
+        "tough-cookie": "^4.0.0"
+    },
+    "devDependencies": {
+        "@iobroker/testing": "^2.5.6",
+        "@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",
+        "@types/sinon": "^10.0.11",
+        "@types/sinon-chai": "^3.2.8",
+        "chai": "^4.3.6",
+        "chai-as-promised": "^7.1.1",
+        "eslint": "^7.32.0",
+        "mocha": "^9.2.1",
+        "proxyquire": "^2.1.3",
+        "sinon": "^12.0.1",
+        "sinon-chai": "^3.7.0",
+        "typescript": "~4.4.4"
+    },
+    "main": "main.js",
+    "scripts": {
+        "test:js": "mocha --config test/mocharc.custom.json \"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\"",
+        "test:package": "mocha test/package --exit",
+        "test:unit": "mocha test/unit --exit",
+        "test:integration": "mocha test/integration --exit",
+        "test": "npm run test:js && npm run test:package",
+        "check": "tsc --noEmit -p tsconfig.check.json",
+        "lint": "eslint"
+    },
+    "bugs": {
+        "url": "https://github.com/TA2k/ioBroker.bmw/issues"
+    },
+    "readmeFilename": "README.md"
+}