n8n-nodes-jygse-vw-weconnect 0.1.4 → 0.1.5

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

@@ -189,19 +189,24 @@ async function vwLogin(context, email, password) {
             encoding: 'text',
             returnFullResponse: true,
             ignoreHttpStatusErrors: true,
+            skipAutoFollowRedirects: true,
         });
         // Extract response body and check for redirect
         let htmlContent;
         let currentUrl = '';
+        let stateToken = '';
         if (typeof authorizeResponse === 'string') {
             htmlContent = authorizeResponse;
         }
         else if (authorizeResponse && typeof authorizeResponse === 'object') {
             const respObj = authorizeResponse;
             const respHeaders = respObj.headers;
-            // Check for redirect in headers
-            if (respHeaders && respHeaders.location) {
-                currentUrl = respHeaders.location;
+            // Check for redirect in headers (case-insensitive)
+            if (respHeaders) {
+                const locationHeader = respHeaders.location || respHeaders.Location;
+                if (locationHeader) {
+                    currentUrl = locationHeader;
+                }
             }
             if (respObj.body && typeof respObj.body === 'string') {
                 htmlContent = respObj.body;
@@ -216,15 +221,56 @@ async function vwLogin(context, email, password) {
         else {
             htmlContent = String(authorizeResponse);
         }
-        // Try to extract state token from Auth0 page (new flow)
-        // Look for state in URL or in hidden form field
-        let stateToken = '';
-        // Check if we were redirected to /u/login
-        const stateUrlMatch = currentUrl.match(/state=([^&]+)/);
-        if (stateUrlMatch) {
-            stateToken = decodeURIComponent(stateUrlMatch[1]);
+        // Follow redirects manually to capture the state parameter
+        let maxInitialRedirects = 5;
+        while (currentUrl && maxInitialRedirects > 0) {
+            // Extract state from redirect URL
+            const stateMatch = currentUrl.match(/state=([^&]+)/);
+            if (stateMatch) {
+                stateToken = decodeURIComponent(stateMatch[1]);
+            }
+            // If we reached the /u/login page, we have what we need
+            if (currentUrl.includes('/u/login') && stateToken) {
+                break;
+            }
+            // Follow the redirect
+            const followUrl = currentUrl.startsWith('http') ? currentUrl : `https://identity.vwgroup.io${currentUrl}`;
+            const followResponse = await context.helpers.httpRequest({
+                method: 'GET',
+                url: followUrl,
+                headers: {
+                    'User-Agent': 'Mozilla/5.0 (Linux; Android 12; SM-G973F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.120 Mobile Safari/537.36',
+                    'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+                },
+                encoding: 'text',
+                returnFullResponse: true,
+                ignoreHttpStatusErrors: true,
+                skipAutoFollowRedirects: true,
+            });
+            if (typeof followResponse === 'string') {
+                htmlContent = followResponse;
+                currentUrl = '';
+            }
+            else if (followResponse && typeof followResponse === 'object') {
+                const respObj = followResponse;
+                const respHeaders = respObj.headers;
+                currentUrl = '';
+                if (respHeaders) {
+                    const locationHeader = respHeaders.location || respHeaders.Location;
+                    if (locationHeader) {
+                        currentUrl = locationHeader;
+                    }
+                }
+                if (respObj.body && typeof respObj.body === 'string') {
+                    htmlContent = respObj.body;
+                }
+                else if (respObj.data && typeof respObj.data === 'string') {
+                    htmlContent = respObj.data;
+                }
+            }
+            maxInitialRedirects--;
         }
-        // Also try to find state in the HTML
+        // Try to extract state token from the final HTML if not found in URL
         if (!stateToken) {
             const stateHtmlMatch = htmlContent.match(/name="state"\s+value="([^"]+)"/);
             if (stateHtmlMatch) {
@@ -238,6 +284,13 @@ async function vwLogin(context, email, password) {
                 stateToken = decodeURIComponent(formActionMatch[1]);
             }
         }
+        // Try to extract state from any URL in the page
+        if (!stateToken) {
+            const anyStateMatch = htmlContent.match(/state=([a-zA-Z0-9_.-]+)/);
+            if (anyStateMatch) {
+                stateToken = anyStateMatch[1];
+            }
+        }
         // Try legacy CSRF-based flow first
         const csrfMatch = htmlContent.match(/name="_csrf"\s+value="([^"]+)"/);
         const relayStateMatch = htmlContent.match(/name="relayState"\s+value="([^"]+)"/);

package/package.json

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