n8n-nodes-jygse-vw-weconnect 0.1.10 → 0.1.11

package/dist/nodes/VwWeConnect/VwWeConnect.node.js

@@ -147,8 +147,10 @@ const VW_SCOPE = 'openid profile badge cars dealers vin';
 const VW_REDIRECT_URI = 'weconnect://authenticated';
 const VW_RESPONSE_TYPE = 'code id_token token';
 // WeConnect App User-Agent and headers (critical for authentication)
-const VW_USER_AGENT = 'Volkswagen/3.60.0-android/14';
+// Using exact version from WeConnect-python
+const VW_USER_AGENT = 'Volkswagen/3.51.1-android/14';
 const VW_APP_PACKAGE = 'com.volkswagen.weconnect';
+const VW_ACCEPT_LANGUAGE = 'de-de';
 function generateTraceId() {
     // Generate UUID v4 format
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
@@ -174,32 +176,28 @@ async function generateCodeChallenge(verifier) {
 }
 async function vwLogin(context, email, password) {
     try {
-        // Generate PKCE values
-        const codeVerifier = generateCodeVerifier();
-        const codeChallenge = await generateCodeChallenge(codeVerifier);
-        const stateParam = generateNonce();
-        // Step 1: Get authorization page via CARIAD BFF (WeConnect-python approach)
+        const traceId = generateTraceId();
+        const nonce = generateNonce();
+        // Common headers used for all requests (matching WeConnect-python exactly)
+        const commonHeaders = {
+            'User-Agent': VW_USER_AGENT,
+            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+            'Accept-Language': VW_ACCEPT_LANGUAGE,
+            'Cache-Control': 'no-cache',
+            'x-android-package-name': VW_APP_PACKAGE,
+            'weconnect-trace-id': traceId,
+        };
+        // Step 1: Get authorization page via CARIAD BFF
+        // WeConnect-python only sends redirect_uri and nonce to this endpoint
         const authorizeUrl = 'https://emea.bff.cariad.digital/user-login/v1/authorize';
         const authorizeParams = new URLSearchParams({
-            client_id: VW_CLIENT_ID,
-            scope: VW_SCOPE,
-            response_type: VW_RESPONSE_TYPE,
             redirect_uri: VW_REDIRECT_URI,
-            nonce: generateNonce(),
-            state: stateParam,
-            code_challenge: codeChallenge,
-            code_challenge_method: 'plain',
+            nonce: nonce,
         });
-        const traceId = generateTraceId();
         const authorizeResponse = await context.helpers.httpRequest({
             method: 'GET',
             url: `${authorizeUrl}?${authorizeParams.toString()}`,
-            headers: {
-                'User-Agent': VW_USER_AGENT,
-                'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-                'x-android-package-name': VW_APP_PACKAGE,
-                'weconnect-trace-id': traceId,
-            },
+            headers: commonHeaders,
             encoding: 'text',
             returnFullResponse: true,
             ignoreHttpStatusErrors: true,
@@ -252,10 +250,7 @@ async function vwLogin(context, email, password) {
             const followResponse = await context.helpers.httpRequest({
                 method: 'GET',
                 url: followUrl,
-                headers: {
-                    'User-Agent': VW_USER_AGENT,
-                    'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-                },
+                headers: commonHeaders,
                 encoding: 'text',
                 returnFullResponse: true,
                 ignoreHttpStatusErrors: true,
@@ -458,8 +453,7 @@ async function vwLogin(context, email, password) {
                 method: 'POST',
                 url: `https://identity.vwgroup.io/u/login?state=${encodeURIComponent(stateToken)}`,
                 headers: {
-                    'User-Agent': VW_USER_AGENT,
-                    'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+                    ...commonHeaders,
                     'Content-Type': 'application/x-www-form-urlencoded',
                     'Origin': 'https://identity.vwgroup.io',
                     'Referer': `https://identity.vwgroup.io/u/login?state=${encodeURIComponent(stateToken)}`,
@@ -537,9 +531,7 @@ async function vwLogin(context, email, password) {
             const followResponse = await context.helpers.httpRequest({
                 method: 'GET',
                 url: redirectUrl.startsWith('http') ? redirectUrl : `https://identity.vwgroup.io${redirectUrl}`,
-                headers: {
-                    'User-Agent': VW_USER_AGENT,
-                },
+                headers: commonHeaders,
                 encoding: 'text',
                 returnFullResponse: true,
                 ignoreHttpStatusErrors: true,
@@ -572,10 +564,10 @@ async function vwLogin(context, email, password) {
             maxRedirects--;
         }
         if (!authCode) {
-            throw new Error(`Could not obtain authorization code. Last redirect: ${redirectUrl || 'none'}. Please check your credentials.`);
+            throw new Error(`Could not obtain authorization code. Last redirect: ${redirectUrl || 'none'}. Auth HTML preview: ${authHtml.substring(0, 500)}`);
         }
-        // Step 4: Exchange auth code for tokens
-        // Try the new CARIAD login endpoint first
+        // Step 4: Exchange auth code for tokens via CARIAD login endpoint
+        // The state parameter should come from the authorize response, not our generated one
         let tokenResponse;
         try {
             const cariadResponse = await context.helpers.httpRequest({
@@ -584,16 +576,18 @@ async function vwLogin(context, email, password) {
                 headers: {
                     'User-Agent': VW_USER_AGENT,
                     'Accept': 'application/json',
+                    'Accept-Language': VW_ACCEPT_LANGUAGE,
                     'Content-Type': 'application/json',
+                    'x-android-package-name': VW_APP_PACKAGE,
+                    'weconnect-trace-id': traceId,
                 },
                 body: {
-                    state: authorizeParams.get('state'),
+                    state: stateToken,
                     id_token: idToken,
                     redirect_uri: VW_REDIRECT_URI,
                     region: 'emea',
                     access_token: accessToken,
                     authorizationCode: authCode,
-                    code_verifier: codeVerifier,
                 },
             });
             tokenResponse = cariadResponse;
@@ -606,6 +600,7 @@ async function vwLogin(context, email, password) {
                 headers: {
                     'User-Agent': VW_USER_AGENT,
                     'Accept': 'application/json',
+                    'Accept-Language': VW_ACCEPT_LANGUAGE,
                     'Content-Type': 'application/json',
                     'X-Client-Id': VW_CLIENT_ID,
                 },
@@ -613,7 +608,6 @@ async function vwLogin(context, email, password) {
                     auth_code: authCode,
                     id_token: idToken || '',
                     brand: 'vw',
-                    code_verifier: codeVerifier,
                 },
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-jygse-vw-weconnect",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "n8n community node for VW We Connect - Control your Volkswagen T6.1 and other VW vehicles",
   "keywords": [
     "n8n-community-node-package",