From 9d5018a51d01ddc4a275a05834211931b5a553c8 Mon Sep 17 00:00:00 2001
From: Martijn Poppen <m.poppen@ziggo.nl>
Date: Thu, 12 Dec 2024 09:35:40 +0100
Subject: [PATCH] FIX: Accept consent when login in

The Consent was changed and it seems like the API only accepts a German consent. So that's what I changed and VW, AUDI, SEAT and CUPRA are working again.
---
 main.js | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/main.js b/main.js
index 83eb5b4..4fa88ef 100644
--- a/main.js
+++ b/main.js
@@ -683,22 +683,24 @@ class VwWeconnect extends utils.Adapter {
                               //check for empty form object
                               if (Object.keys(form).length === 0 && form.constructor === Object) {
                                 try {
-                                  const stringJson = body
-                                    .split("window._IDK = ")[1]
-                                    .split("</")[0]
-                                    .replace(/\n/g, "")
-                                    .replace(/:\/\//g, "")
-                                    .replace(/local:/g, "");
-                                  const json = stringJson
-                                    .replace(/(['"])?([a-z0-9A-Z_]+)(['"])?:/g, '"$2": ')
-                                    .replace(/'/g, '"')
-                                    .replace(/""/g, '"');
-                                  const parsedJson = JSON.parse(json);
-                                  form._csrf = parsedJson.csrf_token;
-                                  form.hmac = parsedJson.templateModel.hmac;
-                                  form.relayState = parsedJson.templateModel.relayState;
-                                  form.legalDocuments = parsedJson.templateModel.legalDocuments;
-                                } catch (error) {
+                                    const stringJson = body
+                                      .split("window._IDK = ")[1]
+                                      .split("</")[0]
+                                      
+                                    let json =  stringJson.replace(/([{,]\s*)(\w+)\s*:/g, '$1"$2":') // Add quotes around property names
+                                    json = json.replace(/'/g, '"')
+                                    json = json.replace(/,\s*}/g, '}') // Remove trailing commas
+    
+                                    const parsedJson = JSON.parse(json);
+
+                                    form._csrf = parsedJson.csrf_token;
+                                    form.hmac = parsedJson.templateModel.hmac;
+                                    form.relayState = parsedJson.templateModel.relayState;
+                                    form.legalDocuments = parsedJson.templateModel.legalDocuments;
+                                    form.countryOfResidence = 'DE';
+                                    form.countryOfJurisdiction = 'DE';
+                                    
+                                  } catch (error) {
                                   this.log.error(
                                     "Error in consent form. Please accept the Data Privacy Statement in the app after relogin",
                                   );
@@ -803,6 +805,7 @@ class VwWeconnect extends utils.Adapter {
                               );
                               this.log.info(getRequest.uri.href);
                               const form = this.extractHidden(body);
+                              
                               getRequest = request.post(
                                 {
                                   url: getRequest.uri.href,
@@ -6355,4 +6358,4 @@ if (module.parent) {
 } else {
   // otherwise start the instance directly
   new VwWeconnect();
-}
+}
\ No newline at end of file