Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VW: remove legacy WeConnect (#10845)

Browse source
This commit is contained in:
andig 2023-12-26 23:23:41 +01:00 • committed by GitHub
parent 25e1fdfb9e
commit 170e2cadeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

21
templates/definition/vehicle/vw-id.yaml
View file

@ -1,21 +0,0 @@
template: id
products:
- brand: Volkswagen
description:
generic: We Connect ID
requirements:
description:
de: ID.3, ID.4 (funktioniert auch für e-Golf, e-Up)
en: ID.3, ID.4 (also works for e-Golf, e-Up)
params:
- preset: vehicle-base
- preset: vehicle-identify
- name: vin
example: WVWZZZ...
- name: timeout
default: 10s
render: |
type: id
{{ include "vehicle-base" . }}
{{ include "vehicle-identify" . }}
timeout: {{ .timeout }}

7
templates/definition/vehicle/vw.yaml
View file

@ -1,12 +1,13 @@
template: vw
covers: ["id"]
products:
- brand: Volkswagen
description:
generic: We Connect (legacy)
generic: We Connect ID
requirements:
description:
de: ältere Modelle wie e-Up, e-Golf, etc.
en: older Models like e-Up, e-Golf, etc.
de: e-Golf, e-Up, ID Familie
en: e-Golf, e-Up, ID family
params:
- preset: vehicle-base
- preset: vehicle-identify

82
vehicle/vw-id.go
View file

@ -1,82 +0,0 @@
package vehicle
import (
"time"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/util"
"github.com/evcc-io/evcc/util/request"
"github.com/evcc-io/evcc/vehicle/vag/loginapps"
"github.com/evcc-io/evcc/vehicle/vag/vwidentity"
"github.com/evcc-io/evcc/vehicle/vw/id"
)
// https://github.com/TA2k/ioBroker.vw-connect
// ID is an api.Vehicle implementation for ID cars
type ID struct {
*embed
*id.Provider // provides the api implementations
}
func init() {
registry.Add("id", NewIDFromConfig)
}
// NewIDFromConfig creates a new vehicle
func NewIDFromConfig(other map[string]interface{}) (api.Vehicle, error) {
cc := struct {
embed `mapstructure:",squash"`
User, Password, VIN string
Cache time.Duration
Timeout time.Duration
}{
Cache: interval,
Timeout: request.Timeout,
}
if err := util.DecodeOther(other, &cc); err != nil {
return nil, err
}
if cc.User == "" || cc.Password == "" {
return nil, api.ErrMissingCredentials
}
v := &ID{
embed: &cc.embed,
}
log := util.NewLogger("id").Redact(cc.User, cc.Password, cc.VIN)
q, err := vwidentity.LoginWithAuthURL(log, id.LoginURL, id.AuthParams, cc.User, cc.Password)
if err != nil {
return nil, err
}
apps := loginapps.New(log)
token, err := apps.Exchange(q)
if err != nil {
return nil, err
}
api := id.NewAPI(log, apps.TokenSource(token))
api.Client.Timeout = cc.Timeout
vehicle, err := ensureVehicleEx(
cc.VIN, api.Vehicles,
func(v id.Vehicle) string {
return v.VIN
},
)
if v.Title_ == "" {
v.Title_ = vehicle.Nickname
}
if err == nil {
v.Provider = id.NewProvider(api, vehicle.VIN, cc.Cache)
}
return v, err
}

49
vehicle/vw.go
View file

@ -6,25 +6,26 @@ import (
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/util"
"github.com/evcc-io/evcc/util/request"
"github.com/evcc-io/evcc/vehicle/vag/service"
"github.com/evcc-io/evcc/vehicle/vw"
"github.com/evcc-io/evcc/vehicle/vag/loginapps"
"github.com/evcc-io/evcc/vehicle/vag/vwidentity"
"github.com/evcc-io/evcc/vehicle/vw/id"
)
// https://github.com/trocotronic/weconnect
// https://github.com/TA2k/ioBroker.vw-connect
// VW is an api.Vehicle implementation for VW cars
type VW struct {
// ID is an api.Vehicle implementation for ID cars
type ID struct {
*embed
*vw.Provider // provides the api implementations
*id.Provider // provides the api implementations
}
func init() {
registry.Add("vw", NewVWFromConfig)
registry.Add("vw", NewIDFromConfig)
registry.Add("id", NewIDFromConfig)
}
// NewVWFromConfig creates a new vehicle
func NewVWFromConfig(other map[string]interface{}) (api.Vehicle, error) {
// NewIDFromConfig creates a new vehicle
func NewIDFromConfig(other map[string]interface{}) (api.Vehicle, error) {
cc := struct {
embed `mapstructure:",squash"`
User, Password, VIN string
@ -43,27 +44,39 @@ func NewVWFromConfig(other map[string]interface{}) (api.Vehicle, error) {
return nil, api.ErrMissingCredentials
}
v := &VW{
v := &ID{
embed: &cc.embed,
}
log := util.NewLogger("vw").Redact(cc.User, cc.Password, cc.VIN)
log := util.NewLogger("id").Redact(cc.User, cc.Password, cc.VIN)
trs, err := service.TokenRefreshServiceTokenSource(log, vw.TRSParams, vw.AuthParams, cc.User, cc.Password)
q, err := vwidentity.LoginWithAuthURL(log, id.LoginURL, id.AuthParams, cc.User, cc.Password)
if err != nil {
return nil, err
}
ts := service.MbbTokenSource(log, trs, vw.AuthClientID)
api := vw.NewAPI(log, ts, vw.Brand, vw.Country)
apps := loginapps.New(log)
token, err := apps.Exchange(q)
if err != nil {
return nil, err
}
api := id.NewAPI(log, apps.TokenSource(token))
api.Client.Timeout = cc.Timeout
cc.VIN, err = ensureVehicle(cc.VIN, api.Vehicles)
vehicle, err := ensureVehicleEx(
cc.VIN, api.Vehicles,
func(v id.Vehicle) string {
return v.VIN
},
)
if v.Title_ == "" {
v.Title_ = vehicle.Nickname
}
if err == nil {
if err = api.HomeRegion(cc.VIN); err == nil {
v.Provider = vw.NewProvider(api, cc.VIN, cc.Cache)
}
v.Provider = id.NewProvider(api, vehicle.VIN, cc.Cache)
}
return v, err