n8n-nodes-jygse-vw-weconnect 0.2.9 → 0.2.11

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

@@ -175,11 +175,11 @@ class VwWeConnect {
     }
 }
 exports.VwWeConnect = VwWeConnect;
-// VW OAuth2 Configuration (Updated January 2026 - "id" type for We Connect App from ioBroker.vw-connect)
-// Note: This is for We Connect App (ID.3, ID.4, T6.1 with We Connect 3.x)
-const VW_CLIENT_ID = 'a24fba63-34b3-4d43-b181-942111e6bda8@apps_vw-dilab_com';
+// VW OAuth2 Configuration (Updated January 2026 - "go" type for We Connect App from ioBroker.vw-connect)
+// Note: This is for We Connect / We Connect Go (T6.1 California, etc.)
+const VW_CLIENT_ID = 'ac42b0fa-3b11-48a0-a941-43a399e7ef84@apps_vw-dilab_com';
 const VW_SCOPE = 'openid profile mbb email cars birthdate badge address vin';
-const VW_REDIRECT_URI = 'weconnect://authenticated';
+const VW_REDIRECT_URI = 'vwconnect://de.volkswagen.vwconnect/oauth2redirect/identitykit';
 const VW_RESPONSE_TYPE = 'id_token token code';
 // WeConnect App headers (from ioBroker.vw-connect v0.7.15)
 const VW_USER_AGENT = 'Mozilla/5.0 (Linux; Android 14; SM-G960F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36';
@@ -225,8 +225,9 @@ async function vwLogin(context, email, password) {
             'x-requested-with': VW_APP_PACKAGE,
             'upgrade-insecure-requests': '1',
         };
+        // Generate PKCE code challenge
+        const codeChallenge = generateCodeChallenge(codeVerifier);
         // Step 1: Go directly to identity.vwgroup.io (like ioBroker adapter)
-        // Note: VW ID type does NOT use PKCE (code_challenge)
         // Build URL manually like ioBroker does (pre-encoded values)
         const authorizeUrl = 'https://identity.vwgroup.io/oidc/v1/authorize' +
             '?client_id=' + encodeURIComponent(VW_CLIENT_ID) +
@@ -234,9 +235,11 @@ async function vwLogin(context, email, password) {
             '&response_type=' + encodeURIComponent(VW_RESPONSE_TYPE) +
             '&redirect_uri=' + encodeURIComponent(VW_REDIRECT_URI) +
             '&nonce=' + nonce +
-            '&state=' + state;
+            '&state=' + state +
+            '&code_challenge=' + codeChallenge +
+            '&code_challenge_method=S256';
         // Use browser-like headers for initial request
-        // Let n8n follow redirects automatically to reach the login page
+        // Skip auto redirects so we can handle vwconnect:// redirect manually
         const authorizeResponse = await context.helpers.httpRequest({
             method: 'GET',
             url: authorizeUrl,
@@ -244,7 +247,7 @@ async function vwLogin(context, email, password) {
             encoding: 'text',
             returnFullResponse: true,
             ignoreHttpStatusErrors: true,
-            // Don't skip redirects - let it follow to the login page
+            skipAutoFollowRedirects: true,
         });
         // Extract response body and check for redirect
         let htmlContent;
@@ -571,13 +574,15 @@ async function vwLogin(context, email, password) {
             extractTokens(redirectUrl);
         }
         while (maxRedirects > 0 && redirectUrl && !authCode) {
-            // Check if this is the final redirect to carnet:// scheme
-            if (redirectUrl.startsWith('carnet://') || redirectUrl.startsWith('weconnect://')) {
+            // Check if this is the final redirect to app scheme (carnet://, weconnect://, vwconnect://)
+            if (redirectUrl.startsWith('carnet://') || redirectUrl.startsWith('weconnect://') || redirectUrl.startsWith('vwconnect://')) {
                 extractTokens(redirectUrl);
                 break;
             }
-            // Skip non-http redirects
+            // Skip non-http redirects (other app schemes)
             if (!redirectUrl.startsWith('http') && !redirectUrl.startsWith('/')) {
+                // Try to extract tokens from unknown scheme redirect
+                extractTokens(redirectUrl);
                 break;
             }
             const followResponse = await context.helpers.httpRequest({

package/package.json

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