Skip to content

Commit 70da155

Browse files
authored
PSA: fix misleading login error (evcc-io#1059)
1 parent b010f14 commit 70da155

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

internal/vehicle/psa.go

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package vehicle
22

33
import (
44
"errors"
5+
"fmt"
56
"strings"
67
"time"
78

@@ -67,21 +68,22 @@ func newPSA(log *util.Logger, brand, realm string, other map[string]interface{})
6768

6869
api := psa.NewAPI(log, brand, realm, cc.ClientID, cc.ClientSecret)
6970
err := api.Login(cc.User, cc.Password)
71+
if err != nil {
72+
return v, fmt.Errorf("login failed: %w", err)
73+
}
7074

71-
var vehicles []psa.Vehicle
72-
if err == nil {
73-
vehicles, err = api.Vehicles()
75+
vehicles, err := api.Vehicles()
76+
if err != nil {
77+
return nil, err
7478
}
7579

7680
var vid string
77-
if err == nil {
78-
if cc.VIN == "" && len(vehicles) == 1 {
79-
vid = vehicles[0].ID
80-
} else {
81-
for _, vehicle := range vehicles {
82-
if vehicle.VIN == strings.ToUpper(cc.VIN) {
83-
vid = vehicle.ID
84-
}
81+
if cc.VIN == "" && len(vehicles) == 1 {
82+
vid = vehicles[0].ID
83+
} else {
84+
for _, vehicle := range vehicles {
85+
if vehicle.VIN == strings.ToUpper(cc.VIN) {
86+
vid = vehicle.ID
8587
}
8688
}
8789
}

0 commit comments

Comments
 (0)