n8n-nodes-jygse-vw-weconnect 0.1.7 → 0.1.8

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

@@ -397,6 +397,7 @@ async function vwLogin(context, email, password) {
                 encoding: 'text',
                 returnFullResponse: true,
                 ignoreHttpStatusErrors: true,
+                skipAutoFollowRedirects: true,
             });
             if (typeof authResponse === 'string') {
                 authHtml = authResponse;
@@ -458,6 +459,7 @@ async function vwLogin(context, email, password) {
                 encoding: 'text',
                 returnFullResponse: true,
                 ignoreHttpStatusErrors: true,
+                skipAutoFollowRedirects: true,
             });
             if (typeof loginResponse === 'string') {
                 authHtml = loginResponse;
@@ -486,28 +488,36 @@ async function vwLogin(context, email, password) {
         let idToken = '';
         let accessToken = '';
         let maxRedirects = 10;
-        while (maxRedirects > 0 && redirectUrl && !authCode) {
-            // Extract tokens from URL fragment or query params
-            // The response_type 'code id_token token' returns all three
-            if (redirectUrl.includes('code=')) {
-                const codeMatch = redirectUrl.match(/code=([^&#]+)/);
-                if (codeMatch) {
+        // First check if we already have tokens in the current redirectUrl
+        const extractTokens = (url) => {
+            if (url.includes('code=')) {
+                const codeMatch = url.match(/code=([^&#]+)/);
+                if (codeMatch)
                     authCode = codeMatch[1];
-                }
             }
-            if (redirectUrl.includes('id_token=')) {
-                const idTokenMatch = redirectUrl.match(/id_token=([^&#]+)/);
-                if (idTokenMatch) {
+            if (url.includes('id_token=')) {
+                const idTokenMatch = url.match(/id_token=([^&#]+)/);
+                if (idTokenMatch)
                     idToken = idTokenMatch[1];
-                }
             }
-            if (redirectUrl.includes('access_token=')) {
-                const accessTokenMatch = redirectUrl.match(/access_token=([^&#]+)/);
-                if (accessTokenMatch) {
+            if (url.includes('access_token=')) {
+                const accessTokenMatch = url.match(/access_token=([^&#]+)/);
+                if (accessTokenMatch)
                     accessToken = accessTokenMatch[1];
-                }
             }
-            if (authCode) {
+        };
+        // Check initial redirect URL for tokens
+        if (redirectUrl) {
+            extractTokens(redirectUrl);
+        }
+        while (maxRedirects > 0 && redirectUrl && !authCode) {
+            // Check if this is the final redirect to carnet:// scheme
+            if (redirectUrl.startsWith('carnet://') || redirectUrl.startsWith('weconnect://')) {
+                extractTokens(redirectUrl);
+                break;
+            }
+            // Skip non-http redirects
+            if (!redirectUrl.startsWith('http') && !redirectUrl.startsWith('/')) {
                 break;
             }
             const followResponse = await context.helpers.httpRequest({
@@ -519,15 +529,27 @@ async function vwLogin(context, email, password) {
                 encoding: 'text',
                 returnFullResponse: true,
                 ignoreHttpStatusErrors: true,
+                skipAutoFollowRedirects: true,
             });
             if (typeof followResponse === 'object' && followResponse !== null) {
                 const respObj = followResponse;
                 const respHeaders = respObj.headers;
-                if (respHeaders && respHeaders.location) {
-                    redirectUrl = respHeaders.location;
+                const newLocation = respHeaders ? (respHeaders.location || respHeaders.Location) : '';
+                if (newLocation) {
+                    redirectUrl = newLocation;
+                    extractTokens(redirectUrl);
                 }
                 else {
-                    redirectUrl = '';
+                    // No more redirects, check response body for meta refresh or JS redirect
+                    const body = respObj.body || '';
+                    const metaRefreshMatch = body.match(/URL=([^"'\s>]+)/i);
+                    if (metaRefreshMatch) {
+                        redirectUrl = metaRefreshMatch[1];
+                        extractTokens(redirectUrl);
+                    }
+                    else {
+                        redirectUrl = '';
+                    }
                 }
             }
             else {
@@ -536,7 +558,7 @@ async function vwLogin(context, email, password) {
             maxRedirects--;
         }
         if (!authCode) {
-            throw new Error('Could not obtain authorization code. Please check your credentials.');
+            throw new Error(`Could not obtain authorization code. Last redirect: ${redirectUrl || 'none'}. Please check your credentials.`);
         }
         // Step 4: Exchange auth code for tokens
         // Try the new CARIAD login endpoint first

package/package.json

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