Mercedes: fix auth (#18564)

evcc-io · Feb 2, 2025 · 6377989 · 6377989
1 parent 12c5370
commit 6377989
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 172 deletions.
diff --git a/cmd/token.go b/cmd/token.go
@@ -65,8 +65,6 @@ func runToken(cmd *cobra.Command, args []string) {
 	typ := strings.ToLower(vehicleConf.Type)
 
 	switch typ {
-	case "mercedes":
-		token, err = mercedesToken()
 	case "ford", "ford-connect":
 		token, err = fordConnectToken(vehicleConf)
 	case "tronity":

diff --git a/cmd/token_mercedes.go b/cmd/token_mercedes.go
diff --git a/templates/definition/vehicle/mercedes.yaml b/templates/definition/vehicle/mercedes.yaml
@@ -4,9 +4,9 @@ products:
 requirements:
   description:
     de: |
-      Benötigt `access` und `refresh` Tokens. Diese können über den Befehl `evcc token [name]` generiert werden.
+      Benötigt `access` und `refresh` Tokens. Anleitung zur Generierung hier: https://tinyurl.com/mbapi2020helptoken.
     en: |
-      Requires `access` and `refresh` tokens. These can be generated with command `evcc token [name]`.
+      Requires `access` and `refresh` tokens. Documentation here: https://tinyurl.com/mbapi2020helptoken.
 params:
   - preset: vehicle-common
   - name: user

diff --git a/vehicle/mercedes/helper.go b/vehicle/mercedes/helper.go
@@ -35,13 +35,12 @@ const (
 	BffUriNORAM                = "https://bff.amap-prod.mobilesdk.mercedes-benz.com"
 	WidgetUriNORAM             = "https://widget.amap-prod.mobilesdk.mercedes-benz.com"
 	IdUri                      = "https://id.mercedes-benz.com"
-	ClientId                   = "01398c1c-dc45-4b42-882b-9f5ba9f175f1"
-	RisApplicationVersionEMEA  = "1.44.0"
-	RisSdkVersionEMEA          = "2.150.1"
-	RisApplicationVersionAPAC  = "1.44.0"
-	RisSdkVersionAPAC          = "2.150.1"
-	RisApplicationVersionNORAM = "3.42.0"
-	RisSdkVersionNORAM         = "2.150.1"
+	RisApplicationVersionEMEA  = "1.52.0"
+	RisSdkVersionEMEA          = "2.160.1"
+	RisApplicationVersionAPAC  = "1.52.0"
+	RisSdkVersionAPAC          = "2.160.1"
+	RisApplicationVersionNORAM = "3.52.0"
+	RisSdkVersionNORAM         = "2.160.1"
 	RisOsVersion               = "17.3"
 	RisOsName                  = "ios"
 	XApplicationNameEMEA       = "mycar-store-ece"

diff --git a/vehicle/mercedes/setupapi.go b/vehicle/mercedes/setupapi.go