VW: update api (#2) (#19500)

andig · web-flow · commit ec6fead5cc6e · 2025-03-06T19:49:44.000+01:00
diff --git a/vehicle/vag/vwidentity/forms.go b/vehicle/vag/vwidentity/forms.go
@@ -85,7 +85,7 @@ func parseCredentials(body string) (CredentialParams, error) {
 
 	// clean quotes
 	quotes1 := strings.ReplaceAll(match[0][1], `'`, `"`)
-	quotes2 := regexp.MustCompile(`\s(\w+)(?s)*:`).ReplaceAllString(quotes1, `" $1":`)
+	quotes2 := regexp.MustCompile(`\s(\w+)(?s)*:`).ReplaceAllString(quotes1, ` "$1":`)
 
 	// strip , }
 	tmpl := regexp.MustCompile(`(?s),\s+}`).ReplaceAllString(quotes2, "}")
diff --git a/vehicle/vag/vwidentity/forms_test.go b/vehicle/vag/vwidentity/forms_test.go
@@ -26,6 +26,8 @@ func TestParse(t *testing.T) {
         }
     </script>`
 
-	_, err := parseCredentials(b)
+	res, err := parseCredentials(b)
 	require.NoError(t, err)
+	require.Equal(t, "16563a265369fbc1ef1ba126411349a430b1d8b5c1592b6284216dc634169ca3", res.TemplateModel.Hmac)
+	require.Equal(t, "pwAX6CTKoSQWsej-9sROQ5LPw8Qy0gCT9oSdFxFxo9VkyNeYxjMg2kevkhY70Iyawul6e_D27qYK5za-leCoJXMSxu1R8eep", res.CsrfToken)
 }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ func TestParse(t *testing.T) {`
`26`	`26`	`}`
`27`	`27`	</script>`
`28`	`28`
`29`		`- _, err := parseCredentials(b)`
	`29`	`+ res, err := parseCredentials(b)`
`30`	`30`	`require.NoError(t, err)`
	`31`	`+ require.Equal(t, "16563a265369fbc1ef1ba126411349a430b1d8b5c1592b6284216dc634169ca3", res.TemplateModel.Hmac)`
	`32`	`+ require.Equal(t, "pwAX6CTKoSQWsej-9sROQ5LPw8Qy0gCT9oSdFxFxo9VkyNeYxjMg2kevkhY70Iyawul6e_D27qYK5za-leCoJXMSxu1R8eep", res.CsrfToken)`
`31`	`33`	`}`